symfony
diff --git a/‎composer.json
Copy file name to clipboardExpand all lines: composer.json
+1-1Lines changed: 1 addition & 1 deletion b/‎composer.json
Copy file name to clipboardExpand all lines: composer.json
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+9Lines changed: 9 additions & 0 deletions b/‎src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/PhpUnit/bootstrap.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/bootstrap.php
+9Lines changed: 9 additions & 0 deletions b/‎src/Symfony/Bridge/PhpUnit/bootstrap.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/bootstrap.php
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/PhpUnit/composer.json
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/composer.json
-1Lines changed: 0 additions & 1 deletion b/‎src/Symfony/Bridge/PhpUnit/composer.json
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/composer.json
-1Lines changed: 0 additions & 1 deletion
@@ -128,7 +128,7 @@
         "doctrine/collections": "^1.0|^2.0",
         "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "^2.13.1|^3.0",
-        "doctrine/orm": "^2.12",
+        "doctrine/orm": "^2.7.4",
         "egulias/email-validator": "^2.1.10|^3.1",
         "guzzlehttp/promises": "^1.4",
         "league/html-to-markdown": "^5.0",
 
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\PhpUnit\Legacy;
 
+use Doctrine\Common\Annotations\AnnotationRegistry;
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\RiskyTestError;
 use PHPUnit\Framework\TestCase;
@@ -129,6 +130,14 @@ public function startTestSuite($suite)
             echo "Testing $suiteName\n";
             $this->state = 0;
 
+            if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
+                if (method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
+                    AnnotationRegistry::registerUniqueLoader('class_exists');
+                } elseif (method_exists(AnnotationRegistry::class, 'registerLoader')) {
+                    AnnotationRegistry::registerLoader('class_exists');
+                }
+            }
+
             if ($this->skippedFile = getenv('SYMFONY_PHPUNIT_SKIPPED_TESTS')) {
                 $this->state = 1;
 
 
@@ -9,6 +9,7 @@
  * file that was distributed with this source code.
  */
 
+use Doctrine\Common\Annotations\AnnotationRegistry;
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
 
 // Detect if we need to serialize deprecations to a file.
@@ -26,6 +27,14 @@
 // Enforce a consistent locale
 setlocale(\LC_ALL, 'C');
 
+if (!class_exists(AnnotationRegistry::class, false) && class_exists(AnnotationRegistry::class)) {
+    if (method_exists(AnnotationRegistry::class, 'registerUniqueLoader')) {
+        AnnotationRegistry::registerUniqueLoader('class_exists');
+    } elseif (method_exists(AnnotationRegistry::class, 'registerLoader')) {
+        AnnotationRegistry::registerLoader('class_exists');
+    }
+}
+
 if ('disabled' !== getenv('SYMFONY_DEPRECATIONS_HELPER')) {
     DeprecationErrorHandler::register(getenv('SYMFONY_DEPRECATIONS_HELPER'));
 }
@@ -28,7 +28,6 @@
         "symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
     },
     "conflict": {
-        "doctrine/annotations": "<1.10",
         "phpunit/phpunit": "<7.5|9.1.2"
     },
     "autoload": {