Move exception matching code to a compat trait

Author: mpdude

tests/Doctrine/Tests/ORM/Functional/Ticket/GH10449Test.php

@@ -8,12 +8,12 @@
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping\MappingException;
 use Doctrine\Tests\OrmTestCase;
-
-use function get_parent_class;
-use function method_exists;
+use Doctrine\Tests\PHPUnitCompatibility\ExceptionMatching;
 
 class GH10449Test extends OrmTestCase
 {
+    use ExceptionMatching;
+
     public function testToManyAssociationOnMappedSuperclassShallBeRejected(): void
     {
         $em = $this->getTestEntityManager();
@@ -25,18 +25,6 @@ public function testToManyAssociationOnMappedSuperclassShallBeRejected(): void
         // https://github.com/doctrine/orm/pull/10398
         $em->getClassMetadata(GH10449Entity::class);
     }
-
-    /**
-     * Override for BC with PHPUnit <8
-     */
-    public function expectExceptionMessageMatches(string $regularExpression): void
-    {
-        if (method_exists(get_parent_class($this), 'expectExceptionMessageMatches')) {
-            parent::expectExceptionMessageMatches($regularExpression);
-        } else {
-            parent::expectExceptionMessageRegExp($regularExpression);
-        }
-    }
 }
 
 /**

tests/Doctrine/Tests/ORM/Functional/Ticket/GH10454Test.php

@@ -7,13 +7,13 @@
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping\MappingException;
 use Doctrine\Tests\OrmTestCase;
+use Doctrine\Tests\PHPUnitCompatibility\ExceptionMatching;
 use Generator;
 
-use function get_parent_class;
-use function method_exists;
-
 class GH10454Test extends OrmTestCase
 {
+    use ExceptionMatching;
+
     /**
      * @param class-string $className
      *
@@ -34,18 +34,6 @@ public function classesThatOverrideFieldNames(): Generator
         yield 'Entity class that redeclares a protected field inherited from a base entity' => [GH10454EntityChildProtected::class];
         yield 'Entity class that redeclares a protected field inherited from a mapped superclass' => [GH10454MappedSuperclassChildProtected::class];
     }
-
-    /**
-     * Override for BC with PHPUnit <8
-     */
-    public function expectExceptionMessageMatches(string $regularExpression): void
-    {
-        if (method_exists(get_parent_class($this), 'expectExceptionMessageMatches')) {
-            parent::expectExceptionMessageMatches($regularExpression);
-        } else {
-            parent::expectExceptionMessageRegExp($regularExpression);
-        }
-    }
 }
 
 /**

tests/Doctrine/Tests/PHPUnitCompatibility/ExceptionMatching.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\PHPUnitCompatibility;
+
+use function get_parent_class;
+use function method_exists;
+
+trait ExceptionMatching
+{
+    /**
+     * Override for BC with PHPUnit <8
+     */
+    public function expectExceptionMessageMatches(string $regularExpression): void
+    {
+        if (method_exists(get_parent_class($this), 'expectExceptionMessageMatches')) {
+            parent::expectExceptionMessageMatches($regularExpression);
+        } else {
+            parent::expectExceptionMessageRegExp($regularExpression);
+        }
+    }
+}