Merge pull request #49 from ruudk/class-name-services

Use `serviceId` and `method` in callable

Author: cmodijk

src/DependencyInjection/Compiler/RegisterHandlers.php

@@ -47,7 +47,12 @@ public function process(ContainerBuilder $container)
             $this->keyAttribute,
             function ($key, $serviceId, array $tagAttributes) use (&$handlers) {
                 if (isset($tagAttributes['method'])) {
-                    $callable = [$serviceId, $tagAttributes['method']];
+                    // Symfony 3.3 supports services by classname. This interferes with `is_callable`
+                    // in `ServiceLocatorAwareCallableResolver`
+                    $callable = [
+                        'serviceId' => $serviceId,
+                        'method'    => $tagAttributes['method'],
+                    ];
                 } else {
                     $callable = $serviceId;
                 }

src/DependencyInjection/Compiler/RegisterSubscribers.php

@@ -47,7 +47,12 @@ public function process(ContainerBuilder $container)
             $this->keyAttribute,
             function ($key, $serviceId, array $tagAttributes) use (&$handlers) {
                 if (isset($tagAttributes['method'])) {
-                    $callable = [$serviceId, $tagAttributes['method']];
+                    // Symfony 3.3 supports services by classname. This interferes with `is_callable`
+                    // in `ServiceLocatorAwareCallableResolver`
+                    $callable = [
+                        'serviceId' => $serviceId,
+                        'method'    => $tagAttributes['method'],
+                    ];
                 } else {
                     $callable = $serviceId;
                 }