Use phpunit 7 signatures

Author: greg0ire

.travis.yml

@@ -30,19 +30,15 @@ env:
   global:
     - SYMFONY_DEPRECATIONS_HELPER="/.*each.*/"
     - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
-    - SYMFONY_PHPUNIT_VERSION=5.7
+    - SYMFONY_PHPUNIT_VERSION=7.3
     - TEST_INSTALLATION=false
 
 matrix:
   include:
     - php: 7.2
       env: STABILITY=dev SYMFONY_VERSION=4.0.*
-    - php: 5.6
+    - php: 7.1
       env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 7.0
-      env: STABILITY=dev SYMFONY_VERSION=3.3.*
-    - php: 7.0
-      env: STABILITY=dev SYMFONY_VERSION=3.4.*
     - php: 7.1
       env: STABILITY=dev SYMFONY_VERSION=3.3.*
     - php: 7.1

composer.json

@@ -9,7 +9,7 @@
         }
     ],
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.1",
         "doctrine/common": "^2.7",
         "doctrine/data-fixtures": "^1.2",
         "doctrine/doctrine-bundle": "^1.8 || ^2.0",

src/Phpunit/DatabaseTestListener.php

@@ -15,6 +15,7 @@
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\Test;
 use PHPUnit\Framework\TestListener;
+use PHPUnit\Framework\TestSuite;
 use PHPUnit\Framework\Warning;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Process;
@@ -56,31 +57,31 @@ public function getProcess($arguments)
         return new Process($arguments);
     }
 
-    public function addError(Test $test, \Exception $e, $time)
+    public function addError(Test $test, \Throwable $e, float $time): void
     {
     }
 
-    public function addFailure(Test $test, AssertionFailedError $e, $time)
+    public function addFailure(Test $test, AssertionFailedError $e, float  $time): void
     {
     }
 
-    public function addWarning(Test $test, Warning $e, $time)
+    public function addWarning(Test $test, Warning $e, float $time): void
     {
     }
 
-    public function addIncompleteTest(Test $test, \Exception $e, $time)
+    public function addIncompleteTest(Test $test, \Throwable $e, float $time): void
     {
     }
 
-    public function addSkippedTest(Test $test, \Exception $e, $time)
+    public function addSkippedTest(Test $test, \Throwable $e, float $time): void
     {
     }
 
-    public function addRiskyTest(Test $test, \Exception $e, $time)
+    public function addRiskyTest(Test $test, \Throwable $e, float $time): void
     {
     }
 
-    public function startTest(Test $test)
+    public function startTest(Test $test): void
     {
         switch (static::$currentSuite->getName()) {
             case 'orm':
@@ -103,11 +104,11 @@ public function startTest(Test $test)
         $purger->purge();
     }
 
-    public function endTest(Test $test, $time)
+    public function endTest(Test $test, float $time): void
     {
     }
 
-    public function startTestSuite(TestSuite $suite)
+    public function startTestSuite(TestSuite $suite): void
     {
         static::$currentSuite = $suite;
 
@@ -206,7 +207,7 @@ private function setUpOrmDatabase($suite)
         echo '[ORM]'.PHP_EOL;
     }
 
-    public function endTestSuite(TestSuite $suite)
+    public function endTestSuite(TestSuite $suite): void
     {
         if (!in_array($suite->getName(), ['phpcr', 'orm'])) {
             return;

src/Unit/Constraint/SchemaAcceptsXml.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Cmf\Component\Testing\Unit\Constraint;
 
-use PHPUnit\Framework\Constraint;
+use PHPUnit\Framework\Constraint\Constraint;
 
 class SchemaAcceptsXml extends Constraint
 {
@@ -26,7 +26,7 @@ public function __construct($xml)
         $this->xml = $xml;
     }
 
-    public function matches($schemaFile)
+    public function matches($schemaFile): bool
     {
         foreach ($this->xml as $id => $dom) {
             $configElement = $dom->getElementsByTagName('config');
@@ -50,24 +50,24 @@ public function matches($schemaFile)
         return true;
     }
 
-    public function count()
+    public function count(): int
     {
         return count($this->xml);
     }
 
-    public function toString()
+    public function toString(): string
     {
     }
 
-    protected function failureDescription($schemaFile)
+    protected function failureDescription($schemaFile): string
     {
         return sprintf(
             'Xml is accepted by the XML schema "%s"',
             $schemaFile
         );
     }
 
-    protected function additionalFailureDescription($schema)
+    protected function additionalFailureDescription($schema): string
     {
         $str = "\n".$this->xml[$this->failingElement]->saveXml()."\n\n";
 

src/Unit/XmlSchemaTestCase.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Cmf\Component\Testing\Unit;
 
-use PHPUnit\Framework\Constraint;
+use PHPUnit\Framework\Constraint\LogicalNot;
 use PHPUnit\Framework\TestCase;
 
 abstract class XmlSchemaTestCase extends TestCase
@@ -25,7 +25,7 @@ public static function assertSchemaRefusesXml($xmlDoms, $schemaPath, $message =
     {
         return self::assertThat(
             $schemaPath,
-            new Constraint\Not(self::getSchemaAcceptsXmlConstraint($xmlDoms)),
+            new LogicalNot(self::getSchemaAcceptsXmlConstraint($xmlDoms)),
             $message
         );
     }

tests/Functional/BaseTestCaseTest.php

@@ -84,7 +84,8 @@ public function provideTestDb()
     public function testDb($dbName, $expected)
     {
         if (null === $expected) {
-            $this->setExpectedException('InvalidArgumentException', $dbName.'" does not exist');
+            $this->expectException('InvalidArgumentException');
+            $this->expectExceptionMessage($dbName.'" does not exist');
         }
 
         $res = $this->testCase->getDbManager($dbName);

tests/Phpunit/DatabaseTestListenerTest.php

@@ -33,7 +33,7 @@ protected function setUp()
 
     public function testPhpcrTestSuite()
     {
-        $suite = $this->createMock('TestSuite');
+        $suite = $this->createMock(TestSuite::class);
         $suite->expects($this->any())
             ->method('getName')
             ->willReturn('phpcr');
@@ -47,9 +47,12 @@ public function testPhpcrTestSuite()
         $this->assertContains('[PHPCR]', ob_get_clean());
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testFallsBackToOldInitDbalCommand()
     {
-        $suite = $this->createMock('TestSuite');
+        $suite = $this->createMock(TestSuite::class);
         $suite->expects($this->any())
             ->method('getName')
             ->willReturn('phpcr');
@@ -65,7 +68,7 @@ public function testFallsBackToOldInitDbalCommand()
 
     public function testOrmTestSuite()
     {
-        $suite = $this->createMock('TestSuite');
+        $suite = $this->createMock(TestSuite::class);
         $suite->expects($this->any())
             ->method('getName')
             ->willReturn('orm');
@@ -83,7 +86,7 @@ public function testOrmTestSuite()
     public function testUnknownTestSuite()
     {
         $this->markTestSkipped('We have to rewrite that test code or delete it.');
-        $suite = $this->createMock('TestSuite');
+        $suite = $this->createMock(TestSuite::class);
         $suite->expects($this->any())
             ->method('getName')
             ->willReturn('not orm or phpcr tests');