Fix deprecations and tests for sf4.4

soyuka · soyuka · commit 24a7681747a5 · 2019-10-23T16:29:51.000+02:00
diff --git a/composer.json b/composer.json
@@ -15,7 +15,6 @@
     "require": {
         "php": ">=7.1",
         "doctrine/inflector": "^1.0",
-        "fig/link-util": "^1.0@dev",
         "psr/cache": "^1.0",
         "psr/container": "^1.0",
         "symfony/http-foundation": "^3.4 || ^4.0",
@@ -130,8 +129,5 @@
             "dev-master": "2.6.x-dev"
         }
     },
-    "config": {
-        "sort-packages": true
-    },
     "minimum-stability": "dev"
 }
diff --git a/src/Bridge/Doctrine/EventListener/WriteListener.php b/src/Bridge/Doctrine/EventListener/WriteListener.php
@@ -42,7 +42,7 @@ public function __construct(ManagerRegistry $managerRegistry)
     public function onKernelView(GetResponseForControllerResultEvent $event): void
     {
         $request = $event->getRequest();
-        if ($request->isMethodSafe(false)) {
+        if ($request->isMethodCacheable()) {
             return;
         }
 
diff --git a/src/Bridge/FosUser/EventListener.php b/src/Bridge/FosUser/EventListener.php
@@ -44,7 +44,7 @@ public function onKernelView(GetResponseForControllerResultEvent $event): void
         }
 
         $user = $event->getControllerResult();
-        if (!$user instanceof UserInterface || $request->isMethodSafe(false)) {
+        if (!$user instanceof UserInterface || $request->isMethodCacheable()) {
             return;
         }
 
diff --git a/src/Bridge/Symfony/Bundle/Action/SwaggerUiAction.php b/src/Bridge/Symfony/Bundle/Action/SwaggerUiAction.php
@@ -153,7 +153,7 @@ private function getContext(Request $request, Documentation $documentation): arr
             'scopes' => $this->oauthScopes,
         ];
 
-        if ($request->isMethodSafe(false) && null !== $resourceClass = $request->attributes->get('_api_resource_class')) {
+        if ($request->isMethodCacheable() && null !== $resourceClass = $request->attributes->get('_api_resource_class')) {
             $swaggerData['id'] = $request->attributes->get('id');
             $swaggerData['queryParameters'] = $request->query->all();
 
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/api.xml b/src/Bridge/Symfony/Bundle/Resources/config/api.xml
@@ -113,7 +113,7 @@
             <argument type="service" id="api_platform.item_data_provider" on-invalid="ignore" />
             <argument>%api_platform.allow_plain_identifiers%</argument>
             <argument>null</argument>
-            <argument type="tagged" tag="api_platform.data_transformer" on-invalid="ignore" />
+            <argument type="tagged_iterator" tag="api_platform.data_transformer" on-invalid="ignore" />
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" on-invalid="ignore" />
             <argument>false</argument>
 
@@ -271,7 +271,7 @@
         <service id="api_platform.identifier.converter" class="ApiPlatform\Core\Identifier\IdentifierConverter" public="false">
             <argument type="service" id="api_platform.identifiers_extractor.cached" />
             <argument type="service" id="api_platform.metadata.property.metadata_factory" />
-            <argument type="tagged" tag="api_platform.identifier.denormalizer" />
+            <argument type="tagged_iterator" tag="api_platform.identifier.denormalizer" />
         </service>
 
         <service id="api_platform.identifier.integer" class="ApiPlatform\Core\Identifier\Normalizer\IntegerDenormalizer" public="false">
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/data_persister.xml b/src/Bridge/Symfony/Bundle/Resources/config/data_persister.xml
@@ -6,7 +6,7 @@
 
     <services>
         <service id="api_platform.data_persister" class="ApiPlatform\Core\DataPersister\ChainDataPersister" public="false">
-            <argument type="tagged" tag="api_platform.data_persister" />
+            <argument type="tagged_iterator" tag="api_platform.data_persister" />
         </service>
         <service id="ApiPlatform\Core\DataPersister\DataPersisterInterface" alias="api_platform.data_persister" />
     </services>
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/data_provider.xml b/src/Bridge/Symfony/Bundle/Resources/config/data_provider.xml
@@ -13,17 +13,17 @@
         </service>
 
         <service id="api_platform.item_data_provider" class="ApiPlatform\Core\DataProvider\ChainItemDataProvider">
-            <argument type="tagged" tag="api_platform.item_data_provider" />
+            <argument type="tagged_iterator" tag="api_platform.item_data_provider" />
         </service>
         <service id="ApiPlatform\Core\DataProvider\ItemDataProviderInterface" alias="api_platform.item_data_provider" />
 
         <service id="api_platform.collection_data_provider" class="ApiPlatform\Core\DataProvider\ChainCollectionDataProvider">
-            <argument type="tagged" tag="api_platform.collection_data_provider" />
+            <argument type="tagged_iterator" tag="api_platform.collection_data_provider" />
         </service>
         <service id="ApiPlatform\Core\DataProvider\CollectionDataProviderInterface" alias="api_platform.collection_data_provider" />
 
         <service id="api_platform.subresource_data_provider" class="ApiPlatform\Core\DataProvider\ChainSubresourceDataProvider">
-            <argument type="tagged" tag="api_platform.subresource_data_provider" />
+            <argument type="tagged_iterator" tag="api_platform.subresource_data_provider" />
         </service>
         <service id="ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface" alias="api_platform.subresource_data_provider" />
 
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml b/src/Bridge/Symfony/Bundle/Resources/config/doctrine_mongodb_odm.xml
@@ -25,24 +25,24 @@
         <service id="api_platform.doctrine_mongodb.odm.collection_data_provider" public="false" abstract="true">
             <argument type="service" id="doctrine_mongodb"/>
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
-            <argument type="tagged" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.collection" />
+            <argument type="tagged_iterator" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.collection" />
         </service>
 
         <service id="api_platform.doctrine_mongodb.odm.item_data_provider" public="false" abstract="true">
             <argument type="service" id="doctrine_mongodb"/>
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
             <argument type="service" id="api_platform.metadata.property.name_collection_factory"/>
             <argument type="service" id="api_platform.metadata.property.metadata_factory"/>
-            <argument type="tagged" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.item" />
+            <argument type="tagged_iterator" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.item" />
         </service>
 
         <service id="api_platform.doctrine_mongodb.odm.subresource_data_provider" public="false" abstract="true">
             <argument type="service" id="doctrine_mongodb" />
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
             <argument type="service" id="api_platform.metadata.property.name_collection_factory" />
             <argument type="service" id="api_platform.metadata.property.metadata_factory" />
-            <argument type="tagged" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.collection" />
-            <argument type="tagged" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.item" />
+            <argument type="tagged_iterator" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.collection" />
+            <argument type="tagged_iterator" tag="api_platform.doctrine_mongodb.odm.aggregation_extension.item" />
         </service>
 
         <service id="api_platform.doctrine_mongodb.odm.default.collection_data_provider"
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/doctrine_orm.xml b/src/Bridge/Symfony/Bundle/Resources/config/doctrine_orm.xml
@@ -17,22 +17,22 @@
 
         <service id="api_platform.doctrine.orm.collection_data_provider" public="false" abstract="true">
             <argument type="service" id="doctrine" />
-            <argument type="tagged" tag="api_platform.doctrine.orm.query_extension.collection" />
+            <argument type="tagged_iterator" tag="api_platform.doctrine.orm.query_extension.collection" />
         </service>
 
         <service id="api_platform.doctrine.orm.item_data_provider" public="false" abstract="true">
             <argument type="service" id="doctrine" />
             <argument type="service" id="api_platform.metadata.property.name_collection_factory" />
             <argument type="service" id="api_platform.metadata.property.metadata_factory" />
-            <argument type="tagged" tag="api_platform.doctrine.orm.query_extension.item" />
+            <argument type="tagged_iterator" tag="api_platform.doctrine.orm.query_extension.item" />
         </service>
 
         <service id="api_platform.doctrine.orm.subresource_data_provider" public="false" abstract="true">
             <argument type="service" id="doctrine" />
             <argument type="service" id="api_platform.metadata.property.name_collection_factory" />
             <argument type="service" id="api_platform.metadata.property.metadata_factory" />
-            <argument type="tagged" tag="api_platform.doctrine.orm.query_extension.collection" />
-            <argument type="tagged" tag="api_platform.doctrine.orm.query_extension.item" />
+            <argument type="tagged_iterator" tag="api_platform.doctrine.orm.query_extension.collection" />
+            <argument type="tagged_iterator" tag="api_platform.doctrine.orm.query_extension.item" />
         </service>
 
         <service id="api_platform.doctrine.orm.default.collection_data_provider" parent="api_platform.doctrine.orm.collection_data_provider" class="ApiPlatform\Core\Bridge\Doctrine\Orm\CollectionDataProvider">
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/elasticsearch.xml b/src/Bridge/Symfony/Bundle/Resources/config/elasticsearch.xml
@@ -77,7 +77,7 @@
             <argument type="service" id="serializer" />
             <argument type="service" id="api_platform.pagination" />
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
-            <argument type="tagged" tag="api_platform.elasticsearch.request_body_search_extension.collection" />
+            <argument type="tagged_iterator" tag="api_platform.elasticsearch.request_body_search_extension.collection" />
 
             <tag name="api_platform.collection_data_provider" priority="5" />
         </service>
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/graphql.xml b/src/Bridge/Symfony/Bundle/Resources/config/graphql.xml
@@ -201,7 +201,7 @@
             <argument type="service" id="api_platform.item_data_provider" on-invalid="ignore" />
             <argument>%api_platform.allow_plain_identifiers%</argument>
             <argument>null</argument>
-            <argument type="tagged" tag="api_platform.data_transformer" on-invalid="ignore" />
+            <argument type="tagged_iterator" tag="api_platform.data_transformer" on-invalid="ignore" />
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" on-invalid="ignore" />
 
             <!-- Run before serializer.normalizer.json_serializable -->
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/hal.xml b/src/Bridge/Symfony/Bundle/Resources/config/hal.xml
@@ -38,7 +38,7 @@
             <argument>null</argument>
             <argument>false</argument>
             <argument type="collection" />
-            <argument type="tagged" tag="api_platform.data_transformer" on-invalid="ignore" />
+            <argument type="tagged_iterator" tag="api_platform.data_transformer" on-invalid="ignore" />
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" on-invalid="ignore" />
             <argument>false</argument>
 
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/jsonapi.xml b/src/Bridge/Symfony/Bundle/Resources/config/jsonapi.xml
@@ -40,7 +40,7 @@
             <argument type="service" id="api_platform.jsonapi.name_converter.reserved_attribute_name" />
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
             <argument type="collection" />
-            <argument type="tagged" tag="api_platform.data_transformer" on-invalid="ignore" />
+            <argument type="tagged_iterator" tag="api_platform.data_transformer" on-invalid="ignore" />
             <argument>false</argument>
 
             <!-- Run before serializer.normalizer.json_serializable -->
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/jsonld.xml b/src/Bridge/Symfony/Bundle/Resources/config/jsonld.xml
@@ -26,7 +26,7 @@
             <argument type="service" id="api_platform.name_converter" on-invalid="ignore" />
             <argument type="service" id="serializer.mapping.class_metadata_factory" on-invalid="ignore" />
             <argument type="collection" />
-            <argument type="tagged" tag="api_platform.data_transformer" on-invalid="ignore" />
+            <argument type="tagged_iterator" tag="api_platform.data_transformer" on-invalid="ignore" />
             <argument>false</argument>
 
             <!-- Run before serializer.normalizer.json_serializable -->
diff --git a/src/Bridge/Symfony/Validator/EventListener/ValidateListener.php b/src/Bridge/Symfony/Validator/EventListener/ValidateListener.php
@@ -52,7 +52,7 @@ public function onKernelView(GetResponseForControllerResultEvent $event): void
     {
         $request = $event->getRequest();
         if (
-            $request->isMethodSafe(false)
+            $request->isMethodCacheable()
             || $request->isMethod('DELETE')
             || !($attributes = RequestAttributesExtractor::extractAttributes($request))
             || !$attributes['receive']
diff --git a/src/EventListener/DeserializeListener.php b/src/EventListener/DeserializeListener.php
@@ -73,7 +73,7 @@ public function onKernelRequest(GetResponseEvent $event): void
 
         if (
             'DELETE' === $method
-            || $request->isMethodSafe(false)
+            || $request->isMethodCacheable()
             || !($attributes = RequestAttributesExtractor::extractAttributes($request))
             || !$attributes['receive']
             || $this->isOperationAttributeDisabled($attributes, self::OPERATION_ATTRIBUTE_KEY)
diff --git a/src/EventListener/SerializeListener.php b/src/EventListener/SerializeListener.php
@@ -19,14 +19,14 @@
 use ApiPlatform\Core\Serializer\ResourceList;
 use ApiPlatform\Core\Serializer\SerializerContextBuilderInterface;
 use ApiPlatform\Core\Util\RequestAttributesExtractor;
-use Fig\Link\GenericLinkProvider;
-use Fig\Link\Link;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\WebLink\GenericLinkProvider;
+use Symfony\Component\WebLink\Link;
 
 /**
  * Serializes data.
diff --git a/src/EventListener/WriteListener.php b/src/EventListener/WriteListener.php
@@ -57,7 +57,7 @@ public function onKernelView(GetResponseForControllerResultEvent $event): void
 
         if (
             $controllerResult instanceof Response
-            || $request->isMethodSafe(false)
+            || $request->isMethodCacheable()
             || !($attributes = RequestAttributesExtractor::extractAttributes($request))
             || !$attributes['persist']
             || $this->isOperationAttributeDisabled($attributes, self::OPERATION_ATTRIBUTE_KEY)
diff --git a/src/Filter/QueryParameterValidateListener.php b/src/Filter/QueryParameterValidateListener.php
@@ -42,7 +42,7 @@ public function onKernelRequest(GetResponseEvent $event): void
     {
         $request = $event->getRequest();
         if (
-            !$request->isMethodSafe(false)
+            !$request->isMethodCacheable()
             || !($attributes = RequestAttributesExtractor::extractAttributes($request))
             || !isset($attributes['collection_operation_name'])
             || 'get' !== ($operationName = $attributes['collection_operation_name'])
diff --git a/src/Hydra/EventListener/AddLinkHeaderListener.php b/src/Hydra/EventListener/AddLinkHeaderListener.php
@@ -15,9 +15,9 @@
 
 use ApiPlatform\Core\Api\UrlGeneratorInterface;
 use ApiPlatform\Core\JsonLd\ContextBuilder;
-use Fig\Link\GenericLinkProvider;
-use Fig\Link\Link;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\WebLink\GenericLinkProvider;
+use Symfony\Component\WebLink\Link;
 
 /**
  * Adds the HTTP Link header pointing to the Hydra documentation.
diff --git a/src/Mercure/EventListener/AddLinkHeaderListener.php b/src/Mercure/EventListener/AddLinkHeaderListener.php
@@ -14,9 +14,9 @@
 namespace ApiPlatform\Core\Mercure\EventListener;
 
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
-use Fig\Link\GenericLinkProvider;
-use Fig\Link\Link;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\WebLink\GenericLinkProvider;
+use Symfony\Component\WebLink\Link;
 
 /**
  * Adds the HTTP Link header pointing to the Mercure hub for resources having their updates dispatched.
diff --git a/src/Validator/EventListener/ValidateListener.php b/src/Validator/EventListener/ValidateListener.php
@@ -53,7 +53,7 @@ public function onKernelView(GetResponseForControllerResultEvent $event): void
 
         if (
             $controllerResult instanceof Response
-            || $request->isMethodSafe(false)
+            || $request->isMethodCacheable()
             || $request->isMethod('DELETE')
             || !($attributes = RequestAttributesExtractor::extractAttributes($request))
             || !$attributes['receive']
diff --git a/tests/Hydra/EventListener/AddLinkHeaderListenerTest.php b/tests/Hydra/EventListener/AddLinkHeaderListenerTest.php
@@ -15,12 +15,12 @@
 
 use ApiPlatform\Core\Api\UrlGeneratorInterface;
 use ApiPlatform\Core\Hydra\EventListener\AddLinkHeaderListener;
-use Fig\Link\GenericLinkProvider;
-use Fig\Link\Link;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\WebLink\GenericLinkProvider;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
+use Symfony\Component\WebLink\Link;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
diff --git a/tests/Mercure/EventListener/AddLinkHeaderListenerTest.php b/tests/Mercure/EventListener/AddLinkHeaderListenerTest.php
@@ -17,12 +17,12 @@
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Resource\ResourceMetadata;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Dummy;
-use Fig\Link\GenericLinkProvider;
-use Fig\Link\Link;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\WebLink\GenericLinkProvider;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
+use Symfony\Component\WebLink\Link;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function __construct(ManagerRegistry $managerRegistry)`
`42`	`42`	`public function onKernelView(GetResponseForControllerResultEvent $event): void`
`43`	`43`	`{`
`44`	`44`	`$request = $event->getRequest();`
`45`		`- if ($request->isMethodSafe(false)) {`
	`45`	`+ if ($request->isMethodCacheable()) {`
`46`	`46`	`return;`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function onKernelView(GetResponseForControllerResultEvent $event): void`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`$user = $event->getControllerResult();`
`47`		`- if (!$user instanceof UserInterface \|\| $request->isMethodSafe(false)) {`
	`47`	`+ if (!$user instanceof UserInterface \|\| $request->isMethodCacheable()) {`
`48`	`48`	`return;`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function onKernelView(GetResponseForControllerResultEvent $event): void`
`52`	`52`	`{`
`53`	`53`	`$request = $event->getRequest();`
`54`	`54`	`if (`
`55`		`- $request->isMethodSafe(false)`
	`55`	`+ $request->isMethodCacheable()`
`56`	`56`	`\|\| $request->isMethod('DELETE')`
`57`	`57`	`\|\| !($attributes = RequestAttributesExtractor::extractAttributes($request))`
`58`	`58`	`\|\| !$attributes['receive']`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function onKernelRequest(GetResponseEvent $event): void`
`42`	`42`	`{`
`43`	`43`	`$request = $event->getRequest();`
`44`	`44`	`if (`
`45`		`- !$request->isMethodSafe(false)`
	`45`	`+ !$request->isMethodCacheable()`
`46`	`46`	`\|\| !($attributes = RequestAttributesExtractor::extractAttributes($request))`
`47`	`47`	`\|\| !isset($attributes['collection_operation_name'])`
`48`	`48`	`\|\| 'get' !== ($operationName = $attributes['collection_operation_name'])`