Remove use of ForwardCompatTrait

jderusse · jderusse · commit 08985e7f1ae2 · 2019-08-03T23:15:25.000+02:00
diff --git a/Tests/ConfigCacheFactoryTest.php b/Tests/ConfigCacheFactoryTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Config\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\ConfigCacheFactory;
 
 class ConfigCacheFactoryTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testCacheWithInvalidCallback()
     {
         $this->expectException('InvalidArgumentException');
diff --git a/Tests/ConfigCacheTest.php b/Tests/ConfigCacheTest.php
@@ -12,22 +12,19 @@
 namespace Symfony\Component\Config\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\ConfigCache;
 use Symfony\Component\Config\Tests\Resource\ResourceStub;
 
 class ConfigCacheTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $cacheFile = null;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->cacheFile = tempnam(sys_get_temp_dir(), 'config_');
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         $files = [$this->cacheFile, $this->cacheFile.'.meta'];
 
diff --git a/Tests/Definition/ArrayNodeTest.php b/Tests/Definition/ArrayNodeTest.php
@@ -12,15 +12,12 @@
 namespace Symfony\Component\Config\Tests\Definition;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\ArrayNode;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\Definition\ScalarNode;
 
 class ArrayNodeTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testNormalizeThrowsExceptionWhenFalseIsNotAllowed()
     {
         $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');
diff --git a/Tests/Definition/BooleanNodeTest.php b/Tests/Definition/BooleanNodeTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Config\Tests\Definition;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\BooleanNode;
 
 class BooleanNodeTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider getValidValues
      */
diff --git a/Tests/Definition/Builder/ArrayNodeDefinitionTest.php b/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
@@ -12,16 +12,13 @@
 namespace Symfony\Component\Config\Tests\Definition\Builder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\ScalarNodeDefinition;
 use Symfony\Component\Config\Definition\Exception\InvalidDefinitionException;
 use Symfony\Component\Config\Definition\Processor;
 
 class ArrayNodeDefinitionTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testAppendingSomeNode()
     {
         $parent = new ArrayNodeDefinition('root');
diff --git a/Tests/Definition/Builder/BooleanNodeDefinitionTest.php b/Tests/Definition/Builder/BooleanNodeDefinitionTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Config\Tests\Definition\Builder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\Builder\BooleanNodeDefinition;
 
 class BooleanNodeDefinitionTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testCannotBeEmptyThrowsAnException()
     {
         $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidDefinitionException');
diff --git a/Tests/Definition/Builder/EnumNodeDefinitionTest.php b/Tests/Definition/Builder/EnumNodeDefinitionTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Config\Tests\Definition\Builder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\Builder\EnumNodeDefinition;
 
 class EnumNodeDefinitionTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testWithOneValue()
     {
         $def = new EnumNodeDefinition('foo');
diff --git a/Tests/Definition/Builder/ExprBuilderTest.php b/Tests/Definition/Builder/ExprBuilderTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Config\Tests\Definition\Builder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 
 class ExprBuilderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testAlwaysExpression()
     {
         $test = $this->getTestBuilder()
diff --git a/Tests/Definition/Builder/NodeBuilderTest.php b/Tests/Definition/Builder/NodeBuilderTest.php
@@ -12,14 +12,11 @@
 namespace Symfony\Component\Config\Tests\Definition\Builder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder as BaseNodeBuilder;
 use Symfony\Component\Config\Definition\Builder\VariableNodeDefinition as BaseVariableNodeDefinition;
 
 class NodeBuilderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testThrowsAnExceptionWhenTryingToCreateANonRegisteredNodeType()
     {
         $this->expectException('RuntimeException');
diff --git a/Tests/Definition/Builder/NumericNodeDefinitionTest.php b/Tests/Definition/Builder/NumericNodeDefinitionTest.php
@@ -12,15 +12,12 @@
 namespace Symfony\Component\Config\Tests\Definition\Builder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\Builder\FloatNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition as NumericNodeDefinition;
 
 class NumericNodeDefinitionTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testIncoherentMinAssertion()
     {
         $this->expectException('InvalidArgumentException');
diff --git a/Tests/Definition/Builder/TreeBuilderTest.php b/Tests/Definition/Builder/TreeBuilderTest.php
@@ -12,14 +12,11 @@
 namespace Symfony\Component\Config\Tests\Definition\Builder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Tests\Fixtures\Builder\NodeBuilder as CustomNodeBuilder;
 
 class TreeBuilderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testUsingACustomNodeBuilder()
     {
         $builder = new TreeBuilder();
diff --git a/Tests/Definition/EnumNodeTest.php b/Tests/Definition/EnumNodeTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Config\Tests\Definition;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\EnumNode;
 
 class EnumNodeTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testFinalizeValue()
     {
         $node = new EnumNode('foo', null, ['foo', 'bar']);
diff --git a/Tests/Definition/FloatNodeTest.php b/Tests/Definition/FloatNodeTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Config\Tests\Definition;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\FloatNode;
 
 class FloatNodeTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider getValidValues
      */
diff --git a/Tests/Definition/IntegerNodeTest.php b/Tests/Definition/IntegerNodeTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Config\Tests\Definition;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\IntegerNode;
 
 class IntegerNodeTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider getValidValues
      */
diff --git a/Tests/Definition/MergeTest.php b/Tests/Definition/MergeTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Config\Tests\Definition;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 
 class MergeTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testForbiddenOverwrite()
     {
         $this->expectException('Symfony\Component\Config\Definition\Exception\ForbiddenOverwriteException');
diff --git a/Tests/Definition/NormalizationTest.php b/Tests/Definition/NormalizationTest.php
@@ -12,14 +12,11 @@
 namespace Symfony\Component\Config\Tests\Definition;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\NodeInterface;
 
 class NormalizationTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider getEncoderTests
      */
diff --git a/Tests/Definition/ScalarNodeTest.php b/Tests/Definition/ScalarNodeTest.php
@@ -12,14 +12,11 @@
 namespace Symfony\Component\Config\Tests\Definition;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Definition\ArrayNode;
 use Symfony\Component\Config\Definition\ScalarNode;
 
 class ScalarNodeTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider getValidValues
      */
diff --git a/Tests/FileLocatorTest.php b/Tests/FileLocatorTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Config\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 
 class FileLocatorTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider getIsAbsolutePathTests
      */
diff --git a/Tests/Loader/DelegatingLoaderTest.php b/Tests/Loader/DelegatingLoaderTest.php
@@ -12,14 +12,11 @@
 namespace Symfony\Component\Config\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Loader\DelegatingLoader;
 use Symfony\Component\Config\Loader\LoaderResolver;
 
 class DelegatingLoaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testConstructor()
     {
         $loader = new DelegatingLoader($resolver = new LoaderResolver());
diff --git a/Tests/Loader/LoaderTest.php b/Tests/Loader/LoaderTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Config\Tests\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Loader\Loader;
 
 class LoaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testGetSetResolver()
     {
         $resolver = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderResolverInterface')->getMock();
diff --git a/Tests/Resource/ClassExistenceResourceTest.php b/Tests/Resource/ClassExistenceResourceTest.php
@@ -13,15 +13,12 @@
 
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Warning;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Resource\ClassExistenceResource;
 use Symfony\Component\Config\Tests\Fixtures\BadParent;
 use Symfony\Component\Config\Tests\Fixtures\Resource\ConditionalClass;
 
 class ClassExistenceResourceTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testToString()
     {
         $res = new ClassExistenceResource('BarClass');
diff --git a/Tests/Resource/DirectoryResourceTest.php b/Tests/Resource/DirectoryResourceTest.php
@@ -12,16 +12,13 @@
 namespace Symfony\Component\Config\Tests\Resource;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Resource\DirectoryResource;
 
 class DirectoryResourceTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     protected $directory;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->directory = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'symfonyDirectoryIterator';
         if (!file_exists($this->directory)) {
@@ -30,7 +27,7 @@ private function doSetUp()
         touch($this->directory.'/tmp.xml');
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         if (!is_dir($this->directory)) {
             return;
diff --git a/Tests/Resource/FileExistenceResourceTest.php b/Tests/Resource/FileExistenceResourceTest.php
@@ -12,25 +12,22 @@
 namespace Symfony\Component\Config\Tests\Resource;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\Resource\FileExistenceResource;
 
 class FileExistenceResourceTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     protected $resource;
     protected $file;
     protected $time;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->file = realpath(sys_get_temp_dir()).'/tmp.xml';
         $this->time = time();
         $this->resource = new FileExistenceResource($this->file);
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         if (file_exists($this->file)) {
             unlink($this->file);
diff --git a/Tests/Resource/FileResourceTest.php b/Tests/Resource/FileResourceTest.php
diff --git a/Tests/Resource/GlobResourceTest.php b/Tests/Resource/GlobResourceTest.php
diff --git a/Tests/ResourceCheckerConfigCacheTest.php b/Tests/ResourceCheckerConfigCacheTest.php
diff --git a/Tests/Util/XmlUtilsTest.php b/Tests/Util/XmlUtilsTest.php

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,10 @@`
`12`	`12`	`namespace Symfony\Component\Config\Tests;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\Config\ConfigCacheFactory;`
`17`	`16`
`18`	`17`	`class ConfigCacheFactoryTest extends TestCase`
`19`	`18`	`{`
`20`		`- use ForwardCompatTestTrait;`
`21`		`-`
`22`	`19`	`public function testCacheWithInvalidCallback()`
`23`	`20`	`{`
`24`	`21`	`$this->expectException('InvalidArgumentException');`
Original file line number	Diff line number	Diff line change
`@@ -12,22 +12,19 @@`
`12`	`12`	`namespace Symfony\Component\Config\Tests;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\Config\ConfigCache;`
`17`	`16`	`use Symfony\Component\Config\Tests\Resource\ResourceStub;`
`18`	`17`
`19`	`18`	`class ConfigCacheTest extends TestCase`
`20`	`19`	`{`
`21`		`- use ForwardCompatTestTrait;`
`22`		`-`
`23`	`20`	`private $cacheFile = null;`
`24`	`21`
`25`		`- private function doSetUp()`
	`22`	`+ protected function setUp()`
`26`	`23`	`{`
`27`	`24`	`$this->cacheFile = tempnam(sys_get_temp_dir(), 'config_');`
`28`	`25`	`}`
`29`	`26`
`30`		`- private function doTearDown()`
	`27`	`+ protected function tearDown()`
`31`	`28`	`{`
`32`	`29`	`$files = [$this->cacheFile, $this->cacheFile.'.meta'];`
`33`	`30`
Original file line number	Diff line number	Diff line change
`@@ -12,15 +12,12 @@`
`12`	`12`	`namespace Symfony\Component\Config\Tests\Definition;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\Config\Definition\ArrayNode;`
`17`	`16`	`use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;`
`18`	`17`	`use Symfony\Component\Config\Definition\ScalarNode;`
`19`	`18`
`20`	`19`	`class ArrayNodeTest extends TestCase`
`21`	`20`	`{`
`22`		`- use ForwardCompatTestTrait;`
`23`		`-`
`24`	`21`	`public function testNormalizeThrowsExceptionWhenFalseIsNotAllowed()`
`25`	`22`	`{`
`26`	`23`	`$this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');`
Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,11 @@`
`12`	`12`	`namespace Symfony\Component\Config\Tests\Definition\Builder;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`	`use Symfony\Component\Config\Definition\Builder\NodeBuilder as BaseNodeBuilder;`
`17`	`16`	`use Symfony\Component\Config\Definition\Builder\VariableNodeDefinition as BaseVariableNodeDefinition;`
`18`	`17`
`19`	`18`	`class NodeBuilderTest extends TestCase`
`20`	`19`	`{`
`21`		`- use ForwardCompatTestTrait;`
`22`		`-`
`23`	`20`	`public function testThrowsAnExceptionWhenTryingToCreateANonRegisteredNodeType()`
`24`	`21`	`{`
`25`	`22`	`$this->expectException('RuntimeException');`