Merge 3.2

Author: soyuka

core/file-upload.md

@@ -25,6 +25,7 @@ to make it look like this.
 
 ```yaml
 # api/config/packages/vich_uploader.yaml
+
 vich_uploader:
     db_driver: orm
     metadata:
@@ -34,7 +35,7 @@ vich_uploader:
             uri_prefix: /media
             upload_destination: '%kernel.project_dir%/public/media'
             # Will rename uploaded files using a uniqueid as a prefix.
-            namer: Vich\UploaderBundle\Naming\OrignameNamer
+            namer: Vich\UploaderBundle\Naming\SmartUniqueNamer
 ```
 
 ## Uploading to a Dedicated Resource
@@ -53,6 +54,7 @@ The `MediaObject` resource is implemented like this:
 ```php
 <?php
 // api/src/Entity/MediaObject.php
+
 namespace App\Entity;
 
 use ApiPlatform\Metadata\ApiProperty;
@@ -109,7 +111,7 @@ class MediaObject
     #[Groups(['media_object:read'])]
     public ?string $contentUrl = null;
 
-    #[Vich\UploadableField(mapping: "media_object", fileNameProperty: "filePath")]
+    #[Vich\UploadableField(mapping: 'media_object', fileNameProperty: 'filePath')]
     #[Assert\NotNull(groups: ['media_object_create'])]
     public ?File $file = null;
 
@@ -172,12 +174,11 @@ A [normalizer](serialization.md#normalization) could be used to set the `content
 namespace App\Serializer;
 
 use App\Entity\MediaObject;
-use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Vich\UploaderBundle\Storage\StorageInterface;
 
