Merge pull request #2381 from teohhanhui/merge-2.3

Merge 2.3 into master

Author: teohhanhui

.circleci/config.yml

@@ -86,7 +86,7 @@ jobs:
       - *update-composer
       - run:
           name: Install PHP-CS-Fixer
-          command: composer global require friendsofphp/php-cs-fixer:^2.12
+          command: composer global require friendsofphp/php-cs-fixer:^2.13
       - *save-composer-cache-by-revision
       - *save-composer-cache-by-branch
       - run:
@@ -124,7 +124,6 @@ jobs:
       - image: circleci/php:7.2-node-browsers
     environment:
       SYMFONY_DEPRECATIONS_HELPER: weak_vendors
-      APP_ENV: test
     parallelism: 2
     working_directory: ~/api-platform/core
     steps:
@@ -141,8 +140,11 @@ jobs:
       - run:
           name: Run PHPUnit tests
           command: |-
-            mkdir -p build/logs/tmp build/cov
-            phpdbg -qrr vendor/bin/phpunit --coverage-php build/cov/coverage.cov --log-junit build/logs/tmp/coverage.xml --colors=always
+            mkdir -p build/logs/parallel build/logs/tmp build/cov
+            split_tests=$(find tests -name '*Test.php' -not -path 'tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php' | circleci tests split --split-by=timings)
+            export PARALLEL='-j10% --joblog build/logs/parallel/jobs.log --rpl {_}\ s/\\//_/g;'
+            phpunit_cmd='phpdbg -qrr vendor/bin/phpunit --coverage-php build/cov/coverage-{_}.cov --log-junit build/logs/tmp/{_}.xml --colors=always {}'
+            echo "$split_tests" | parallel "$phpunit_cmd" || echo "$split_tests" | parallel --retry-failed "$phpunit_cmd"
       - run:
           name: Merge PHPUnit test reports
           command: |-
@@ -154,6 +156,9 @@ jobs:
       - store_artifacts:
           path: build/logs/phpunit/junit.xml
           destination: build/logs/phpunit/junit.xml
+      - store_artifacts:
+          path: build/logs/parallel/jobs.log
+          destination: build/logs/parallel/jobs.log
       - persist_to_workspace:
           root: build
           paths:

.php_cs.dist

@@ -20,6 +20,8 @@ return PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
     ->setRules([
         '@DoctrineAnnotation' => true,
+        '@PHP71Migration' => true,
+        '@PHP71Migration:risky' => true,
         '@PHPUnit60Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
@@ -33,7 +35,7 @@ return PhpCsFixer\Config::create()
         'braces' => [
             'allow_single_line_closure' => true,
         ],
-        'declare_strict_types' => true,
+        'compact_nullable_typehint' => true,
         'doctrine_annotation_array_assignment' => [
             'operator' => '=',
         ],
@@ -45,11 +47,6 @@ return PhpCsFixer\Config::create()
             'header' => $header,
             'location' => 'after_open',
         ],
-        'native_function_invocation' => [
-            'include' => [
-                '@compiler_optimized',
-            ],
-        ],
         'no_extra_blank_lines' => [
             'tokens' => [
                 'break',
@@ -74,11 +71,14 @@ return PhpCsFixer\Config::create()
             ],
             'sortAlgorithm' => 'alpha',
         ],
+        'php_unit_method_casing' => [
+            'case' => 'camel_case',
+        ],
         'phpdoc_order' => true,
-        // 'simplified_null_return' => true,
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
         'strict_comparison' => true,
         'strict_param' => true,
-        'ternary_to_null_coalescing' => true,
+        'void_return' => false, // BC breaks; to be done in API Platform 3.0
     ])
     ->setFinder($finder)
 ;

appveyor.yml

@@ -9,7 +9,7 @@ install:
   - ps: Set-Service wuauserv -StartupType Manual
   - cinst -y php composer
   - refreshenv
-  - cd c:\tools\php72
+  - cd c:\tools\php73
   - copy php.ini-production php.ini /Y
   - echo date.timezone="UTC" >> php.ini
   - echo extension_dir=ext >> php.ini

composer.json

@@ -72,6 +72,7 @@
         "webonyx/graphql-php": ">=0.13 <1.0"
     },
     "conflict": {
+        "doctrine/common": "<2.7",
         "symfony/dependency-injection": "<3.4"
     },
     "suggest": {

src/Api/FilterLocatorTrait.php

@@ -48,7 +48,6 @@ private function setFilterLocator($filterLocator = null, bool $allowNull = false
     /**
      * Gets a filter with a backward compatibility.
      *
-     *
      * @return FilterInterface|null
      */
     private function getFilter(string $filterId)

src/Api/IriConverterInterface.php

@@ -27,7 +27,6 @@ interface IriConverterInterface
     /**
      * Retrieves an item from its IRI.
      *
-     *
      * @throws InvalidArgumentException
      * @throws ItemNotFoundException
      *
@@ -48,23 +47,20 @@ public function getIriFromItem($item, int $referenceType = UrlGeneratorInterface
     /**
      * Gets the IRI associated with the given resource collection.
      *
-     *
      * @throws InvalidArgumentException
      */
     public function getIriFromResourceClass(string $resourceClass, int $referenceType = UrlGeneratorInterface::ABS_PATH): string;
 
     /**
      * Gets the item IRI associated with the given resource.
      *
-     *
      * @throws InvalidArgumentException
      */
     public function getItemIriFromResourceClass(string $resourceClass, array $identifiers, int $referenceType = UrlGeneratorInterface::ABS_PATH): string;
 
     /**
      * Gets the IRI associated with the given resource subresource.
      *
-     *
      * @throws InvalidArgumentException
      */
     public function getSubresourceIriFromResourceClass(string $resourceClass, array $identifiers, int $referenceType = UrlGeneratorInterface::ABS_PATH): string;

src/Api/OperationMethodResolverInterface.php

@@ -25,15 +25,13 @@ interface OperationMethodResolverInterface
     /**
      * Resolves the uppercased HTTP method associated with a collection operation.
      *
-     *
      * @throws RuntimeException
      */
     public function getCollectionOperationMethod(string $resourceClass, string $operationName): string;
 
     /**
      * Resolves the uppercased HTTP method associated with an item operation.
      *
-     *
      * @throws RuntimeException
      */
     public function getItemOperationMethod(string $resourceClass, string $operationName): string;

src/Api/ResourceClassResolverInterface.php

@@ -25,7 +25,6 @@ interface ResourceClassResolverInterface
     /**
      * Guesses the associated resource.
      *
-     *
      * @throws InvalidArgumentException
      */
     public function getResourceClass($value, string $resourceClass = null, bool $strict = false): string;

src/Bridge/Doctrine/Common/DataPersister.php

@@ -78,7 +78,6 @@ public function remove($data)
     /**
      * Gets the Doctrine object manager associated with given data.
      *
-     *
      * @return DoctrineObjectManager|null
      */
     private function getManager($data)

src/Bridge/Doctrine/EventListener/PurgeHttpCacheListener.php

@@ -133,7 +133,7 @@ private function addTagsFor($value)
             return;
         }
 
-        if (!\is_array($value) && !$value instanceof \Traversable) {
+        if (!is_iterable($value)) {
             $this->addTagForItem($value);
 
             return;