Installed PhpUnit Bridge to make deprecation testing easier

gnat42 · Feb 26, 2015 · 982a06f · 982a06f
1 parent 8b639c1
commit 982a06f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/Tests/Datagrid/ListMapperTest.php b/Tests/Datagrid/ListMapperTest.php
@@ -121,6 +121,9 @@ public function testAdd()
         $this->assertEquals('fooName', $fieldDescription->getOption('label'));
     }
 
+    /**
+     * @group legacy
+     */
     public function testAddViewInlineActionException()
     {
         $this->setExpectedException('PHPUnit_Framework_Error', 'Inline action "view" is deprecated since version 2.2.4. Use inline action "show" instead.');

diff --git a/Tests/Util/AdminObjectAclDataTest.php b/Tests/Util/AdminObjectAclDataTest.php
@@ -119,6 +119,8 @@ public function testGetMasks()
     }
 
     /**
+     * @group legacy
+     *
      * @deprecated
      */
     public function testSetForm()
@@ -135,6 +137,8 @@ public function testSetForm()
     /**
      * @depends testSetForm
      *
+     * @group legacy
+     *
      * @deprecated
      */
     public function testGetForm($adminObjectAclData)

diff --git a/Tests/tests/bootstrap.php b/Tests/tests/bootstrap.php
@@ -17,3 +17,14 @@
 } elseif (file_exists($file = __DIR__.'/autoload.php.dist')) {
     require_once $file;
 }
+
+// try to get Symfony's PHPunit Bridge
+$files = array_filter(array(
+    __DIR__.'/../../vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/bootstrap.php',
+    __DIR__.'/../../vendor/symfony/phpunit-bridge/bootstrap.php',
+    __DIR__.'/../../../../../vendor/symfony/symfony/src/Symfony/Bridge/PhpUnit/bootstrap.php',
+    __DIR__.'/../../../../../vendor/symfony/phpunit-bridge/bootstrap.php',
+), 'file_exists');
+if ($files) {
+    require_once current($files);
+}
diff --git a/composer.json b/composer.json
@@ -41,7 +41,8 @@
     "require-dev": {
         "jms/translation-bundle": "~1.1",
         "symfony/yaml": "~2.3",
-        "sonata-project/intl-bundle": "~2.1"
+        "sonata-project/intl-bundle": "~2.1",
+        "symfony/phpunit-bridge": "2.7.*@dev"
     },
     "suggest": {
         "jms/translation-bundle": "Extract message keys from Admins",