Fix tests

jderusse · jderusse · commit a22a9c453fc2 · 2019-08-02T01:40:18.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterMappingsPassTest.php
@@ -15,7 +15,7 @@ class RegisterMappingsPassTest extends TestCase
     public function testNoDriverParmeterException()
     {
         $this->expectException('InvalidArgumentException');
-        $this->getExpectedExceptionMessage('Could not find the manager name parameter in the container. Tried the following parameter names: "manager.param.one", "manager.param.two"');
+        $this->expectExceptionMessage('Could not find the manager name parameter in the container. Tried the following parameter names: "manager.param.one", "manager.param.two"');
         $container = $this->createBuilder();
         $this->process($container, [
             'manager.param.one',
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
@@ -68,7 +68,7 @@ public function testUnusedBinding()
     public function testMissingParent()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('Unused binding "$quz" in service [\s\S]+ Invalid service ".*\\ParentNotExists": class NotExists not found\.');
+        $this->expectExceptionMessageRegExp('/Unused binding "\$quz" in service [\s\S]+/');
         if (\PHP_VERSION_ID >= 70400) {
             throw new Warning('PHP 7.4 breaks this test, see https://bugs.php.net/78351.');
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -311,7 +311,7 @@ public function testTagWithEmptyNameThrowsException()
     public function testTagWithNonStringNameThrowsException()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('The tag name for service "\.+" must be a non-empty string');
+        $this->expectExceptionMessageRegExp('/The tag name for service ".+" in .+ must be a non-empty string/');
         $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('tag_name_no_string.yml');
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
@@ -20,8 +20,6 @@
 
 class FormTest_AuthorWithoutRefSetter
 {
-    use ForwardCompatTestTrait;
-
     protected $reference;
 
     protected $referenceCopy;
@@ -54,6 +52,8 @@ public function setReferenceCopy($reference)
 
 class FormTypeTest extends BaseTypeTest
 {
+    use ForwardCompatTestTrait;
+
     const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\FormType';
 
     public function testCreateFormInstances()
diff --git a/src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php b/src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php
@@ -12,19 +12,16 @@
 namespace Symfony\Component\Form\Tests\Resources;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 
 class TranslationFilesTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider provideTranslationFiles
      */
     public function testTranslationFileIsValid($filePath)
     {
         if (class_exists('PHPUnit_Util_XML')) {
-            \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
+            \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
         } else {
             \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
         }
diff --git a/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php
@@ -11,13 +11,15 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Lock\Store\RedisStore;
 
 /**
  * @author Jérémy Derussé <jeremy@derusse.com>
  */
 abstract class AbstractRedisStoreTest extends AbstractStoreTest
 {
+    use ForwardCompatTestTrait;
     use ExpiringStoreTestTrait;
 
     /**
diff --git a/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php b/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php
@@ -21,8 +21,6 @@
  */
 trait ExpiringStoreTestTrait
 {
-    use ForwardCompatTestTrait;
-
     /**
      * Amount of microseconds used as a delay to test expiration. Should be
      * small enough not to slow the test suite too much, and high enough not to
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
@@ -191,8 +191,8 @@ public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()
 
     public function testSetValueFailsIfAdderAndRemoverExistButValueIsNotTraversable()
     {
-        $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException
-expectedExceptionMessageRegExp /The property "axes" in class "Mock_PropertyAccessorCollectionTest_Car[^"]*" can be defined with the methods "addAxis()", "removeAxis()" but the new value must be an array or an instance of \Traversable, "string" given./');
+        $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException');
+        $this->expectExceptionMessage('Could not determine access type for property "axes" in class "Symfony\Component\PropertyAccess\Tests\PropertyAccessorCollectionTest_Car".');
         $car = new PropertyAccessorCollectionTest_Car();
 
         $this->propertyAccessor->setValue($car, 'axes', 'Not an array or Traversable');
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
@@ -339,7 +339,7 @@ public function testDefaultRequirementOfVariableDisallowsNextSeparator()
 
     public function testSchemeRequirement()
     {
-        $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
+        $this->getExpectedException() ?: $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
         $coll = new RouteCollection();
         $coll->add('foo', new Route('/foo', [], [], [], '', ['https']));
         $matcher = $this->getUrlMatcher($coll);
diff --git a/src/Symfony/Component/Security/Core/Tests/Resources/TranslationFilesTest.php b/src/Symfony/Component/Security/Core/Tests/Resources/TranslationFilesTest.php
@@ -12,19 +12,16 @@
 namespace Symfony\Component\Security\Core\Tests\Resources;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 
 class TranslationFilesTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider provideTranslationFiles
      */
     public function testTranslationFileIsValid($filePath)
     {
         if (class_exists('PHPUnit_Util_XML')) {
-            \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
+            \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
         } else {
             \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
         }
diff --git a/src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php b/src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php
@@ -12,19 +12,16 @@
 namespace Symfony\Component\Validator\Tests\Resources;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 
 class TranslationFilesTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @dataProvider provideTranslationFiles
      */
     public function testTranslationFileIsValid($filePath)
     {
         if (class_exists('PHPUnit_Util_XML')) {
-            \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
+            \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
         } else {
             \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
         }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class RegisterMappingsPassTest extends TestCase`
`15`	`15`	`public function testNoDriverParmeterException()`
`16`	`16`	`{`
`17`	`17`	`$this->expectException('InvalidArgumentException');`
`18`		`- $this->getExpectedExceptionMessage('Could not find the manager name parameter in the container. Tried the following parameter names: "manager.param.one", "manager.param.two"');`
	`18`	`+ $this->expectExceptionMessage('Could not find the manager name parameter in the container. Tried the following parameter names: "manager.param.one", "manager.param.two"');`
`19`	`19`	`$container = $this->createBuilder();`
`20`	`20`	`$this->process($container, [`
`21`	`21`	`'manager.param.one',`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function testUnusedBinding()`
`68`	`68`	`public function testMissingParent()`
`69`	`69`	`{`
`70`	`70`	`$this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');`
`71`		`- $this->expectExceptionMessageRegExp('Unused binding "$quz" in service [\s\S]+ Invalid service ".*\\ParentNotExists": class NotExists not found\.');`
	`71`	`+ $this->expectExceptionMessageRegExp('/Unused binding "\$quz" in service [\s\S]+/');`
`72`	`72`	`if (\PHP_VERSION_ID >= 70400) {`
`73`	`73`	`throw new Warning('PHP 7.4 breaks this test, see https://bugs.php.net/78351.');`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ public function testTagWithEmptyNameThrowsException()`
`311`	`311`	`public function testTagWithNonStringNameThrowsException()`
`312`	`312`	`{`
`313`	`313`	`$this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');`
`314`		`- $this->expectExceptionMessageRegExp('The tag name for service "\.+" must be a non-empty string');`
	`314`	`+ $this->expectExceptionMessageRegExp('/The tag name for service ".+" in .+ must be a non-empty string/');`
`315`	`315`	`$loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));`
`316`	`316`	`$loader->load('tag_name_no_string.yml');`
`317`	`317`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`
`21`	`21`	`class FormTest_AuthorWithoutRefSetter`
`22`	`22`	`{`
`23`		`- use ForwardCompatTestTrait;`
`24`		`-`
`25`	`23`	`protected $reference;`
`26`	`24`
`27`	`25`	`protected $referenceCopy;`
`@@ -54,6 +52,8 @@ public function setReferenceCopy($reference)`
`54`	`52`
`55`	`53`	`class FormTypeTest extends BaseTypeTest`
`56`	`54`	`{`
	`55`	`+ use ForwardCompatTestTrait;`
	`56`	`+`
`57`	`57`	`const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\FormType';`
`58`	`58`
`59`	`59`	`public function testCreateFormInstances()`
Original file line number	Diff line number	Diff line change
`@@ -12,19 +12,16 @@`
`12`	`12`	`namespace Symfony\Component\Form\Tests\Resources;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`16`	`15`
`17`	`16`	`class TranslationFilesTest extends TestCase`
`18`	`17`	`{`
`19`		`- use ForwardCompatTestTrait;`
`20`		`-`
`21`	`18`	`/**`
`22`	`19`	`* @dataProvider provideTranslationFiles`
`23`	`20`	`*/`
`24`	`21`	`public function testTranslationFileIsValid($filePath)`
`25`	`22`	`{`
`26`	`23`	`if (class_exists('PHPUnit_Util_XML')) {`
`27`		`- \PHPUnit\Util\XML::loadfile($filePath, false, false, true);`
	`24`	`+ \PHPUnit_Util_XML::loadfile($filePath, false, false, true);`
`28`	`25`	`} else {`
`29`	`26`	`\PHPUnit\Util\XML::loadfile($filePath, false, false, true);`
`30`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@`
`21`	`21`	`*/`
`22`	`22`	`trait ExpiringStoreTestTrait`
`23`	`23`	`{`
`24`		`- use ForwardCompatTestTrait;`
`25`		`-`
`26`	`24`	`/**`
`27`	`25`	`* Amount of microseconds used as a delay to test expiration. Should be`
`28`	`26`	`* small enough not to slow the test suite too much, and high enough not to`
Original file line number	Diff line number	Diff line change
`@@ -191,8 +191,8 @@ public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()`
`191`	`191`
`192`	`192`	`public function testSetValueFailsIfAdderAndRemoverExistButValueIsNotTraversable()`
`193`	`193`	`{`
`194`		`- $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException`
`195`		`-expectedExceptionMessageRegExp /The property "axes" in class "Mock_PropertyAccessorCollectionTest_Car[^"]*" can be defined with the methods "addAxis()", "removeAxis()" but the new value must be an array or an instance of \Traversable, "string" given./');`
	`194`	`+ $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException');`
	`195`	`+ $this->expectExceptionMessage('Could not determine access type for property "axes" in class "Symfony\Component\PropertyAccess\Tests\PropertyAccessorCollectionTest_Car".');`
`196`	`196`	`$car = new PropertyAccessorCollectionTest_Car();`
`197`	`197`
`198`	`198`	`$this->propertyAccessor->setValue($car, 'axes', 'Not an array or Traversable');`
Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ public function testDefaultRequirementOfVariableDisallowsNextSeparator()`
`339`	`339`
`340`	`340`	`public function testSchemeRequirement()`
`341`	`341`	`{`
`342`		`- $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');`
	`342`	`+ $this->getExpectedException() ?: $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');`
`343`	`343`	`$coll = new RouteCollection();`
`344`	`344`	`$coll->add('foo', new Route('/foo', [], [], [], '', ['https']));`
`345`	`345`	`$matcher = $this->getUrlMatcher($coll);`