Add compatibility with SF 3.12 dispatchers

spiral · Jan 17, 2024 · 1f3f453 · 1f3f453
1 parent 03808a8
commit 1f3f453
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/Traits/InteractsWithDispatcher.php b/src/Traits/InteractsWithDispatcher.php
@@ -15,7 +15,7 @@ trait InteractsWithDispatcher
     public function assertDispatcherCanBeServed(string $dispatcher): void
     {
         $this->assertTrue(
-            $this->getContainer()->get($dispatcher)->canServe(),
+            $this->getContainer()->invoke([$dispatcher, 'canServe']),
             \sprintf('Dispatcher [%s] can not be served.', $dispatcher)
         );
     }
@@ -26,7 +26,7 @@ public function assertDispatcherCanBeServed(string $dispatcher): void
     public function assertDispatcherCannotBeServed(string $dispatcher): void
     {
         $this->assertFalse(
-            $this->getContainer()->get($dispatcher)->canServe(),
+            $this->getContainer()->invoke([$dispatcher, 'canServe']),
             \sprintf('Dispatcher [%s] can be served.', $dispatcher)
         );
     }
@@ -77,8 +77,6 @@ public function assertDispatcherMissed(string $dispatcher): void
      */
     public function getRegisteredDispatchers(): array
     {
-        return array_map(static function ($dispatcher): string {
-            return get_class($dispatcher);
-        }, $this->getContainer()->get(KernelInterface::class)->getRegisteredDispatchers());
+        return $this->getContainer()->get(KernelInterface::class)->getRegisteredDispatchers();
     }
 }
diff --git a/src/Traits/TestableKernel.php b/src/Traits/TestableKernel.php
@@ -15,10 +15,14 @@ public function getContainer(): Container
         return $this->container;
     }
 
-    /** @return DispatcherInterface[] */
+    /** @return array<class-string<DispatcherInterface>> */
     public function getRegisteredDispatchers(): array
     {
-        return $this->dispatchers;
+        return \array_map(static fn (string|DispatcherInterface $dispatcher): string => \is_object($dispatcher)
+            ? $dispatcher::class
+            : $dispatcher,
+            $this->dispatchers
+        );
     }
 
     /** @return array<class-string> */