Use namespaced versions of phpunit classes

Hopefully this should make this package compatible with phpunit 7

Author: greg0ire

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;

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;
 

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
         );
     }

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;
 

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

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');

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()
     {