Merge pull request #1447 from meyerbaptiste/merge_2.1

Merge branch '2.1'

Author: meyerbaptiste

.travis.yml

@@ -15,10 +15,11 @@ matrix:
   include:
     - php: '7.0'
     - php: '7.1'
+    - php: '7.2'
       env: coverage=1 lint=1
-    - php: '7.1'
+    - php: '7.2'
       env: deps='low'
-    - php: '7.1'
+    - php: '7.2'
       env: SYMFONY_DEPRECATIONS_HELPER=0
   allow_failures:
       env: SYMFONY_DEPRECATIONS_HELPER=0
@@ -31,11 +32,11 @@ before_install:
   - if [[ $coverage = 1 ]]; then mkdir -p build/logs build/cov; fi
   - if [[ $coverage = 1 ]]; then wget https://phar.phpunit.de/phpcov.phar; fi
   - if [[ $coverage = 1 ]]; then wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; fi
-  - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.4.0/php-cs-fixer.phar; fi
+  - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.7.1/php-cs-fixer.phar; fi
   - if [[ $lint = 1 ]]; then composer global require --dev 'phpstan/phpstan:^0.8'; fi
 
 install:
-  - if [[ $coverage = 1 ]]; then composer require --dev --no-update 'phpunit/php-code-coverage:^4.0.1'; fi
+  - if [[ $coverage = 1 ]]; then composer require --dev --no-update 'phpunit/php-code-coverage:^5.2.2'; fi
   - if [[ ! $deps ]]; then composer update --prefer-dist --no-progress --no-suggest --ansi; fi
   - if [[ $deps = 'low' ]]; then composer update --prefer-dist --no-progress --no-suggest --prefer-stable --prefer-lowest --ansi; fi
 

README.md

@@ -9,8 +9,6 @@ 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.
 
