Add support for PHPUnit 8 (#109)

* Add support for PHPUnit 8

* Reduce differences with a generated config file (#1)

* Bump matthiasnoback/symfony-config-test to 4.0.1

* Add branch alias to composer.json

Author: emodric

.gitignore

@@ -1,3 +1,4 @@
 /phpunit.xml
 /vendor
 /composer.lock
+/.phpunit.result.cache

.travis.yml

@@ -11,24 +11,24 @@ matrix:
     fast_finish: true
     include:
           # Minimum supported Symfony version with the latest PHP version
-        - php: 7.2
+        - php: 7.3
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
 
           # Test the latest stable release
-        - php: 7.1
         - php: 7.2
+        - php: 7.3
           env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text"
 
           # Force some major versions of Symfony
-        - php: 7.2
+        - php: 7.3
           env: DEPENDENCIES="dunglas/symfony-lock:^2"
-        - php: 7.2
+        - php: 7.3
           env: DEPENDENCIES="dunglas/symfony-lock:^3"
-        - php: 7.2
+        - php: 7.3
           env: DEPENDENCIES="dunglas/symfony-lock:^4"
 
           # Latest commit to master
-        - php: 7.2
+        - php: 7.3
           env: STABILITY="dev"
 
     allow_failures:

PhpUnit/AbstractCompilerPassTestCase.php

@@ -31,7 +31,7 @@ public function compilation_should_not_fail_with_empty_container()
         }
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

PhpUnit/AbstractContainerBuilderTestCase.php

@@ -15,14 +15,14 @@ abstract class AbstractContainerBuilderTestCase extends TestCase
      */
     protected $container;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->container = new ContainerBuilder();
         $this->container->getCompilerPassConfig()->setOptimizationPasses([]);
         $this->container->getCompilerPassConfig()->setRemovingPasses([]);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->container = null;
     }

PhpUnit/AbstractExtensionTestCase.php

@@ -32,7 +32,7 @@ protected function getMinimalConfiguration()
      *
      * @see AbstractExtensionTestCase::tearDown()
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

PhpUnit/ContainerBuilderHasAliasConstraint.php

@@ -13,8 +13,6 @@ class ContainerBuilderHasAliasConstraint extends Constraint
 
     public function __construct($aliasId, $expectedServiceId = null)
     {
-        parent::__construct();
-
         if (!is_string($aliasId)) {
             throw new \InvalidArgumentException('The $aliasId argument should be a string');
         }

PhpUnit/ContainerBuilderHasServiceDefinitionConstraint.php

@@ -14,8 +14,6 @@ class ContainerBuilderHasServiceDefinitionConstraint extends Constraint
 
     public function __construct($serviceId, $expectedClass = null, $checkExpectedClass = true)
     {
-        parent::__construct();
-
         if (!is_string($serviceId)) {
             throw new \InvalidArgumentException('The $serviceId argument should be a string');
         }
@@ -92,8 +90,8 @@ private function evaluateClass(ContainerBuilder $containerBuilder, $returnResult
             $this->fail($containerBuilder, sprintf(
                 'The class of the service definition of "%s" (%s) does not match the expected value (%s)',
                 $this->serviceId,
-                $this->exporter->export($actualClass),
-                $this->exporter->export($this->expectedClass)
+                $this->exporter()->export($actualClass),
+                $this->exporter()->export($this->expectedClass)
             ));
         }
 

PhpUnit/ContainerBuilderHasSyntheticServiceConstraint.php

@@ -11,8 +11,6 @@ class ContainerBuilderHasSyntheticServiceConstraint extends Constraint
 
     public function __construct($serviceId)
     {
-        parent::__construct();
-
         if (!is_string($serviceId)) {
             throw new \InvalidArgumentException('The $serviceId argument should be a string');
         }

PhpUnit/ContainerHasParameterConstraint.php

@@ -14,8 +14,6 @@ class ContainerHasParameterConstraint extends Constraint
 
     public function __construct($parameterName, $expectedParameterValue = null, $checkParameterValue = false)
     {
-        parent::__construct();
-
         $this->parameterName = $parameterName;
         $this->expectedParameterValue = $expectedParameterValue;
         $this->checkParameterValue = $checkParameterValue;
@@ -78,8 +76,8 @@ private function evaluateParameterValue(ContainerInterface $container, $returnRe
             $this->fail($container, sprintf(
                 'The value of parameter "%s" (%s) does not match the expected value (%s)',
                 $this->parameterName,
-                $this->exporter->export($actualValue),
-                $this->exporter->export($this->expectedParameterValue)
+                $this->exporter()->export($actualValue),
+                $this->exporter()->export($this->expectedParameterValue)
             ));
         }
 

PhpUnit/DefinitionArgumentEqualsServiceLocatorConstraint.php

@@ -22,8 +22,6 @@ class DefinitionArgumentEqualsServiceLocatorConstraint extends Constraint
 
     public function __construct($serviceId, $argumentIndex, array $expectedValue)
     {
-        parent::__construct();
-
         if (!(is_string($argumentIndex) || (is_int($argumentIndex) && $argumentIndex >= 0))) {
             throw new \InvalidArgumentException('Expected either a string or a positive integer for $argumentIndex.');
         }
@@ -135,7 +133,7 @@ private function evaluateArgumentValue(ContainerBuilder $container, $returnResul
                 sprintf(
                     'The value of argument with index %s (%s) was expected to an instance of Symfony\Component\DependencyInjection\Reference or \Symfony\Component\DependencyInjection\Definition',
                     $this->argumentIndex,
-                    $this->exporter->export($actualValue)
+                    $this->exporter()->export($actualValue)
                 )
             );
         }
@@ -150,7 +148,7 @@ private function evaluateArgumentValue(ContainerBuilder $container, $returnResul
                 sprintf(
                     'The referenced service class of argument with index %s (%s) was expected to be an instance of Symfony\Component\DependencyInjection\ServiceLocator',
                     $this->argumentIndex,
-                    $this->exporter->export($serviceLocatorDef->getClass())
+                    $this->exporter()->export($serviceLocatorDef->getClass())
                 )
             );
         }
@@ -178,8 +176,8 @@ private function evaluateServiceDefinition(Definition $serviceLocatorDef, Defini
                 sprintf(
                     'The value of argument with index %s (%s) does not equal to the expected ServiceLocator service-map (%s)',
                     $this->argumentIndex,
-                    $this->exporter->export($actualValue),
-                    $this->exporter->export($this->expectedValue)
+                    $this->exporter()->export($actualValue),
+                    $this->exporter()->export($this->expectedValue)
                 )
             );
         }