Merge pull request #21 from moufmouf/support_autowiring_annotation

Removing settings for enabling autowiring

Author: moufmouf

DependencyInjection/Configuration.php

@@ -37,12 +37,6 @@ public function getConfigTreeBuilder()
                 ->booleanNode('RETHROW_UNSAFE_EXCEPTIONS')->defaultTrue()->info('Exceptions that do not implement ClientAware interface are not caught by the engine and propagated to Symfony.')->end()
                 ->end()
             ->end()
-            ->arrayNode('autowire')
-                ->children()
-                ->booleanNode('by_class_name')->defaultTrue()->info('Autowire services based on the parameter\'s fully qualified class name')->end()
-                ->booleanNode('by_parameter_name')->defaultFalse()->info('Autowire services based on the parameter\'s name')->end()
-                ->end()
-            ->end()
         ;
 
         return $treeBuilder;

DependencyInjection/GraphqliteCompilerPass.php

@@ -79,9 +79,6 @@ 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;
@@ -127,17 +124,15 @@ public function process(ContainerBuilder $container)
             }
         }
 
-        if ($autowireByParameterName || $autowireByClassName) {
-            foreach ($controllersNamespaces as $controllersNamespace) {
-                foreach ($this->getClassList($controllersNamespace) as $className => $refClass) {
-                    $this->makePublicInjectedServices($refClass, $reader, $container, $autowireByClassName, $autowireByParameterName);
-                }
+        foreach ($controllersNamespaces as $controllersNamespace) {
+            foreach ($this->getClassList($controllersNamespace) 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);
-                }
+        foreach ($typesNamespaces as $typeNamespace) {
+            foreach ($this->getClassList($typeNamespace) as $className => $refClass) {
+                $this->makePublicInjectedServices($refClass, $reader, $container);
             }
         }
 
@@ -224,14 +219,14 @@ public function process(ContainerBuilder $container)
         }
     }
 
-    private function makePublicInjectedServices(ReflectionClass $refClass, AnnotationReader $reader, ContainerBuilder $container, bool $autowireByClassName, bool $autowireByParameterName): void
+    private function makePublicInjectedServices(ReflectionClass $refClass, AnnotationReader $reader, ContainerBuilder $container): void
     {
-        $services = $this->getCodeCache()->get($refClass, function() use ($refClass, $reader, $container, $autowireByClassName, $autowireByParameterName) {
+        $services = $this->getCodeCache()->get($refClass, function() use ($refClass, $reader, $container) {
             $services = [];
             foreach ($refClass->getMethods() as $method) {
                 $field = $reader->getRequestAnnotation($method, AbstractRequest::class);
                 if ($field !== null) {
-                    $services += $this->getListOfInjectedServices($method, $container, $autowireByClassName, $autowireByParameterName);
+                    $services += $this->getListOfInjectedServices($method, $container);
                 }
             }
             return $services;
@@ -248,7 +243,7 @@ private function makePublicInjectedServices(ReflectionClass $refClass, Annotatio
      * @param ContainerBuilder $container
      * @return array<string, string> key = value = service name
      */
-    private function getListOfInjectedServices(ReflectionMethod $method, ContainerBuilder $container, bool $autowireByClassName, bool $autowireByParameterName): array
+    private function getListOfInjectedServices(ReflectionMethod $method, ContainerBuilder $container): array
     {
         $services = [];
 

DependencyInjection/GraphqliteExtension.php

@@ -54,23 +54,9 @@ public function load(array $configs, ContainerBuilder $container)
             $namespaceType = [];
         }
 
-        if (isset($configs[0]['autowire']['by_class_name'])) {
-            $autowireByClassName = $configs[0]['autowire']['by_class_name'];
-        } else {
-            $autowireByClassName = true;
-        }
-        if (isset($configs[0]['autowire']['by_parameter_name'])) {
-            $autowireByParameterName = $configs[0]['autowire']['by_parameter_name'];
-        } else {
-            $autowireByParameterName = false;
-        }
-
         $container->setParameter('graphqlite.namespace.controllers', $namespaceController);
         $container->setParameter('graphqlite.namespace.types', $namespaceType);
 
-        $container->setParameter('graphqlite.autowire.by_class_name', $autowireByClassName);
-        $container->setParameter('graphqlite.autowire.by_parameter_name', $autowireByParameterName);
-
         $loader->load('graphqlite.xml');
 
         $definition = $container->getDefinition(ServerConfig::class);

Resources/config/container/graphqlite.xml

@@ -35,8 +35,6 @@
 
         <service id="TheCodingMachine\GraphQLite\Mappers\Parameters\ContainerParameterMapper">
             <argument type="service" id="service_container" />
-            <argument>%graphqlite.autowire.by_class_name%</argument>
-            <argument>%graphqlite.autowire.by_parameter_name%</argument>
             <tag name="graphql.parameter_mapper" />
         </service>
 

Tests/GraphqliteTestingKernel.php

@@ -41,9 +41,6 @@ public function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
                     'controllers' => ['TheCodingMachine\\Graphqlite\\Bundle\\Tests\\Fixtures\\Controller\\'],
                     'types' => ['TheCodingMachine\\Graphqlite\\Bundle\\Tests\\Fixtures\\Types\\', 'TheCodingMachine\\Graphqlite\\Bundle\\Tests\\Fixtures\\Entities\\']
                 ],
-                'autowire' => [
-                    'by_parameter_name' => true
-                ]
             ));
         });
         $confDir = $this->getProjectDir().'/Tests/Fixtures/config';