Make tests support phpunit 8

nicolas-grekas · nicolas-grekas · commit d42da5755a47 · 2019-07-31T23:55:24.000+02:00
diff --git a/Tests/Compiler/ExtensionCompilerPassTest.php b/Tests/Compiler/ExtensionCompilerPassTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ExtensionCompilerPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -22,10 +23,12 @@
  */
 class ExtensionCompilerPassTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private $container;
     private $pass;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->container = new ContainerBuilder();
         $this->pass = new ExtensionCompilerPass();
diff --git a/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php b/Tests/Compiler/ResolveParameterPlaceHoldersPassTest.php
@@ -12,16 +12,19 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\Compiler\ResolveParameterPlaceHoldersPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class ResolveParameterPlaceHoldersPassTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private $compilerPass;
     private $container;
     private $fooDefinition;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->compilerPass = new ResolveParameterPlaceHoldersPass();
         $this->container = $this->createContainerBuilder();
diff --git a/Tests/Config/AutowireServiceResourceTest.php b/Tests/Config/AutowireServiceResourceTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Config;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
 use Symfony\Component\DependencyInjection\Config\AutowireServiceResource;
 
@@ -20,6 +21,8 @@
  */
 class AutowireServiceResourceTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @var AutowireServiceResource
      */
@@ -28,7 +31,7 @@ class AutowireServiceResourceTest extends TestCase
     private $class;
     private $time;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->file = realpath(sys_get_temp_dir()).'/tmp.php';
         $this->time = time();
@@ -101,7 +104,7 @@ public function testNotFreshIfClassNotFound()
         $this->assertFalse($resource->isFresh($this->getStaleFileTime()), '->isFresh() returns false if the class no longer exists');
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         if (!file_exists($this->file)) {
             return;
diff --git a/Tests/Config/ContainerParametersResourceCheckerTest.php b/Tests/Config/ContainerParametersResourceCheckerTest.php
@@ -12,13 +12,16 @@
 namespace Symfony\Component\DependencyInjection\Tests\Config;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\ResourceCheckerInterface;
 use Symfony\Component\DependencyInjection\Config\ContainerParametersResource;
 use Symfony\Component\DependencyInjection\Config\ContainerParametersResourceChecker;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class ContainerParametersResourceCheckerTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /** @var ContainerParametersResource */
     private $resource;
 
@@ -28,7 +31,7 @@ class ContainerParametersResourceCheckerTest extends TestCase
     /** @var ContainerInterface */
     private $container;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->resource = new ContainerParametersResource(['locales' => ['fr', 'en'], 'default_locale' => 'fr']);
         $this->container = $this->getMockBuilder(ContainerInterface::class)->getMock();
diff --git a/Tests/Config/ContainerParametersResourceTest.php b/Tests/Config/ContainerParametersResourceTest.php
@@ -12,14 +12,17 @@
 namespace Symfony\Component\DependencyInjection\Tests\Config;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\Config\ContainerParametersResource;
 
 class ContainerParametersResourceTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /** @var ContainerParametersResource */
     private $resource;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->resource = new ContainerParametersResource(['locales' => ['fr', 'en'], 'default_locale' => 'fr']);
     }
diff --git a/Tests/CrossCheckTest.php b/Tests/CrossCheckTest.php
@@ -12,14 +12,17 @@
 namespace Symfony\Component\DependencyInjection\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class CrossCheckTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     protected static $fixturesPath;
 
