Merge pull request api-platform#4503 from dunglas/feat/symfony-5.4

Compatibility with Symfony 5.4

Author: dunglas

.github/workflows/ci.yml

@@ -15,10 +15,8 @@ jobs:
     strategy:
       matrix:
         php:
-          - '7.4'
+          - '8.0'
       fail-fast: false
-    env:
-      PHP_CS_FIXER_FUTURE_MODE: '1'
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -40,7 +38,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - '7.4'
+          - '8.0'
       fail-fast: false
     env:
       APP_DEBUG: '1' # https://github.com/phpstan/phpstan-symfony/issues/37

.php-cs-fixer.dist.php

@@ -35,8 +35,6 @@
         '@PHPUnit60Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        'single_line_comment_style' => false, // Temporary fix for compatibility with PHP 8 attributes, see https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/5284
-        'comment_to_phpdoc' => true, // Temporary fix for compatibility with PHP 8 attributes, see https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/5284
         'align_multiline_comment' => [
             'comment_type' => 'phpdocs_like',
         ],
@@ -75,9 +73,10 @@
             ],
         ],
         'no_superfluous_elseif' => true,
-        'no_superfluous_phpdoc_tags' => [
-            'allow_mixed' => false,
-        ],
+        // To re-enable in API Platform 3: https://github.com/symfony/symfony/issues/43021
+        //'no_superfluous_phpdoc_tags' => [
+        //    'allow_mixed' => false,
+        //],
         'no_unset_cast' => true,
         'no_unset_on_property' => true,
         'no_useless_else' => true,

composer.json

@@ -72,6 +72,7 @@
         "symfony/form": "^3.4 || ^4.4 || ^5.1",
         "symfony/framework-bundle": "^4.4 || ^5.1",
         "symfony/http-client": "^4.4 || ^5.1",
+        "symfony/intl": "^4.4 || ^5.3",
         "symfony/mercure-bundle": "*",
         "symfony/messenger": "^4.4 || ^5.1",
         "symfony/phpunit-bridge": "^5.1.7",

features/main/custom_normalized.feature

@@ -53,7 +53,7 @@ Feature: Using custom normalized entity
     }
     """
 
-  Scenario: Create a resource with a custom normalized dummy and an id
+  Scenario: Update a resource with a custom normalized dummy and an id
     When I add "Content-Type" header equal to "application/json"
     When I add "Accept" header equal to "application/json"
     And I send a "PUT" request to "/related_normalized_dummies/1" with body:

phpstan.neon.dist

@@ -86,9 +86,6 @@ parameters:
 			path: tests/GraphQl/Type/TypesContainerTest.php
 
 		# Expected, due to PHP 8 attributes
-		- '#ReflectionProperty::getAttributes\(\)#'
-		- '#ReflectionMethod::getAttributes\(\)#'
-		- '#ReflectionClass<object>::getAttributes\(\)#'
 		- '#Constructor of class ApiPlatform\\Core\\Annotation\\ApiResource has an unused parameter#'
 		- '#Constructor of class ApiPlatform\\Core\\Annotation\\ApiProperty has an unused parameter#'
 

src/Api/ResourceClassResolverInterface.php

@@ -27,6 +27,7 @@ interface ResourceClassResolverInterface
      *
      * @param string $resourceClass The expected resource class
      * @param bool   $strict        If true, value must match the expected resource class
+     * @param mixed  $value
      *
      * @throws InvalidArgumentException
      */

src/Bridge/Doctrine/Common/DataPersister.php

@@ -78,6 +78,8 @@ public function remove($data, array $context = [])
 
     /**
      * Gets the Doctrine object manager associated with given data.
+     *
+     * @param mixed $data
      */
     private function getManager($data): ?DoctrineObjectManager
     {
@@ -86,6 +88,8 @@ private function getManager($data): ?DoctrineObjectManager
 
     /**
      * Checks if doctrine does not manage data automatically.
+     *
+     * @param mixed $data
      */
     private function isDeferredExplicit(DoctrineObjectManager $manager, $data): bool
     {

src/Bridge/Doctrine/EventListener/WriteListener.php

@@ -71,6 +71,8 @@ public function onKernelView(ViewEvent $event): void
 
     /**
      * Gets the manager if applicable.
+     *
+     * @param mixed $data
      */
     private function getManager(string $resourceClass, $data): ?ObjectManager
     {

src/Bridge/Doctrine/MongoDbOdm/CollectionDataProvider.php

@@ -56,7 +56,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
      *
      * @throws RuntimeException
      */
-    public function getCollection(string $resourceClass, string $operationName = null, array $context = [])
+    public function getCollection(string $resourceClass, string $operationName = null, array $context = []): iterable
     {
         /** @var DocumentManager $manager */
         $manager = $this->managerRegistry->getManagerForClass($resourceClass);

src/Bridge/Doctrine/MongoDbOdm/Filter/AbstractFilter.php

@@ -60,6 +60,8 @@ public function apply(Builder $aggregationBuilder, string $resourceClass, string
 
     /**
      * Passes a property through the filter.
+     *
+     * @param mixed $value
      */
     abstract protected function filterProperty(string $property, $value, Builder $aggregationBuilder, string $resourceClass, string $operationName = null, array &$context = []);