Merge 4.1

Author: soyuka

core/bootstrap.md

@@ -23,12 +23,12 @@ use ApiPlatform\Action\EntrypointAction;
 use ApiPlatform\Action\ExceptionAction;
 use ApiPlatform\Action\NotExposedAction;
 use ApiPlatform\Action\PlaceholderAction;
-use ApiPlatform\Api\IdentifiersExtractor;
-use ApiPlatform\Api\ResourceClassResolver;
-use ApiPlatform\Api\UriVariablesConverter;
-use ApiPlatform\Api\UriVariableTransformer\DateTimeUriVariableTransformer;
-use ApiPlatform\Api\UriVariableTransformer\IntegerUriVariableTransformer;
-use ApiPlatform\Api\UrlGeneratorInterface as ApiUrlGeneratorInterface;
+use ApiPlatform\Metadata\IdentifiersExtractor;
+use ApiPlatform\Metadata\ResourceClassResolver;
+use ApiPlatform\Metadata\UriVariablesConverter;
+use ApiPlatform\Metadata\UriVariableTransformer\DateTimeUriVariableTransformer;
+use ApiPlatform\Metadata\UriVariableTransformer\IntegerUriVariableTransformer;
+use ApiPlatform\Metadata\UrlGeneratorInterface as ApiUrlGeneratorInterface;
 use ApiPlatform\Symfony\Validator\EventListener\ValidationExceptionListener;
 use ApiPlatform\Documentation\DocumentationInterface;
 use ApiPlatform\Symfony\EventListener\AddFormatListener;

core/configuration.md

@@ -374,7 +374,7 @@ api_platform:
     host: ~
 
     # The URL generation strategy to use for IRIs
-    url_generation_strategy: !php/const ApiPlatform\Api\UrlGeneratorInterface::ABS_PATH
+    url_generation_strategy: !php/const ApiPlatform\Metadata\UrlGeneratorInterface::ABS_PATH
 
     # To enable collecting denormalization errors
     collectDenormalizationErrors: false
@@ -711,7 +711,7 @@ If you need to globally configure all the resources instead of adding configurat
 <?php
 // config/api-platform.php
 
-use ApiPlatform\Api\UrlGeneratorInterface;
+use ApiPlatform\Metadata\UrlGeneratorInterface;
 
 return [
     'defaults' => [

core/doctrine-filters.md

@@ -1268,7 +1268,7 @@ use ApiPlatform\Core\Annotation\ApiResource;
 use App\Filter\CustomAndFilter;
 
 #[ApiResource]
-#[ApiFilter(CustomAndFilter::class, properties=["name", "cost"])]
+#[ApiFilter(CustomAndFilter::class, properties: ['name', 'cost'])]
 class Offer
 {
     // ...

core/extensions.md

@@ -77,12 +77,12 @@ final readonly class CurrentUserExtension implements QueryCollectionExtensionInt
     {
     }
 
-    public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, Operation $operation = null, array $context = []): void
+    public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = []): void
     {
         $this->addWhere($queryBuilder, $resourceClass);
     }
 
-    public function applyToItem(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, array $identifiers, Operation $operation = null, array $context = []): void
+    public function applyToItem(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, array $identifiers, ?Operation $operation = null, array $context = []): void
     {
         $this->addWhere($queryBuilder, $resourceClass);
     }