Merge pull request #569 from api-platform/prophecy

Unskip tests using Prophecy

Author: dunglas

.travis.yml

@@ -27,5 +27,5 @@ install:
     - composer update --no-interaction --prefer-dist
 
 script:
-    - phpunit
+    - vendor/bin/phpunit
     - vendor/bin/behat

appveyor.yml

@@ -22,9 +22,8 @@ install:
   - cd %APPVEYOR_BUILD_FOLDER%
   - php -r "readfile('http://getcomposer.org/installer');" | php
   - php composer.phar install --no-interaction --no-progress
-  - appveyor DownloadFile https://phar.phpunit.de/phpunit.phar
 
 test_script:
   - cd %APPVEYOR_BUILD_FOLDER%
-  - php phpunit.phar
   - php vendor\behat\behat\bin\behat
+  - php vendor\phpunit\phpunit\phpunit

composer.json

@@ -24,6 +24,7 @@
     "willdurand/negotiation": "^2.0"
   },
   "require-dev": {
+    "phpunit/phpunit": "^5.0",
     "behat/behat": "^3.1",
     "behat/mink": "^1.7",
     "behat/mink-browserkit-driver": "^1.3.1",
@@ -36,7 +37,7 @@
     "nelmio/api-doc-bundle": "^2.11.2",
     "php-mock/php-mock-phpunit": "^1.1",
     "phpdocumentor/reflection-docblock": "^3.0",
-    "symfony/cache": "^3.1@dev",
+    "symfony/cache": "^3.1",
     "symfony/dependency-injection": "^2.8 || ^3.0",
     "symfony/framework-bundle": "^3.1",
     "symfony/phpunit-bridge": "^3.1",

tests/Bridge/Doctrine/Orm/Filter/SearchFilterTest.php

@@ -75,8 +75,6 @@ protected function setUp()
      */
     public function testApply(array $filterParameters, array $query, $expected)
     {
-        $this->markTestSkipped('Require Prophecy to update to phpDocumentor/reflection-docblock 3.');
-
         $request = Request::create('/api/dummies', 'GET', $query);
         $requestStack = new RequestStack();
         $requestStack->push($request);
@@ -441,7 +439,7 @@ public function filterProvider()
                     'relatedDummies' => [['foo']],
                 ],
                 [
-                    'dql' => sprintf('SELECT o FROM %s o inner join o.relatedDummy relatedDummy_123456abcdefg WHERE relatedDummy_123456abcdefg.id = :relatedDummy_123456abcdefg', Dummy::class),
+                    'dql' => sprintf('SELECT o FROM %s o INNER JOIN o.relateddummy relateddummy_123456abcdefg WHERE o.name = :name_123456abcdefg AND relateddummy_123456abcdefg.id = :relateddummy_123456abcdefg', Dummy::class),
                     'parameters' => [
                         'relatedDummy_123456abcdefg' => 'foo',
                     ],

tests/Metadata/Resource/Factory/PhpDocResourceMetadataFactoryTest.php

@@ -43,8 +43,6 @@ public function testNoDocBlock()
 
     public function testExtractDescription()
     {
-        $this->markTestSkipped('Require Prophecy to update to phpDocumentor/reflection-docblock 3.');
-
         $decoratedProphecy = $this->prophesize(ResourceMetadataFactoryInterface::class);
         $decoratedProphecy->create(DummyEntity::class)->willReturn(new ResourceMetadata())->shouldBeCalled();
         $decorated = $decoratedProphecy->reveal();