-    public static function setUpBeforeClass()
+    private static function doSetUpBeforeClass()
     {
         self::$fixturesPath = __DIR__.'/Fixtures/';
 
diff --git a/Tests/Dumper/GraphvizDumperTest.php b/Tests/Dumper/GraphvizDumperTest.php
@@ -12,16 +12,19 @@
 namespace Symfony\Component\DependencyInjection\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Dumper\GraphvizDumper;
 use Symfony\Component\DependencyInjection\Reference;
 
 class GraphvizDumperTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     protected static $fixturesPath;
 
-    public static function setUpBeforeClass()
+    private static function doSetUpBeforeClass()
     {
         self::$fixturesPath = __DIR__.'/../Fixtures/';
     }
diff --git a/Tests/Dumper/PhpDumperTest.php b/Tests/Dumper/PhpDumperTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
@@ -41,9 +42,11 @@
 
 class PhpDumperTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     protected static $fixturesPath;
 
-    public static function setUpBeforeClass()
+    private static function doSetUpBeforeClass()
     {
         self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
     }
diff --git a/Tests/Dumper/XmlDumperTest.php b/Tests/Dumper/XmlDumperTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -21,9 +22,11 @@
 
 class XmlDumperTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     protected static $fixturesPath;
 
-    public static function setUpBeforeClass()
+    private static function doSetUpBeforeClass()
     {
         self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
     }
diff --git a/Tests/Dumper/YamlDumperTest.php b/Tests/Dumper/YamlDumperTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -24,9 +25,11 @@
 
 class YamlDumperTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     protected static $fixturesPath;
 
-    public static function setUpBeforeClass()
+    private static function doSetUpBeforeClass()
     {
         self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
     }
diff --git a/Tests/Loader/DirectoryLoaderTest.php b/Tests/Loader/DirectoryLoaderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -22,17 +23,19 @@
 
 class DirectoryLoaderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private static $fixturesPath;
 
     private $container;
     private $loader;
 
-    public static function setUpBeforeClass()
+    private static function doSetUpBeforeClass()
     {
         self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
     }
 
-    protected function setUp()
+    private function doSetUp()
     {
         $locator = new FileLocator(self::$fixturesPath);
         $this->container = new ContainerBuilder();
diff --git a/Tests/Loader/FileLoaderTest.php b/Tests/Loader/FileLoaderTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface as PsrContainerInterface;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -35,9 +36,11 @@
 
 class FileLoaderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     protected static $fixturesPath;
 
-    public static function setUpBeforeClass()
+    private static function doSetUpBeforeClass()
     {
         self::$fixturesPath = realpath(__DIR__.'/../');
     }
diff --git a/Tests/Loader/IniFileLoaderTest.php b/Tests/Loader/IniFileLoaderTest.php
@@ -12,16 +12,19 @@
 namespace Symfony\Component\DependencyInjection\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
 
 class IniFileLoaderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     protected $container;
     protected $loader;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->container = new ContainerBuilder();
         $this->loader = new IniFileLoader($this->container, new FileLocator(realpath(__DIR__.'/../Fixtures/').'/ini'));
diff --git a/Tests/Loader/LoaderResolverTest.php b/Tests/Loader/LoaderResolverTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -23,12 +24,14 @@
 
 class LoaderResolverTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private static $fixturesPath;
 
     /** @var LoaderResolver */
     private $resolver;
 
-    protected function setUp()
+    private function doSetUp()
     {
         self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
 
diff --git a/Tests/Loader/XmlFileLoaderTest.php b/Tests/Loader/XmlFileLoaderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\Config\Resource\FileResource;
@@ -33,9 +34,11 @@
 
 class XmlFileLoaderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     protected static $fixturesPath;
 
-    public static function setUpBeforeClass()
+    private static function doSetUpBeforeClass()
     {
         self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
         require_once self::$fixturesPath.'/includes/foo.php';
diff --git a/Tests/Loader/YamlFileLoaderTest.php b/Tests/Loader/YamlFileLoaderTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\Config\Resource\FileResource;
@@ -33,9 +34,11 @@
 
 class YamlFileLoaderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     protected static $fixturesPath;
 
-    public static function setUpBeforeClass()
+    private static function doSetUpBeforeClass()
     {
         self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');
         require_once self::$fixturesPath.'/includes/foo.php';

Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,17 @@`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Tests\Config;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`use Symfony\Component\DependencyInjection\Config\ContainerParametersResource;`
`16`	`17`
`17`	`18`	`class ContainerParametersResourceTest extends TestCase`
`18`	`19`	`{`
	`20`	`+ use ForwardCompatTestTrait;`
	`21`	`+`
`19`	`22`	`/** @var ContainerParametersResource */`
`20`	`23`	`private $resource;`
`21`	`24`
`22`		`- protected function setUp()`
	`25`	`+ private function doSetUp()`
`23`	`26`	`{`
`24`	`27`	`$this->resource = new ContainerParametersResource(['locales' => ['fr', 'en'], 'default_locale' => 'fr']);`
`25`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,16 +12,19 @@`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Tests\Dumper;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`16`	`17`	`use Symfony\Component\DependencyInjection\Definition;`
`17`	`18`	`use Symfony\Component\DependencyInjection\Dumper\GraphvizDumper;`
`18`	`19`	`use Symfony\Component\DependencyInjection\Reference;`
`19`	`20`
`20`	`21`	`class GraphvizDumperTest extends TestCase`
`21`	`22`	`{`
	`23`	`+ use ForwardCompatTestTrait;`
	`24`	`+`
`22`	`25`	`protected static $fixturesPath;`
`23`	`26`
`24`		`- public static function setUpBeforeClass()`
	`27`	`+ private static function doSetUpBeforeClass()`
`25`	`28`	`{`
`26`	`29`	`self::$fixturesPath = __DIR__.'/../Fixtures/';`
`27`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Psr\Container\ContainerInterface;`
	`16`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`17`	`use Symfony\Component\Config\FileLocator;`
`17`	`18`	`use Symfony\Component\DependencyInjection\Argument\IteratorArgument;`
`18`	`19`	`use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;`
`@@ -41,9 +42,11 @@`
`41`	`42`
`42`	`43`	`class PhpDumperTest extends TestCase`
`43`	`44`	`{`
	`45`	`+ use ForwardCompatTestTrait;`
	`46`	`+`
`44`	`47`	`protected static $fixturesPath;`
`45`	`48`
`46`		`- public static function setUpBeforeClass()`
	`49`	`+ private static function doSetUpBeforeClass()`
`47`	`50`	`{`
`48`	`51`	`self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');`
`49`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Tests\Dumper;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`use Symfony\Component\Config\FileLocator;`
`16`	`17`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`17`	`18`	`use Symfony\Component\DependencyInjection\ContainerInterface;`
`@@ -21,9 +22,11 @@`
`21`	`22`
`22`	`23`	`class XmlDumperTest extends TestCase`
`23`	`24`	`{`
	`25`	`+ use ForwardCompatTestTrait;`
	`26`	`+`
`24`	`27`	`protected static $fixturesPath;`
`25`	`28`
`26`		`- public static function setUpBeforeClass()`
	`29`	`+ private static function doSetUpBeforeClass()`
`27`	`30`	`{`
`28`	`31`	`self::$fixturesPath = realpath(__DIR__.'/../Fixtures/');`
`29`	`32`	`}`