Merge pull request #2934 from teohhanhui/merge-2.4

Merge 2.4 into master

Author: soyuka

.circleci/config.yml

@@ -39,6 +39,13 @@ commands:
           command: |
             sudo pecl install mongodb-1.5.4
             sudo docker-php-ext-enable mongodb
+  install-pcov-php-extension:
+    steps:
+      - run:
+          name: Install pcov PHP extension
+          command: |
+            sudo pecl install pcov-1.0.6
+            sudo docker-php-ext-enable pcov
   merge-code-coverage-reports:
     parameters:
       dir:
@@ -51,14 +58,16 @@ commands:
       - run:
           name: Download phpcov
           command: |
-            if [ ! -e phpcov.phar ]; then
+            if ! command -v phpcov; then
               wget https://phar.phpunit.de/phpcov.phar
+              chmod +x phpcov.phar
+              sudo mv phpcov.phar /usr/local/bin/phpcov
             fi
       - run:
           name: Merge code coverage reports
           command: |
             mkdir -p "$(dirname -- "<< parameters.out >>")"
-            phpdbg -qrr phpcov.phar merge --clover "<< parameters.out >>" "<< parameters.dir >>"
+            phpcov merge --clover "<< parameters.out >>" "<< parameters.dir >>"
   merge-test-reports:
     parameters:
       dir:
@@ -263,6 +272,7 @@ jobs:
     steps:
       - checkout
       - install-mongodb-php-extension
+      - install-pcov-php-extension
       - disable-xdebug-php-extension
       - disable-php-memory-limit
       - update-composer
@@ -276,7 +286,7 @@ jobs:
             mkdir -p build/logs/phpunit build/coverage
             split_tests=$(find tests -name '*Test.php' | circleci tests split --split-by=timings)
             export PARALLEL='-j10% --joblog build/logs/parallel.log --rpl {_}\ s/\\//_/g;'
-            phpunit_cmd='phpdbg -qrr vendor/bin/phpunit --coverage-php build/coverage/coverage-{_}.cov --log-junit build/logs/phpunit/{_}.xml --exclude-group mongodb,resource-hog --colors=always {}'
+            phpunit_cmd='vendor/bin/phpunit --coverage-php build/coverage/coverage-{_}.cov --log-junit build/logs/phpunit/{_}.xml --exclude-group mongodb,resource-hog --colors=always {}'
             echo "$split_tests" | parallel "$phpunit_cmd" || echo "$split_tests" | parallel --retry-failed "$phpunit_cmd"
       - restore-npm-cache
       - merge-test-reports:
@@ -310,6 +320,7 @@ jobs:
     steps:
       - checkout
       - install-mongodb-php-extension
+      - install-pcov-php-extension
       - disable-xdebug-php-extension
       - disable-php-memory-limit
       - update-composer
@@ -323,7 +334,7 @@ jobs:
             mkdir -p build/logs/behat build/coverage
             for f in $(find features -name '*.feature' -not -path 'features/main/exposed_state.feature' -not -path 'features/elasticsearch/*' -not -path 'features/mongodb/*' | circleci tests split --split-by=timings); do
               _f=$(echo "$f" | tr / _)
-              FEATURE="${_f}" phpdbg -qrr vendor/bin/behat --format=progress --out=std --format=junit --out=build/logs/behat/"${_f}" --profile=default-coverage --no-interaction "$f"
+              FEATURE="${_f}" vendor/bin/behat --format=progress --out=std --format=junit --out=build/logs/behat/"${_f}" --profile=default-coverage --no-interaction "$f"
             done
       - restore-npm-cache
       - merge-test-reports:
@@ -355,6 +366,7 @@ jobs:
     steps:
       - checkout
       - install-mongodb-php-extension
+      - install-pcov-php-extension
       - disable-xdebug-php-extension
       - disable-php-memory-limit
       - update-composer
