Merge pull request #40 from UFOMelkor/feature/di-enhancements

Small DI Fixes/Enhancements

Author: codeliner

src/DependencyInjection/Compiler/RoutePass.php

@@ -48,14 +48,16 @@ public function process(ContainerBuilder $container)
                 foreach ($handlers as $id => $args) {
                     // Safeguard to have only one tag per command / query
                     if ($type !== 'event' && count($args) > 1) {
-                        throw CompilerPassException::tagCountExceeded($id, $id, $bus);
+                        throw CompilerPassException::tagCountExceeded($type, $id, $bus);
                     }
                     foreach ($args as $eachArgs) {
                         if ((! isset($eachArgs['message_detection']) || $eachArgs['message_detection'] !== true) && ! isset($eachArgs['message'])) {
                             throw CompilerPassException::messageTagMissing($id);
                         }
 
-                        $messageNames = isset($eachArgs['message']) ? [$eachArgs['message']] : $this->recognizeMessageNames($container, $container->getDefinition($id));
+                        $messageNames = isset($eachArgs['message'])
+                            ? [$eachArgs['message']]
+                            : $this->recognizeMessageNames($container, $container->getDefinition($id), $id, $type);
 
                         if ($type === 'event') {
                             $routerArguments[0] = array_merge_recursive(
@@ -84,9 +86,16 @@ public function process(ContainerBuilder $container)
         }
     }
 
-    private function recognizeMessageNames(ContainerBuilder $container, Definition $routeDefinition): array
-    {
+    private function recognizeMessageNames(
+        ContainerBuilder $container,
+        Definition $routeDefinition,
+        string $routeId,
+        string $busType
+    ): array {
         $handlerReflection = $container->getReflectionClass($routeDefinition->getClass());
+        if (! $handlerReflection) {
+            throw CompilerPassException::unknownHandlerClass($routeDefinition->getClass(), $routeId, $busType);
+        }
 
         $methodsWithMessageParameter = array_filter(
             $handlerReflection->getMethods(ReflectionMethod::IS_PUBLIC),

src/Exception/CompilerPassException.php

@@ -4,24 +4,34 @@
 
 namespace Prooph\Bundle\ServiceBus\Exception;
 
-class CompilerPassException extends \RuntimeException
+class CompilerPassException extends RuntimeException
 {
     public static function messageTagMissing(string $serviceId): self
     {
-        throw new self(
-            sprintf('The "message" tag key is missing from tag. Either provide a "message" tag or enable "message_detection" for service "%s"',
-                $serviceId
-            )
-        );
+        return new self(sprintf(
+            'The "message" tag key is missing from tag. '
+                . 'Either provide a "message" tag or enable "message_detection" for service "%s"',
+            $serviceId
+        ));
     }
 
     public static function tagCountExceeded(string $type, string $serviceId, string $busName): self
     {
-        throw new self(
-            sprintf(
-                'More than 1 %s handler tagged on service "%s" with tag "%s". Only events can have multiple handlers',
-                $type, $serviceId, $busName
-            )
-        );
+        return new self(sprintf(
+            'More than 1 %s handler tagged on service "%s" with tag "%s". Only events can have multiple handlers',
+            $type,
+            $serviceId,
+            $busName
+        ));
+    }
+
+    public static function unknownHandlerClass(string $className, string $serviceId, string $busName): self
+    {
+        return new self(sprintf(
+            'Service %s has been tagged as %s handler, but its class %s does not exist',
+            $serviceId,
+            $busName,
+            $className
+        ));
     }
 }