Use namespaced versions of phpunit classes

greg0ire · dbu · commit faee7d8a5f77 · 2018-09-20T08:21:29.000+02:00
Hopefully this should make this package compatible with phpunit 7
diff --git a/src/Phpunit/DatabaseTestListener.php b/src/Phpunit/DatabaseTestListener.php
@@ -12,11 +12,15 @@
 namespace Symfony\Cmf\Component\Testing\Phpunit;
 
 use Doctrine\Common\DataFixtures\Purger;
+use PHPUnit\Framework\AssertionFailedError;
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestListener;
+use PHPUnit\Framework\Warning;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Process;
 use Symfony\Component\Process\ProcessUtils;
 
-class DatabaseTestListener implements \PHPUnit_Framework_TestListener
+class DatabaseTestListener implements TestListener
 {
     protected static $currentSuite;
 
@@ -52,31 +56,31 @@ public function getProcess($arguments)
         return new Process($arguments);
     }
 
-    public function addError(\PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addError(Test $test, \Exception $e, $time)
     {
     }
 
-    public function addFailure(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_AssertionFailedError $e, $time)
+    public function addFailure(Test $test, AssertionFailedError $e, $time)
     {
     }
 
-    public function addWarning(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_Warning $e, $time)
+    public function addWarning(Test $test, Warning $e, $time)
     {
     }
 
-    public function addIncompleteTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addIncompleteTest(Test $test, \Exception $e, $time)
     {
     }
 
-    public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addSkippedTest(Test $test, \Exception $e, $time)
     {
     }
 
-    public function addRiskyTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addRiskyTest(Test $test, \Exception $e, $time)
     {
     }
 
-    public function startTest(\PHPUnit_Framework_Test $test)
+    public function startTest(Test $test)
     {
         switch (static::$currentSuite->getName()) {
             case 'orm':
@@ -99,11 +103,11 @@ public function startTest(\PHPUnit_Framework_Test $test)
         $purger->purge();
     }
 
-    public function endTest(\PHPUnit_Framework_Test $test, $time)
+    public function endTest(Test $test, $time)
     {
     }
 
-    public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
+    public function startTestSuite(TestSuite $suite)
     {
         static::$currentSuite = $suite;
 
@@ -202,7 +206,7 @@ private function setUpOrmDatabase($suite)
         echo '[ORM]'.PHP_EOL;
     }
 
-    public function endTestSuite(\PHPUnit_Framework_TestSuite $suite)
+    public function endTestSuite(TestSuite $suite)
     {
         if (!in_array($suite->getName(), ['phpcr', 'orm'])) {
             return;
diff --git a/src/Unit/Constraint/SchemaAcceptsXml.php b/src/Unit/Constraint/SchemaAcceptsXml.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Cmf\Component\Testing\Unit\Constraint;
 
-class SchemaAcceptsXml extends \PHPUnit_Framework_Constraint
+use PHPUnit\Framework\Constraint;
+
+class SchemaAcceptsXml extends Constraint
 {
     protected $xml;
 
diff --git a/src/Unit/XmlSchemaTestCase.php b/src/Unit/XmlSchemaTestCase.php
@@ -11,7 +11,10 @@
 
 namespace Symfony\Cmf\Component\Testing\Unit;
 
-abstract class XmlSchemaTestCase extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\Constraint;
+use PHPUnit\Framework\TestCase;
+
+abstract class XmlSchemaTestCase extends TestCase
 {
     public static function assertSchemaAcceptsXml($xmlDoms, $schemaPath, $message = '')
     {
@@ -22,7 +25,7 @@ public static function assertSchemaRefusesXml($xmlDoms, $schemaPath, $message =
     {
         return self::assertThat(
             $schemaPath,
-            new \PHPUnit_Framework_Constraint_Not(self::getSchemaAcceptsXmlConstraint($xmlDoms)),
+            new Constraint\Not(self::getSchemaAcceptsXmlConstraint($xmlDoms)),
             $message
         );
     }
diff --git a/tests/Functional/BaseTestCaseTest.php b/tests/Functional/BaseTestCaseTest.php
@@ -12,13 +12,14 @@
 namespace Symfony\Cmf\Component\Testing\Tests\Functional;
 
 use Doctrine\Bundle\PHPCRBundle\Test\RepositoryManager;
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Client;
 use Symfony\Cmf\Component\Testing\Functional\DbManager\PHPCR;
 use Symfony\Cmf\Component\Testing\Tests\Fixtures\TestTestCase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
 
-class BaseTestCaseTest extends \PHPUnit_Framework_TestCase
+class BaseTestCaseTest extends TestCase
 {
     private $container;
 
diff --git a/tests/HttpKernel/TestKernelTest.php b/tests/HttpKernel/TestKernelTest.php
@@ -13,12 +13,13 @@
 
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Doctrine\Bundle\PHPCRBundle\DoctrinePHPCRBundle;
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Bundle\TwigBundle\TwigBundle;
 use Symfony\Component\HttpKernel\Kernel;
 
-class TestKernelTest extends \PHPUnit_Framework_TestCase
+class TestKernelTest extends TestCase
 {
     /**
      * @var Kernel
diff --git a/tests/Phpunit/DatabaseTestListenerTest.php b/tests/Phpunit/DatabaseTestListenerTest.php
@@ -11,9 +11,11 @@
 
 namespace Symfony\Cmf\Component\Testing\Tests\Phpunit;
 
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestSuite;
 use Symfony\Cmf\Component\Testing\Phpunit\DatabaseTestListener;
 
-class DatabaseTestListenerTest extends \PHPUnit_Framework_TestCase
+class DatabaseTestListenerTest extends TestCase
 {
     protected $listener;
 
@@ -31,7 +33,7 @@ protected function setUp()
 
     public function testPhpcrTestSuite()
     {
-        $suite = $this->createMock('PHPUnit_Framework_TestSuite');
+        $suite = $this->createMock('TestSuite');
         $suite->expects($this->any())
             ->method('getName')
             ->willReturn('phpcr');
@@ -47,7 +49,7 @@ public function testPhpcrTestSuite()
 
     public function testFallsBackToOldInitDbalCommand()
     {
-        $suite = $this->createMock('PHPUnit_Framework_TestSuite');
+        $suite = $this->createMock('TestSuite');
         $suite->expects($this->any())
             ->method('getName')
             ->willReturn('phpcr');
@@ -63,7 +65,7 @@ public function testFallsBackToOldInitDbalCommand()
 
     public function testOrmTestSuite()
     {
-        $suite = $this->createMock('PHPUnit_Framework_TestSuite');
+        $suite = $this->createMock('TestSuite');
         $suite->expects($this->any())
             ->method('getName')
             ->willReturn('orm');
@@ -81,7 +83,7 @@ public function testOrmTestSuite()
     public function testUnknownTestSuite()
     {
         $this->markTestSkipped('We have to rewrite that test code or delete it.');
-        $suite = $this->createMock('PHPUnit_Framework_TestSuite');
+        $suite = $this->createMock('TestSuite');
         $suite->expects($this->any())
             ->method('getName')
             ->willReturn('not orm or phpcr tests');
diff --git a/tests/Unit/Constraint/SchemaAcceptsXmlTest.php b/tests/Unit/Constraint/SchemaAcceptsXmlTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Cmf\Component\Testing\Tests\Unit\Constraint;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Component\Testing\Unit\Constraint\SchemaAcceptsXml;
 
-class SchemaAcceptsXmlTest extends \PHPUnit_Framework_TestCase
+class SchemaAcceptsXmlTest extends TestCase
 {
     public function testCount()
     {

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,15 @@`
`12`	`12`	`namespace Symfony\Cmf\Component\Testing\Phpunit;`
`13`	`13`
`14`	`14`	`use Doctrine\Common\DataFixtures\Purger;`
	`15`	`+use PHPUnit\Framework\AssertionFailedError;`
	`16`	`+use PHPUnit\Framework\Test;`
	`17`	`+use PHPUnit\Framework\TestListener;`
	`18`	`+use PHPUnit\Framework\Warning;`
`15`	`19`	`use Symfony\Component\Process\PhpExecutableFinder;`
`16`	`20`	`use Symfony\Component\Process\Process;`
`17`	`21`	`use Symfony\Component\Process\ProcessUtils;`
`18`	`22`
`19`		`-class DatabaseTestListener implements \PHPUnit_Framework_TestListener`
	`23`	`+class DatabaseTestListener implements TestListener`
`20`	`24`	`{`
`21`	`25`	`protected static $currentSuite;`
`22`	`26`
`@@ -52,31 +56,31 @@ public function getProcess($arguments)`
`52`	`56`	`return new Process($arguments);`
`53`	`57`	`}`
`54`	`58`
`55`		`- public function addError(\PHPUnit_Framework_Test $test, \Exception $e, $time)`
	`59`	`+ public function addError(Test $test, \Exception $e, $time)`
`56`	`60`	`{`
`57`	`61`	`}`
`58`	`62`
`59`		`- public function addFailure(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_AssertionFailedError $e, $time)`
	`63`	`+ public function addFailure(Test $test, AssertionFailedError $e, $time)`
`60`	`64`	`{`
`61`	`65`	`}`
`62`	`66`
`63`		`- public function addWarning(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_Warning $e, $time)`
	`67`	`+ public function addWarning(Test $test, Warning $e, $time)`
`64`	`68`	`{`
`65`	`69`	`}`
`66`	`70`
`67`		`- public function addIncompleteTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)`
	`71`	`+ public function addIncompleteTest(Test $test, \Exception $e, $time)`
`68`	`72`	`{`
`69`	`73`	`}`
`70`	`74`
`71`		`- public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)`
	`75`	`+ public function addSkippedTest(Test $test, \Exception $e, $time)`
`72`	`76`	`{`
`73`	`77`	`}`
`74`	`78`
`75`		`- public function addRiskyTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)`
	`79`	`+ public function addRiskyTest(Test $test, \Exception $e, $time)`
`76`	`80`	`{`
`77`	`81`	`}`
`78`	`82`
`79`		`- public function startTest(\PHPUnit_Framework_Test $test)`
	`83`	`+ public function startTest(Test $test)`
`80`	`84`	`{`
`81`	`85`	`switch (static::$currentSuite->getName()) {`
`82`	`86`	`case 'orm':`
`@@ -99,11 +103,11 @@ public function startTest(\PHPUnit_Framework_Test $test)`
`99`	`103`	`$purger->purge();`
`100`	`104`	`}`
`101`	`105`
`102`		`- public function endTest(\PHPUnit_Framework_Test $test, $time)`
	`106`	`+ public function endTest(Test $test, $time)`
`103`	`107`	`{`
`104`	`108`	`}`
`105`	`109`
`106`		`- public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)`
	`110`	`+ public function startTestSuite(TestSuite $suite)`
`107`	`111`	`{`
`108`	`112`	`static::$currentSuite = $suite;`
`109`	`113`
`@@ -202,7 +206,7 @@ private function setUpOrmDatabase($suite)`
`202`	`206`	`echo '[ORM]'.PHP_EOL;`
`203`	`207`	`}`
`204`	`208`
`205`		`- public function endTestSuite(\PHPUnit_Framework_TestSuite $suite)`
	`209`	`+ public function endTestSuite(TestSuite $suite)`
`206`	`210`	`{`
`207`	`211`	`if (!in_array($suite->getName(), ['phpcr', 'orm'])) {`
`208`	`212`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Cmf\Component\Testing\Unit\Constraint;`
`13`	`13`
`14`		`-class SchemaAcceptsXml extends \PHPUnit_Framework_Constraint`
	`14`	`+use PHPUnit\Framework\Constraint;`
	`15`	`+`
	`16`	`+class SchemaAcceptsXml extends Constraint`
`15`	`17`	`{`
`16`	`18`	`protected $xml;`
`17`	`19`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,10 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Cmf\Component\Testing\Unit;`
`13`	`13`
`14`		`-abstract class XmlSchemaTestCase extends \PHPUnit_Framework_TestCase`
	`14`	`+use PHPUnit\Framework\Constraint;`
	`15`	`+use PHPUnit\Framework\TestCase;`
	`16`	`+`
	`17`	`+abstract class XmlSchemaTestCase extends TestCase`
`15`	`18`	`{`
`16`	`19`	`public static function assertSchemaAcceptsXml($xmlDoms, $schemaPath, $message = '')`
`17`	`20`	`{`
`@@ -22,7 +25,7 @@ public static function assertSchemaRefusesXml($xmlDoms, $schemaPath, $message =`
`22`	`25`	`{`
`23`	`26`	`return self::assertThat(`
`24`	`27`	`$schemaPath,`
`25`		`- new \PHPUnit_Framework_Constraint_Not(self::getSchemaAcceptsXmlConstraint($xmlDoms)),`
	`28`	`+ new Constraint\Not(self::getSchemaAcceptsXmlConstraint($xmlDoms)),`
`26`	`29`	`$message`
`27`	`30`	`);`
`28`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,10 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Cmf\Component\Testing\Tests\Unit\Constraint;`
`13`	`13`
	`14`	`+use PHPUnit\Framework\TestCase;`
`14`	`15`	`use Symfony\Cmf\Component\Testing\Unit\Constraint\SchemaAcceptsXml;`
`15`	`16`
`16`		`-class SchemaAcceptsXmlTest extends \PHPUnit_Framework_TestCase`
	`17`	`+class SchemaAcceptsXmlTest extends TestCase`
`17`	`18`	`{`
`18`	`19`	`public function testCount()`
`19`	`20`	`{`