Fix tests

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',

src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php

@@ -68,7 +68,7 @@ class ResolveBindingsPassTest extends TestCase
     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.');
         }

src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php

@@ -311,7 +311,7 @@ class YamlFileLoaderTest extends TestCase
     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');
     }

src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php

@@ -20,8 +20,6 @@ use Symfony\Component\PropertyAccess\PropertyPath;
 
 class FormTest_AuthorWithoutRefSetter
 {
-    use ForwardCompatTestTrait;
-
     protected $reference;
 
     protected $referenceCopy;
@@ -54,6 +52,8 @@ class FormTest_AuthorWithoutRefSetter
 
 class FormTypeTest extends BaseTypeTest
 {
+    use ForwardCompatTestTrait;
+
     const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\FormType';
 
     public function testCreateFormInstances()

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);
         }

src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Lock\Tests\Store;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Lock\Store\RedisStore;
 
 /**
@@ -18,6 +19,7 @@ use Symfony\Component\Lock\Store\RedisStore;
  */
 abstract class AbstractRedisStoreTest extends AbstractStoreTest
 {
+    use ForwardCompatTestTrait;
     use ExpiringStoreTestTrait;
 
     /**

src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php

@@ -21,8 +21,6 @@ use Symfony\Component\Lock\StoreInterface;
  */
 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

src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php

@@ -191,8 +191,8 @@ abstract class PropertyAccessorCollectionTest extends PropertyAccessorArrayAcces
 
     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');

src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php

@@ -339,7 +339,7 @@ class UrlMatcherTest extends TestCase
 
     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);

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);
         }

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);
         }