-final class MediaObjectNormalizer implements ContextAwareNormalizerInterface, NormalizerAwareInterface
+final class MediaObjectNormalizer implements NormalizerAwareInterface
 {
     use NormalizerAwareTrait;
 
@@ -224,17 +225,23 @@ your data, you will get a response looking like this:
 
 ### Accessing Your Media Objects Directly
 
-You will need to modify your Caddyfile to allow the above `contentUrl` to be accessed directly. If you followed the above configuration for the VichUploaderBundle, that will be in `api/public/media`. Add your folder to the list of path matches, e.g. `|^/media/|`:
-
-```caddyfile
-...
-# Matches requests for HTML documents, for static files and for Next.js files,
-# except for known API paths and paths with extensions handled by API Platform
-@pwa expression `(
-        {header.Accept}.matches("\\btext/html\\b")
-        && !{path}.matches("(?i)(?:^/docs|^/graphql|^/bundles/|^/media/|^/_profiler|^/_wdt|\\.(?:json|html$|csv$|ya?ml$|xml$))")
-...
+You will need to modify your `Caddyfile` to allow the above `contentUrl` to be accessed directly. If you followed the above configuration for the VichUploaderBundle, that will be in `api/public/media`. Add your folder to the list of path matches, e.g. `|^/media/|`:
+
+<!-- markdownlint-disable no-hard-tabs -->
+```patch
+	# Matches requests for HTML documents, for static files and for Next.js files,
+	# except for known API paths and paths with extensions handled by API Platform
+	@pwa expression `(
+			header({'Accept': '*text/html*'})
+			&& !path(
+-				'/docs*', '/graphql*', '/bundles*', '/media*', '/contexts*', '/_profiler*', '/_wdt*',
++				'/media*', '/docs*', '/graphql*', '/bundles*', '/media*', '/contexts*', '/_profiler*', '/_wdt*',
+				'*.json*', '*.html', '*.csv', '*.yml', '*.yaml', '*.xml'
+			)
+		)
+		|| path('/favicon.ico', '/manifest.json', '/robots.txt', '/_next*', '/sitemap*')`
 ```
+<!-- markdownlint-enable no-hard-tabs -->
 
 ### Linking a MediaObject Resource to Another Resource
 
@@ -246,6 +253,7 @@ We first need to edit our Book resource, and add a new property called `image`.
 ```php
 <?php
 // api/src/Entity/Book.php
+
 namespace App\Entity;
 
 use ApiPlatform\Metadata\ApiResource;
@@ -406,11 +414,10 @@ final class MultipartDecoder implements DecoderInterface
 {
     public const FORMAT = 'multipart';
 
-    public function __construct(private RequestStack $requestStack) {}
+    public function __construct(private RequestStack $requestStack)
+    {
+    }
 
-    /**
-     * {@inheritdoc}
-     */
     public function decode(string $data, string $format, array $context = []): ?array
     {
         $request = $this->requestStack->getCurrentRequest();
@@ -427,9 +434,6 @@ final class MultipartDecoder implements DecoderInterface
         }, $request->request->all()) + $request->files->all();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsDecoding(string $format): bool
     {
         return self::FORMAT === $format;
@@ -452,17 +456,11 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 final class UploadedFileDenormalizer implements DenormalizerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function denormalize($data, string $type, string $format = null, array $context = []): UploadedFile
     {
         return $data;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsDenormalization($data, $type, $format = null): bool
     {
         return $data instanceof UploadedFile;

core/filters.md

@@ -1331,7 +1331,7 @@ services:
     # This whole definition can be omitted if automatic service loading is enabled
     'App\Filter\RegexpFilter':
         # The "arguments" key can be omitted if the autowiring is enabled
-        arguments: [ '@doctrine', ~, '@?logger' ]
+        arguments: [ '@doctrine', '@?logger' ]
         # The "tags" key can be omitted if the autoconfiguration is enabled
         tags: [ 'api_platform.filter' ]
 ```
@@ -1343,7 +1343,7 @@ it can also be enabled for some properties:
 # api/config/services.yaml
 services:
     'App\Filter\RegexpFilter':
-        arguments: [ '@doctrine', ~, '@?logger', { email: ~, anOtherProperty: ~ } ]
+        arguments: [ '@doctrine', '@?logger', { email: ~, anOtherProperty: ~ } ]
         tags: [ 'api_platform.filter' ]
 ```
 

core/graphql.md

@@ -888,9 +888,6 @@ final class WriteStage implements WriteStageInterface
         $this->writeStage = $writeStage;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __invoke($data, string $resourceClass, string $operationName, array $context)
     {
         // You can add pre-write code here.
@@ -2192,9 +2189,6 @@ final class ErrorHandler implements ErrorHandlerInterface
         $this->defaultErrorHandler = $defaultErrorHandler;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function __invoke(array $errors, callable $formatter): array
     {
         // Log or filter the errors.
@@ -2285,9 +2279,6 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 final class MyExceptionNormalizer implements NormalizerInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function normalize($object, $format = null, array $context = []): array
     {
         $exception = $object->getPrevious();
@@ -2299,9 +2290,6 @@ final class MyExceptionNormalizer implements NormalizerInterface
         return $error;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsNormalization($data, $format = null): bool
     {
         return $data instanceof Error && $data->getPrevious() instanceof MyException;
@@ -2486,9 +2474,6 @@ final class DateTimeType extends ScalarType implements TypeInterface
         return $this->name;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function serialize($value)
     {
         // Already serialized.
@@ -2503,10 +2488,7 @@ final class DateTimeType extends ScalarType implements TypeInterface
         return $value->format(\DateTime::ATOM);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function parseValue($value)
+   public function parseValue($value)
     {
         if (!\is_string($value)) {
             throw new Error(sprintf('DateTime cannot represent non string value: %s', Utils::printSafeJson($value)));
@@ -2520,9 +2502,6 @@ final class DateTimeType extends ScalarType implements TypeInterface
         return $value;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function parseLiteral($valueNode, ?array $variables = null)
     {
         if ($valueNode instanceof StringValueNode && false !== \DateTime::createFromFormat(\DateTime::ATOM, $valueNode->value)) {
@@ -2593,9 +2572,6 @@ final class TypeConverter implements TypeConverterInterface
         $this->defaultTypeConverter = $defaultTypeConverter;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function convertType(Type $type, bool $input, Operation $rootOperation, string $resourceClass, string $rootResource, ?string $property, int $depth)
     {
         if ('publicationDate' === $property
@@ -2607,9 +2583,6 @@ final class TypeConverter implements TypeConverterInterface
         return $this->defaultTypeConverter->convertType($type, $input, $rootOperation, $resourceClass, $rootResource, $property, $depth);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resolveType(string $type): ?GraphQLType
     {
         return $this->defaultTypeConverter->resolveType($type);
@@ -2822,7 +2795,7 @@ and for an example implementation for the Apollo client check out [Apollo Upload
 
 ```graphql
 mutation CreateMediaObject($file: Upload!) {
-    createMediaObject(input: {file: $file}) {
+    uploadMediaObject(input: {file: $file}) {
         mediaObject {
             id
             contentUrl

core/identifiers.md

@@ -63,6 +63,7 @@ Let's create a `Provider` for the `Person` entity:
 
 ```php
 <?php
+// api/src/State/PersonProvider.php
 namespace App\State;
 
 use App\Entity\Person;
@@ -71,9 +72,6 @@ use App\Uuid;
 
 final class PersonProvider implements ProviderInterface
 {
-    /**
-     * {@inheritDoc}
-     */
     public function provide(Operation $operation, array $uriVariables = [], array $context = [])
     {
         // Our identifier is:
@@ -89,6 +87,7 @@ This case is covered by an URI variable transformer:
 
 ```php
 <?php
+// api/src/Identifier/UuidUriVariableTransformer.php
 namespace App\Identifier;
 
 use ApiPlatform\Api\UriVariableTransformerInterface;

core/serialization.md

@@ -594,19 +594,13 @@ class PlainIdentifierDenormalizer implements ContextAwareDenormalizerInterface,
         $this->iriConverter = $iriConverter;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function denormalize($data, $class, $format = null, array $context = [])
     {
         $data['relatedDummy'] = $this->iriConverter->getIriFromResource(resource: RelatedDummy::class, context: ['uri_variables' => ['id' => $data['relatedDummy']]]);
 
         return $this->denormalizer->denormalize($data, $class, $format, $context + [__CLASS__ => true]);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function supportsDenormalization($data, $type, $format = null, array $context = []): bool
     {
         return \in_array($format, ['json', 'jsonld'], true) && is_a($type, Dummy::class, true) && !empty($data['relatedDummy']) && !isset($context[__CLASS__]);
@@ -624,6 +618,7 @@ For instance:
 ```php
 <?php
 // api/src/Entity/Book.php
+
 namespace App\Entity;
 
 use ApiPlatform\Metadata\ApiResource;
@@ -657,6 +652,7 @@ It's also possible to only change the denormalization or normalization context:
 ```php
 <?php
 // api/src/Entity/Book.php
+
 namespace App\Entity;
 
 use ApiPlatform\Metadata\ApiResource;
@@ -679,6 +675,7 @@ Groups are also supported:
 ```php
 <?php
 // api/src/Entity/Book.php
+
 namespace App\Entity;
 
 use ApiPlatform\Metadata\ApiResource;
@@ -711,6 +708,7 @@ Sometimes you need to expose calculated fields. This can be done by leveraging t
 ```php
 <?php
 // api/src/Entity/Greeting.php
+
 namespace App\Entity;
 
 use ApiPlatform\Metadata\ApiResource;

core/state-processors.md

@@ -33,6 +33,7 @@ Here is an implementation example:
 
 ```php
 <?php
+// api/src/State/BlogPostProcessor.php
 
 namespace App\State;
 
@@ -42,9 +43,6 @@ use ApiPlatform\State\ProcessorInterface;
 
 class BlogPostProcessor implements ProcessorInterface
 {
-    /**
-     * {@inheritDoc}
-     */
     public function process($data, Operation $operation, array $uriVariables = [], array $context = [])
     {
         // call your persistence layer to save $data
@@ -57,6 +55,7 @@ We then configure our operation to use this processor:
 
 ```php
 <?php
+// api/src/Entity/BlogPost.php
 
 namespace App\Entity;
 
@@ -74,6 +73,7 @@ Otherwise, if you use a custom dependency injection configuration, you need to r
 
 ```yaml
 # api/config/services.yaml
+
 services:
     # ...
     App\State\BlogPostProcessor: ~
@@ -91,6 +91,7 @@ Here is an implementation example which sends new users a welcome email after a
 
 ```php
 <?php
+// api/src/Sate/UserProcessor.php
 
 namespace App\State;
 
@@ -129,6 +130,7 @@ Even with service autowiring and autoconfiguration enabled, you must still confi
 
 ```yaml
 # api/config/services.yaml
+
 services:
     # ...
     App\State\UserProcessor:
@@ -147,6 +149,7 @@ And configure that you want to use this processor on the User resource:
 
 ```php
 <?php
+// api/src/Entity/User.php
 
 namespace App\Entity;