Merge pull request #96 from spiral/bugfix/undefined-handler

* Exception handling added when searching for a handler
spiral · Dec 28, 2023 · fd53f42 · fd53f42
2 parents feb0aab + 7ceba49
commit fd53f42
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/src/GRPC/ServiceLocator.php b/src/GRPC/ServiceLocator.php
@@ -22,7 +22,7 @@ public function getServices(): array
         $result = [];
 
         foreach ($this->classes->getClasses(ServiceInterface::class) as $service) {
-            if (! $service->isInstantiable()) {
+            if (!$service->isInstantiable()) {
                 continue;
             }
 

diff --git a/src/Queue/PayloadDeserializer.php b/src/Queue/PayloadDeserializer.php
@@ -35,9 +35,10 @@ public function deserialize(ReceivedTaskInterface $task): mixed
             return $serializer->unserialize($payload, $class);
         }
 
-        $class = $this->detectTypeFromJobHandler(
-            $this->registry->getHandler($name),
-        );
+        try {
+            $class = $this->detectTypeFromJobHandler($this->registry->getHandler($name));
+        } catch (\Throwable) {
+        }
 
         if ($class === 'string') {
             return $payload;

diff --git a/tests/src/Queue/PayloadDeserializerTest.php b/tests/src/Queue/PayloadDeserializerTest.php
@@ -6,6 +6,7 @@
 
 use Mockery as m;
 use PHPUnit\Framework\Attributes\DataProvider;
+use Spiral\Queue\Exception\JobException;
 use Spiral\Queue\HandlerInterface;
 use Spiral\Queue\HandlerRegistryInterface;
 use Spiral\Queue\SerializerRegistryInterface;
@@ -124,6 +125,32 @@ public function testGetClassFromHandler(HandlerInterface $handler): void
         $this->assertSame($unserialized, $this->deserializer->deserialize($task));
     }
 
+    public function testGetClassFromHandlerShouldIgnoreMissedHandler(): void
+    {
+        $task = m::mock(ReceivedTaskInterface::class);
+
+        $task->shouldReceive('hasHeader')
+            ->once()
+            ->with(Queue::SERIALIZED_CLASS_HEADER_KEY)
+            ->andReturnFalse();
+
+        $task->shouldReceive('getName')->once()->andReturn($name = 'foo-task');
+        $task->shouldReceive('getPayload')->once()->andReturn($payload = '{"foo":"bar"}');
+
+        $this->serializer->shouldReceive('getSerializer')->once()->with($name)
+            ->andReturn($serializer = m::mock(SerializerInterface::class));
+
+        $this->registry->shouldReceive('getHandler')
+            ->once()
+            ->with($name)
+            ->andThrow(JobException::class);
+
+        $serializer->shouldReceive('unserialize')->once()->with($payload)
+            ->andReturn($unserialized = 'unserialized-payload');
+
+        $this->assertSame($unserialized, $this->deserializer->deserialize($task));
+    }
+
     #[DataProvider('getInvalidHandlersDataProvider')]
     public function testGetClassFromInvalidHandler(HandlerInterface $handler): void
     {