From 789f664934f5862b3d822040dc13edb5539ad895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Tue, 7 Jun 2016 14:50:35 +0200
Subject: [PATCH] Unskip tests using Prophecy

---
 .travis.yml                                                   | 2 +-
 appveyor.yml                                                  | 3 +--
 composer.json                                                 | 3 ++-
 tests/Bridge/Doctrine/Orm/Filter/SearchFilterTest.php         | 4 +---
 .../Resource/Factory/PhpDocResourceMetadataFactoryTest.php    | 2 --
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5a67fa15b04..8a7c562851f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,5 +27,5 @@ install:
     - composer update --no-interaction --prefer-dist
 
 script:
-    - phpunit
+    - vendor/bin/phpunit
     - vendor/bin/behat
diff --git a/appveyor.yml b/appveyor.yml
index 05be6d3d4e9..badb34bf1fc 100644
--- a/appveyor.yml
+++ b/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
diff --git a/composer.json b/composer.json
index 525bb21aa60..6ce0ff26cca 100644
--- a/composer.json
+++ b/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/finder": "^2.3",
     "symfony/framework-bundle": "^3.1",
diff --git a/tests/Bridge/Doctrine/Orm/Filter/SearchFilterTest.php b/tests/Bridge/Doctrine/Orm/Filter/SearchFilterTest.php
index 7be9a809a63..eb6f865f218 100644
--- a/tests/Bridge/Doctrine/Orm/Filter/SearchFilterTest.php
+++ b/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',
                     ],
diff --git a/tests/Metadata/Resource/Factory/PhpDocResourceMetadataFactoryTest.php b/tests/Metadata/Resource/Factory/PhpDocResourceMetadataFactoryTest.php
index e6751664ed8..41599f6ed42 100644
--- a/tests/Metadata/Resource/Factory/PhpDocResourceMetadataFactoryTest.php
+++ b/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();