Merge pull request #1023 from spiral/bugfix/serializer-attr

src/SerializerLocatorListener.php

@@ -8,7 +8,6 @@
 use Spiral\Queue\Attribute\JobHandler as JobHandlerAttribute;
 use Spiral\Queue\Attribute\Serializer;
 use Spiral\Queue\Config\QueueConfig;
-use Spiral\Queue\Exception\InvalidArgumentException;
 use Spiral\Tokenizer\Attribute\TargetAttribute;
 use Spiral\Tokenizer\TokenizationListenerInterface;
 
@@ -18,13 +17,10 @@ final class SerializerLocatorListener implements TokenizationListenerInterface
     public function __construct(
         private readonly ReaderInterface $reader,
         private readonly QueueRegistry $registry,
-        private readonly QueueConfig $config
+        private readonly QueueConfig $config,
     ) {
     }
 
-    /**
-     * @throws InvalidArgumentException
-     */
     public function listen(\ReflectionClass $class): void
     {
         $attribute = $this->reader->firstClassMetadata($class, Serializer::class);
@@ -39,9 +35,6 @@ public function finalize(): void
     {
     }
 
-    /**
-     * @throws InvalidArgumentException
-     */
     private function getJobType(\ReflectionClass $class): string
     {
         $attribute = $this->reader->firstClassMetadata($class, JobHandlerAttribute::class);
@@ -59,6 +52,6 @@ private function getJobType(\ReflectionClass $class): string
             }
         }
 
-        throw new InvalidArgumentException(\sprintf('Unable to locate job type for `%s`.', $class->getName()));
+        return $class->getName();
     }
 }

tests/SerializerLocatorListenerTest.php

@@ -91,4 +91,34 @@ public function testListenWithJobTypeFromAttribute(): void
 
         $this->assertEquals(new PhpSerializer(), $registry->getSerializer('test'));
     }
+
+    public function testListenWithJobTypeFromClass(): void
+    {
+        $handler = new class($this->createMock(InvokerInterface::class)) extends JobHandler {};
+
+        $container = new Container();
+        $container->bind('test', new PhpSerializer());
+        $container->bind(SerializerRegistryInterface::class, SerializerRegistry::class);
+
+        $registry = new QueueRegistry(
+            $container,
+            $container,
+            $this->createMock(HandlerRegistryInterface::class)
+        );
+
+        $reader = m::mock(ReaderInterface::class);
+        $reader
+            ->shouldReceive('firstClassMetadata')
+            ->with(m::type(\ReflectionClass::class), Serializer::class)
+            ->andReturn(new Serializer('test'));
+        $reader
+            ->shouldReceive('firstClassMetadata')
+            ->with(m::type(\ReflectionClass::class), \Spiral\Queue\Attribute\JobHandler::class)
+            ->andReturnNull();
+
+        $listener = new SerializerLocatorListener($reader, $registry, new QueueConfig());
+        $listener->listen(new \ReflectionClass($handler::class));
+
+        $this->assertEquals(new PhpSerializer(), $registry->getSerializer($handler::class));
+    }
 }