@@ -367,7 +379,7 @@ jobs:
           name: Run PHPUnit tests
           command: |
             mkdir -p build/logs/phpunit
-            phpdbg -qrr vendor/bin/phpunit --coverage-clover build/logs/clover.xml --log-junit build/logs/phpunit/junit.xml --exclude-group resource-hog --colors=always --configuration phpunit_mongodb.xml
+            vendor/bin/phpunit --coverage-clover build/logs/clover.xml --log-junit build/logs/phpunit/junit.xml --exclude-group resource-hog --colors=always --configuration phpunit_mongodb.xml
       - store_test_results:
           path: build/logs
       - store_artifacts:
@@ -392,6 +404,7 @@ jobs:
     steps:
       - checkout
       - install-mongodb-php-extension
+      - install-pcov-php-extension
       - disable-xdebug-php-extension
       - disable-php-memory-limit
       - update-composer
@@ -404,7 +417,7 @@ jobs:
           name: Run Behat tests
           command: |
             mkdir -p build/logs/behat
-            phpdbg -qrr vendor/bin/behat --format=progress --out=std --format=junit --out=build/logs/behat --profile=mongodb-coverage --no-interaction
+            vendor/bin/behat --format=progress --out=std --format=junit --out=build/logs/behat --profile=mongodb-coverage --no-interaction
       - restore-npm-cache
       - merge-test-reports:
           dir: build/logs/behat
@@ -435,6 +448,7 @@ jobs:
     steps:
       - checkout
       - install-mongodb-php-extension
+      - install-pcov-php-extension
       - disable-xdebug-php-extension
       - disable-php-memory-limit
       - update-composer
@@ -447,7 +461,7 @@ jobs:
           name: Run Behat tests
           command: |
             mkdir -p build/logs/behat
-            phpdbg -qrr vendor/bin/behat --format=progress --out=std --format=junit --out=build/logs/behat --profile=elasticsearch-coverage --no-interaction
+            vendor/bin/behat --format=progress --out=std --format=junit --out=build/logs/behat --profile=elasticsearch-coverage --no-interaction
       - restore-npm-cache
       - merge-test-reports:
           dir: build/logs/behat

.travis.yml

@@ -209,7 +209,7 @@ jobs:
         - *validate-openapi-v3-yaml
 
     - php: '7.3'
-      env: SYMFONY_DEPRECATIONS_HELPER=max[total]=0
+      env: SYMFONY_DEPRECATIONS_HELPER=max[total]=5 # 5 deprecation notices from FOSUserBundle
       before_install:
         - *install-mongodb-php-extension
         - *disable-xdebug-php-extension
@@ -229,5 +229,5 @@ jobs:
         - *validate-openapi-v3-yaml
 
   allow_failures:
-    - env: SYMFONY_DEPRECATIONS_HELPER=max[total]=0
+    - env: SYMFONY_DEPRECATIONS_HELPER=max[total]=5 # 5 deprecation notices from FOSUserBundle
   fast_finish: true

README.md

