Fixing autowiring by parameter name

Author: moufmouf

DependencyInjection/GraphqliteCompilerPass.php

@@ -75,6 +75,9 @@ public function process(ContainerBuilder $container)
         $controllersNamespaces = $container->getParameter('graphqlite.namespace.controllers');
         $typesNamespaces = $container->getParameter('graphqlite.namespace.types');
 
+        $autowireByParameterName = $container->getParameter('graphqlite.autowire.by_parameter_name');
+        $autowireByClassName = $container->getParameter('graphqlite.autowire.by_class_name');
+
         // 2 seconds of TTL in environment mode. Otherwise, let's cache forever!
         $env = $container->getParameter('kernel.environment');
         $globTtl = null;
@@ -120,15 +123,17 @@ public function process(ContainerBuilder $container)
             }
         }
 
-        foreach ($controllersNamespaces as $controllersNamespace) {
-            foreach ($this->getClassList($controllersNamespace) as $className => $refClass) {
-                $this->makePublicInjectedServices($refClass, $reader, $container);
+        if ($autowireByParameterName || $autowireByClassName) {
+            foreach ($controllersNamespaces as $controllersNamespace) {
+                foreach ($this->getClassList($controllersNamespace) as $className => $refClass) {
+                    $this->makePublicInjectedServices($refClass, $reader, $container, $autowireByClassName, $autowireByParameterName);
+                }
             }
-        }
 
-        foreach ($typesNamespaces as $typeNamespace) {
-            foreach ($this->getClassList($typeNamespace) as $className => $refClass) {
-                $this->makePublicInjectedServices($refClass, $reader, $container);
+            foreach ($typesNamespaces as $typeNamespace) {
+                foreach ($this->getClassList($typeNamespace) as $className => $refClass) {
+                    $this->makePublicInjectedServices($refClass, $reader, $container, $autowireByClassName, $autowireByParameterName);
+                }
             }
         }
 
@@ -215,14 +220,14 @@ public function process(ContainerBuilder $container)
         }
     }
 
-    private function makePublicInjectedServices(ReflectionClass $refClass, AnnotationReader $reader, ContainerBuilder $container): void
+    private function makePublicInjectedServices(ReflectionClass $refClass, AnnotationReader $reader, ContainerBuilder $container, bool $autowireByClassName, bool $autowireByParameterName): void
     {
-        $services = $this->getCodeCache()->get($refClass, function() use ($refClass, $reader, $container) {
+        $services = $this->getCodeCache()->get($refClass, function() use ($refClass, $reader, $container, $autowireByClassName, $autowireByParameterName) {
             $services = [];
             foreach ($refClass->getMethods() as $method) {
                 $field = $reader->getRequestAnnotation($method, AbstractRequest::class);
                 if ($field !== null) {
-                    $services += $this->getListOfInjectedServices($method, $container);
+                    $services += $this->getListOfInjectedServices($method, $container, $autowireByClassName, $autowireByParameterName);
                 }
             }
             return $services;
@@ -239,15 +244,23 @@ private function makePublicInjectedServices(ReflectionClass $refClass, Annotatio
      * @param ContainerBuilder $container
      * @return array<string, string> key = value = service name
      */
-    private function getListOfInjectedServices(ReflectionMethod $method, ContainerBuilder $container): array
+    private function getListOfInjectedServices(ReflectionMethod $method, ContainerBuilder $container, bool $autowireByClassName, bool $autowireByParameterName): array
     {
         $services = [];
         foreach ($method->getParameters() as $parameter) {
-            $type = $parameter->getType();
-            if ($type !== null) {
-                $fqcn = $type->getName();
-                if ($container->has($fqcn)) {
-                    $services[$fqcn] = $fqcn;
+            if ($autowireByParameterName) {
+                $parameterName = $parameter->getName();
+                if ($container->has($parameterName)) {
+                    $services[$parameterName] = $parameterName;
+                }
+            }
+            if ($autowireByClassName) {
+                $type = $parameter->getType();
+                if ($type !== null) {
+                    $fqcn = $type->getName();
+                    if ($container->has($fqcn)) {
+                        $services[$fqcn] = $fqcn;
+                    }
                 }
             }
         }

Tests/Fixtures/Entities/Contact.php

@@ -38,9 +38,9 @@ public function getName(): string
      * @Field()
      * @return string
      */
-    public function injectService(TestGraphqlController $testService = null): string
+    public function injectService(TestGraphqlController $testService = null, stdClass $someService = null): string
     {
-        if (!$testService instanceof TestGraphqlController) {
+        if (!$testService instanceof TestGraphqlController || $someService === null) {
             return 'KO';
         }
         return 'OK';

Tests/Fixtures/config/services.yaml

@@ -17,6 +17,8 @@ services:
         resource: '../*'
         exclude: '../{Entities}'
 
+    someService:
+        class: stdClass
     # controllers are imported separately to make sure services can be injected
     # as action arguments even if you don't extend any base controller class
     #App\Controller\:

composer.json

@@ -17,7 +17,7 @@
   ],
   "require" : {
     "php" : ">=7.2",
-    "thecodingmachine/graphqlite" : "dev-autowiring as 4.0.0",
+    "thecodingmachine/graphqlite" : "^4",
     "symfony/framework-bundle": "^4.1.9",
     "doctrine/annotations": "^1.6",
     "doctrine/cache": "^1.8",
@@ -34,12 +34,6 @@
     "phpstan/phpstan": "^0.10.6",
     "beberlei/porpaginas": "^1.2"
   },
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/moufmouf/graphqlite"
-    }
-  ],
   "scripts": {
     "phpstan": "phpstan analyse GraphqliteBundle.php DependencyInjection/ Controller/ Resources/ Security/ -c phpstan.neon --level=7 --no-progress"
   },