-[![JSON-LD enabled](http://json-ld.org/images/json-ld-button-88.png)](http://json-ld.org)
-[![Join the chat at https://gitter.im/api-platform/api-platform](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/api-platform/api-platform?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![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)
 [![Coverage Status](https://coveralls.io/repos/github/api-platform/core/badge.svg)](https://coveralls.io/github/api-platform/core)

composer.json

@@ -39,10 +39,10 @@
         "guzzlehttp/guzzle": "^6.0",
         "justinrainbow/json-schema": "^1.5",
         "nelmio/api-doc-bundle": "^2.11.2",
-        "php-mock/php-mock-phpunit": "^1.1",
+        "php-mock/php-mock-phpunit": "^2.0",
         "phpdocumentor/reflection-docblock": "^3.0",
-        "phpdocumentor/type-resolver": "^0.2",
-        "phpunit/phpunit": "^5.6.8",
+        "phpdocumentor/type-resolver": "^0.2.1",
+        "phpunit/phpunit": "^6.1",
         "psr/log": "^1.0",
         "sensio/framework-extra-bundle": "^3.0.11 || ^4.0",
         "symfony/asset": "^3.3 || ^4.0",

features/bootstrap/CoverageContext.php

@@ -24,7 +24,7 @@
  * @author Kévin Dunglas <dunglas@gmail.com>
  * @copyright Adapted from https://gist.github.com/eliecharra/9c8b3ba57998b50e14a6
  */
-class CoverageContext implements Context
+final class CoverageContext implements Context
 {
     /**
      * @var CodeCoverage

features/bootstrap/FeatureContext.php

@@ -45,34 +45,21 @@
 use Behat\Behat\Context\SnippetAcceptingContext;
 use Behatch\HttpCall\Request;
 use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Tools\SchemaTool;
 
 /**
  * Defines application features from the specific context.
  */
-class FeatureContext implements Context, SnippetAcceptingContext
+final class FeatureContext implements Context, SnippetAcceptingContext
 {
-    private $doctrine;
-
     /**
-     * @var ObjectManager
+     * @var EntityManagerInterface
      */
     private $manager;
-
-    /**
-     * @var SchemaTool
-     */
+    private $doctrine;
     private $schemaTool;
-
-    /**
-     * @var array
-     */
     private $classes;
-
-    /**
-     * @var Request
-     */
     private $request;
 
     /**
@@ -121,7 +108,7 @@ public function dropDatabase()
     /**
      * @Given there is :nb dummy objects
      */
-    public function thereIsDummyObjects($nb)
+    public function thereIsDummyObjects(int $nb)
     {
         $descriptions = ['Smart dummy.', 'Not so smart dummy.'];
 
@@ -141,7 +128,7 @@ public function thereIsDummyObjects($nb)
     /**
      * @Given there are :nb foo objects with fake names
      */
-    public function thereAreFooObjectsWithFakeNames($nb)
+    public function thereAreFooObjectsWithFakeNames(int $nb)
     {
         $names = ['Hawsepipe', 'Sthenelus', 'Ephesian', 'Separativeness', 'Balbo'];
         $bars = ['Lorem', 'Dolor', 'Dolor', 'Sit', 'Amet'];
@@ -160,7 +147,7 @@ public function thereAreFooObjectsWithFakeNames($nb)
     /**
      * @Given there is :nb dummy group objects
      */
-    public function thereIsDummyGroupObjects($nb)
+    public function thereIsDummyGroupObjects(int $nb)
     {
         for ($i = 1; $i <= $nb; ++$i) {
             $dummyGroup = new DummyGroup();
@@ -178,7 +165,7 @@ public function thereIsDummyGroupObjects($nb)
     /**
      * @Given there is :nb dummy property objects
      */
-    public function thereIsDummyPropertyObjects($nb)
+    public function thereIsDummyPropertyObjects(int $nb)
     {
         for ($i = 1; $i <= $nb; ++$i) {
             $dummyProperty = new DummyProperty();
@@ -200,7 +187,7 @@ public function thereIsDummyPropertyObjects($nb)
     /**
      * @Given there are :nb embedded dummy objects
      */
-    public function thereIsEmbeddedDummyObjects($nb)
+    public function thereIsEmbeddedDummyObjects(int $nb)
     {
         for ($i = 1; $i <= $nb; ++$i) {
             $dummy = new EmbeddedDummy();
@@ -219,7 +206,7 @@ public function thereIsEmbeddedDummyObjects($nb)
     /**
      * @Given there is :nb dummy objects with relatedDummy
      */
-    public function thereIsDummyObjectsWithRelatedDummy($nb)
+    public function thereIsDummyObjectsWithRelatedDummy(int $nb)
     {
         for ($i = 1; $i <= $nb; ++$i) {
             $relatedDummy = new RelatedDummy();
@@ -240,7 +227,7 @@ public function thereIsDummyObjectsWithRelatedDummy($nb)
     /**
      * @Given there is :nb dummy objects with relatedDummy and its thirdLevel
      */
-    public function thereIsDummyObjectsWithRelatedDummyAndItsThirdLevel($nb)
+    public function thereIsDummyObjectsWithRelatedDummyAndItsThirdLevel(int $nb)
     {
         for ($i = 1; $i <= $nb; ++$i) {
             $thirdLevel = new ThirdLevel();
@@ -265,7 +252,7 @@ public function thereIsDummyObjectsWithRelatedDummyAndItsThirdLevel($nb)
     /**
      * @Given there is :nb dummy objects with embeddedDummy
      */
-    public function thereIsDummyObjectsWithEmbeddedDummy($nb)
+    public function thereIsDummyObjectsWithEmbeddedDummy(int $nb)
     {
         for ($i = 1; $i <= $nb; ++$i) {
             $embeddableDummy = new EmbeddableDummy();
@@ -284,7 +271,7 @@ public function thereIsDummyObjectsWithEmbeddedDummy($nb)
     /**
      * @Given there is :nb dummy objects having each :nbrelated relatedDummies
      */
-    public function thereIsDummyObjectsWithRelatedDummies($nb, $nbrelated)
+    public function thereIsDummyObjectsWithRelatedDummies(int $nb, int $nbrelated)
     {
         for ($i = 1; $i <= $nb; ++$i) {
             $dummy = new Dummy();
@@ -294,11 +281,12 @@ public function thereIsDummyObjectsWithRelatedDummies($nb, $nbrelated)
             for ($j = 1; $j <= $nbrelated; ++$j) {
                 $relatedDummy = new RelatedDummy();
                 $relatedDummy->setName('RelatedDummy'.$j.$i);
+
                 $this->manager->persist($relatedDummy);
+
                 $dummy->addRelatedDummy($relatedDummy);
             }
 
-            $this->manager->persist($relatedDummy);
             $this->manager->persist($dummy);
         }
 
@@ -308,7 +296,7 @@ public function thereIsDummyObjectsWithRelatedDummies($nb, $nbrelated)
     /**
      * @Given there is :nb dummy objects with dummyDate
      */
-    public function thereIsDummyObjectsWithDummyDate($nb)
+    public function thereIsDummyObjectsWithDummyDate(int $nb)
     {
         $descriptions = ['Smart dummy.', 'Not so smart dummy.'];
 
@@ -334,7 +322,7 @@ public function thereIsDummyObjectsWithDummyDate($nb)
     /**
      * @Given there is :nb dummy objects with dummyDate and dummyBoolean :bool
      */
-    public function thereIsDummyObjectsWithDummyDateAndDummyBoolean($nb, $bool)
+    public function thereIsDummyObjectsWithDummyDateAndDummyBoolean(int $nb, string $bool)
     {
         $descriptions = ['Smart dummy.', 'Not so smart dummy.'];
 
@@ -370,7 +358,7 @@ public function thereIsDummyObjectsWithDummyDateAndDummyBoolean($nb, $bool)
     /**
      * @Given there is :nb dummy objects with dummyDate and relatedDummy
      */
-    public function thereIsDummyObjectsWithDummyDateAndRelatedDummy($nb)
+    public function thereIsDummyObjectsWithDummyDateAndRelatedDummy(int $nb)
     {
         for ($i = 1; $i <= $nb; ++$i) {
             $date = new \DateTime(sprintf('2015-04-%d', $i), new \DateTimeZone('UTC'));
@@ -398,7 +386,7 @@ public function thereIsDummyObjectsWithDummyDateAndRelatedDummy($nb)
     /**
      * @Given there is :nb embedded dummy objects with dummyDate and embeddedDummy
      */
-    public function thereIsDummyObjectsWithDummyDateAndEmbeddedDummy($nb)
+    public function thereIsDummyObjectsWithDummyDateAndEmbeddedDummy(int $nb)
     {
         for ($i = 1; $i <= $nb; ++$i) {
             $date = new \DateTime(sprintf('2015-04-%d', $i), new \DateTimeZone('UTC'));
@@ -424,7 +412,7 @@ public function thereIsDummyObjectsWithDummyDateAndEmbeddedDummy($nb)
     /**
      * @Given there is :nb dummy objects with dummyPrice
      */
-    public function thereIsDummyObjectsWithDummyPrice($nb)
+    public function thereIsDummyObjectsWithDummyPrice(int $nb)
     {
         $descriptions = ['Smart dummy.', 'Not so smart dummy.'];
         $prices = ['9.99', '12.99', '15.99', '19.99'];
@@ -445,7 +433,7 @@ public function thereIsDummyObjectsWithDummyPrice($nb)
     /**
      * @Given there is :nb dummy objects with dummyBoolean :bool
      */
-    public function thereIsDummyObjectsWithDummyBoolean($nb, $bool)
+    public function thereIsDummyObjectsWithDummyBoolean(int $nb, string $bool)
     {
         if (in_array($bool, ['true', '1', 1], true)) {
             $bool = true;
@@ -473,7 +461,7 @@ public function thereIsDummyObjectsWithDummyBoolean($nb, $bool)
     /**
      * @Given there is :nb embedded dummy objects with embeddedDummy.dummyBoolean :bool
      */
-    public function thereIsDummyObjectsWithEmbeddedDummyBoolean($nb, $bool)
+    public function thereIsDummyObjectsWithEmbeddedDummyBoolean(int $nb, string $bool)
     {
         if (in_array($bool, ['true', '1', 1], true)) {
             $bool = true;
@@ -500,7 +488,7 @@ public function thereIsDummyObjectsWithEmbeddedDummyBoolean($nb, $bool)
     /**
      * @Given there is :nb embedded dummy objects with relatedDummy.embeddedDummy.dummyBoolean :bool
      */
-    public function thereIsDummyObjectsWithRelationEmbeddedDummyBoolean($nb, $bool)
+    public function thereIsDummyObjectsWithRelationEmbeddedDummyBoolean(int $nb, string $bool)
     {
         if (in_array($bool, ['true', '1', 1], true)) {
             $bool = true;
@@ -640,7 +628,7 @@ public function thereIsAFooEntityWithRelatedBars()
     /**
      * @Given there is a RelatedDummy with :nb friends
      */
-    public function thereIsARelatedDummyWithFriends($nb)
+    public function thereIsARelatedDummyWithFriends(int $nb)
     {
         $relatedDummy = new RelatedDummy();
         $relatedDummy->setName('RelatedDummy with friends');
@@ -669,7 +657,7 @@ public function thereIsARelatedDummyWithFriends($nb)
     }
 
     /**
-     * @Given there is an answer ":answer" to the question ":question"
+     * @Given there is an answer :answer to the question :question
      */
     public function thereIsAnAnswerToTheQuestion(string $a, string $q)
     {
@@ -690,7 +678,7 @@ public function thereIsAnAnswerToTheQuestion(string $a, string $q)
     /**
      * @Given there are :nb nodes in a container :uuid
      */
-    public function thereAreNodesInAContainer($nb, $uuid)
+    public function thereAreNodesInAContainer(int $nb, string $uuid)
     {
         $container = new Container();
         $container->setId($uuid);
@@ -709,10 +697,9 @@ public function thereAreNodesInAContainer($nb, $uuid)
     /**
      * @Then the password :password for user :user should be hashed
      */
-    public function thePasswordForUserShouldBeHashed($password, $user)
+    public function thePasswordForUserShouldBeHashed(string $password, string $user)
     {
-        $repository = $this->doctrine->getRepository(User::class);
-        $user = $repository->find($user);
+        $user = $this->doctrine->getRepository(User::class)->find($user);
 
         if (!password_verify($password, $user->getPassword())) {
             throw new \Exception('User password mismatch');

features/bootstrap/GraphqlContext.php

@@ -23,7 +23,7 @@
  *
  * @author Alan Poulain <contact@alanpoulain.eu>
  */
-class GraphqlContext implements Context
+final class GraphqlContext implements Context
 {
     /**
      * @var RestContext
@@ -43,15 +43,13 @@ class GraphqlContext implements Context
     /**
      * Gives access to the Behatch context.
      *
-     * @param BeforeScenarioScope $scope
-     *
      * @BeforeScenario
      */
     public function gatherContexts(BeforeScenarioScope $scope)
     {
         /** @var InitializedContextEnvironment $environment */
         $environment = $scope->getEnvironment();
-        $this->restContext = $environment->getContext('Behatch\Context\RestContext');
+        $this->restContext = $environment->getContext(RestContext::class);
     }
 
     /**

features/bootstrap/HttpCacheContext.php

@@ -12,12 +12,13 @@
 declare(strict_types=1);
 
 use Behat\Symfony2Extension\Context\KernelAwareContext;
+use PHPUnit\Framework\ExpectationFailedException;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class HttpCacheContext implements KernelAwareContext
+final class HttpCacheContext implements KernelAwareContext
 {
     /**
      * @var KernelInterface
@@ -30,7 +31,7 @@ public function setKernel(KernelInterface $kernel)
     }
 
     /**
-     * @Then ":iris" IRIs should be purged
+     * @Then :iris IRIs should be purged
      */
     public function irisShouldBePurged(string $iris)
     {
@@ -40,9 +41,7 @@ public function irisShouldBePurged(string $iris)
         $purger->clear();
 
         if ($iris !== $purgedIris) {
-            throw new \PHPUnit_Framework_ExpectationFailedException(
-                sprintf('IRIs "%s" does not match expected "%s".', $purgedIris, $iris)
-            );
+            throw new ExpectationFailedException(sprintf('IRIs "%s" does not match expected "%s".', $purgedIris, $iris));
         }
     }
 }