@@ -9,9 +9,10 @@ It natively supports popular open formats including [JSON for Linked Data (JSON-
 Build a working and fully-featured CRUD API in minutes. Leverage the awesome features of the tool to develop complex and
 high performance API-first projects. Extend or override everything you want.
 
-[![Build Status](https://travis-ci.org/api-platform/core.svg?branch=master)](https://travis-ci.org/api-platform/core)
-[![Build status](https://ci.appveyor.com/api/projects/status/grwuyprts3wdqx5l?svg=true)](https://ci.appveyor.com/project/dunglas/dunglasapibundle)
-[![codecov](https://codecov.io/gh/api-platform/core/branch/master/graph/badge.svg)](https://codecov.io/gh/api-platform/core)
+[![Travis CI](https://travis-ci.org/api-platform/core.svg?branch=master)](https://travis-ci.org/api-platform/core)
+[![CircleCI](https://circleci.com/gh/api-platform/core/tree/master.svg?style=shield)](https://circleci.com/gh/api-platform/core/tree/master)
+[![AppVeyor](https://ci.appveyor.com/api/projects/status/grwuyprts3wdqx5l/branch/master?svg=true)](https://ci.appveyor.com/project/dunglas/dunglasapibundle/branch/master)
+[![Codecov](https://codecov.io/gh/api-platform/core/branch/master/graph/badge.svg)](https://codecov.io/gh/api-platform/core/branch/master)
 [![SymfonyInsight](https://insight.symfony.com/projects/92d78899-946c-4282-89a3-ac92344f9a93/mini.svg)](https://insight.symfony.com/projects/92d78899-946c-4282-89a3-ac92344f9a93)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/api-platform/core/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/api-platform/core/?branch=master)
 

composer.json

@@ -53,7 +53,7 @@
         "phpstan/phpstan-doctrine": "^0.11",
         "phpstan/phpstan-phpunit": "^0.11",
         "phpstan/phpstan-symfony": "^0.11",
-        "phpunit/phpunit": "^7.5.2 || ^8.0.0",
+        "phpunit/phpunit": "^7.5.2 || ^8.0",
         "psr/log": "^1.0",
         "ramsey/uuid": "^3.7",
         "ramsey/uuid-doctrine": "^1.4",

features/bootstrap/DoctrineContext.php

@@ -1454,8 +1454,10 @@ public function thereIsTheFollowingProduct(PyStringNode $dataNode): void
         $product = $this->isOrm() ? new Product() : new ProductDocument();
         $product->setCode($data['code']);
         if (isset($data['mainTaxon'])) {
-            $mainTaxonId = (int) str_replace('/taxons/', '', $data['mainTaxon']);
-            $mainTaxon = $this->manager->getRepository($this->isOrm() ? Taxon::class : TaxonDocument::class)->find($mainTaxonId);
+            $mainTaxonCode = str_replace('/taxons/', '', $data['mainTaxon']);
+            $mainTaxon = $this->manager->getRepository($this->isOrm() ? Taxon::class : TaxonDocument::class)->findOneBy([
+                'code' => $mainTaxonCode,
+            ]);
             $product->setMainTaxon($mainTaxon);
         }
         $this->manager->persist($product);

features/json/input_output.feature

@@ -0,0 +1,37 @@
+Feature: JSON DTO input and output
+  In order to use the API
+  As a client software developer
+  I need to be able to use DTOs on my resources as Input or Output objects.
+
+  Background:
+    Given I add "Accept" header equal to "application/json"
+    And I add "Content-Type" header equal to "application/json"
+
+  Scenario: Request a password reset
+    And I send a "POST" request to "/users/password_reset_request" with body:
+    """
+    {
+      "email": "[email protected]"
+    }
+    """
+    Then the response status code should be 201
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/json; charset=utf-8"
+    And the JSON should be equal to:
+    """
+    {
+      "emailSentAt": "2019-07-05T15:44:00+00:00"
+    }
+    """
+
+  Scenario: Request a password reset for a non-existent user
+    And I send a "POST" request to "/users/password_reset_request" with body:
+    """
+    {
+      "email": "[email protected]"
+    }
+    """
+    Then the response status code should be 404
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/problem+json; charset=utf-8"
+    And the JSON node "detail" should be equal to "User does not exist."

features/jsonld/interface_as_resource.feature

@@ -15,15 +15,15 @@ Feature: JSON-LD using interface as resource
       "code": "WONDERFUL_TAXON"
     }
     """
-    When I send a "GET" request to "/taxons/1"
+    When I send a "GET" request to "/taxons/WONDERFUL_TAXON"
     Then the response status code should be 200
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
     And the JSON should be equal to:
     """
     {
       "@context": "/contexts/Taxon",
-      "@id": "/taxons/1",
+      "@id": "/taxons/WONDERFUL_TAXON",
       "@type": "Taxon",
       "code": "WONDERFUL_TAXON"
     }
@@ -34,22 +34,22 @@ Feature: JSON-LD using interface as resource
     """
     {
       "code": "GREAT_PRODUCT",
-      "mainTaxon": "/taxons/1"
+      "mainTaxon": "/taxons/WONDERFUL_TAXON"
     }
     """
-    When I send a "GET" request to "/products/1"
+    When I send a "GET" request to "/products/GREAT_PRODUCT"
     Then the response status code should be 200
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
     And the JSON should be equal to:
     """
     {
       "@context": "/contexts/Product",
-      "@id": "/products/1",
+      "@id": "/products/GREAT_PRODUCT",
       "@type": "Product",
       "code": "GREAT_PRODUCT",
       "mainTaxon": {
-        "@id": "/taxons/1",
+        "@id": "/taxons/WONDERFUL_TAXON",
         "@type": "Taxon",
         "code": "WONDERFUL_TAXON"
       }

phpstan.neon.dist

@@ -68,8 +68,9 @@ parameters:
 		-
 			message: '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Util\\QueryBuilderHelper::mapJoinAliases() should return array<string, array<string>\|string> but returns array<int|string, mixed>\.#'
 			path: %currentWorkingDirectory%/src/Bridge/Doctrine/Orm/Util/QueryBuilderHelper.php
+		# https://github.com/phpstan/phpstan/issues/1482
 		-
-			message: "#Call to function method_exists\\(\\) with 'Symfony\\\\\\\\Component.+' and '(removeBindings|addRemovedBindingIds)' will always evaluate to false\\.#"
+			message: "#Call to function method_exists\\(\\) with 'Symfony\\\\\\\\Component.+' and 'removeBindings' will always evaluate to false\\.#"
 			path: %currentWorkingDirectory%/tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php
 		-
 			message: "#Call to function method_exists\\(\\) with 'Symfony\\\\\\\\Component.+' and 'getReachableRoleNam.+' will always evaluate to false\\.#"
@@ -78,7 +79,7 @@ parameters:
 			message: "#Call to function method_exists\\(\\) with 'Symfony\\\\\\\\Component.+' and 'getRoleNames' will always evaluate to false\\.#"
 			path: %currentWorkingDirectory%/tests/Security/EventListener/DenyAccessListenerTest.php
 		- "#Call to method PHPUnit\\\\Framework\\\\Assert::assertSame\\(\\) with array\\('(collection_context|item_context|subresource_context)'\\) and array<Symfony\\\\Component\\\\VarDumper\\\\Cloner\\\\Data>\\|bool\\|float\\|int\\|string\\|null will always evaluate to false\\.#"
-		# https://github.com/doctrine/doctrine2/pull/7298/files
+		# https://github.com/doctrine/doctrine2/pull/7298
 		- '#Strict comparison using === between null and int will always evaluate to false\.#'
 		-
 			message: '#Binary operation "\+" between (float\|int\|)?string and 0 results in an error\.#'

src/Bridge/Symfony/Bundle/Resources/config/api.xml

@@ -175,8 +175,9 @@
 
         <service id="api_platform.listener.view.write" class="ApiPlatform\Core\EventListener\WriteListener">
             <argument type="service" id="api_platform.data_persister" />
-            <argument type="service" id="api_platform.iri_converter" on-invalid="null" />
+            <argument type="service" id="api_platform.iri_converter" />
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
+            <argument type="service" id="api_platform.resource_class_resolver" />
 
             <tag name="kernel.event_listener" event="kernel.view" method="onKernelView" priority="32" />
         </service>

src/Bridge/Symfony/Messenger/DataPersister.php

@@ -88,6 +88,9 @@ public function persist($data, array $context = [])
      */
     public function remove($data, array $context = [])
     {
-        $this->messageBus->dispatch(new Envelope($data, [new RemoveStamp()]));
+        $this->messageBus->dispatch(
+            (new Envelope($data))
+                ->with(new RemoveStamp())
+        );
     }
 }