chore: apply comments from symfony#49385

bitgandtter · bitgandtter · commit a4c4401aead5 · 2023-02-15T13:43:01.000-05:00
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -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): void
             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;
 
diff --git a/src/Symfony/Bridge/PhpUnit/bootstrap.php b/src/Symfony/Bridge/PhpUnit/bootstrap.php
@@ -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'));
 }
diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json
@@ -29,7 +29,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": {
diff --git a/src/Symfony/Component/Notifier/Bridge/Pusher/Tests/PusherTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Pusher/Tests/PusherTransportTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Notifier\Message\PushMessage;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
+use Symfony\Component\Notifier\Tests\Fixtures\DummyHttpClient;
 use Symfony\Component\Notifier\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Notifier\Transport\TransportInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -37,7 +38,7 @@ public function toStringProvider(): iterable
      */
     public static function createTransport(HttpClientInterface $client = null): TransportInterface
     {
-        return new PusherTransport(new Pusher('key', 'secret', 'app'), $client);
+        return new PusherTransport(new Pusher('key', 'secret', 'app'), $client ?? new DummyHttpClient());
     }
 
     public static function supportedMessagesProvider(): iterable
