Merge pull request #8 from moufmouf/autodetection_refactoring

Refactoring of detection of controllers and types

Author: moufmouf

DependencyInjection/GraphqlControllersCompilerPass.php

@@ -68,6 +68,22 @@ public function process(ContainerBuilder $container)
         $reader = $this->getAnnotationReader();
         $inputTypeUtils = new InputTypeUtils($reader, $namingStrategy);
 
+        // Let's scan the whole container and tag the services that belong to the namespace we want to inspect.
+        $controllersNamespace = $container->getParameter('graphql_controllers.namespace.controllers');
+        $typesNamespace = $container->getParameter('graphql_controllers.namespace.types');
+
+        foreach ($container->getDefinitions() as $id => $definition) {
+            if ($definition->isAbstract() || $definition->getClass() === null) {
+                continue;
+            }
+            if (strpos($definition->getClass(), $controllersNamespace) === 0) {
+                $definition->addTag('graphql.annotated.controller');
+            }
+            if (strpos($definition->getClass(), $typesNamespace) === 0) {
+                $definition->addTag('graphql.annotated.type');
+            }
+        }
+
         foreach ($container->findTaggedServiceIds('graphql.annotated.controller') as $id => $tag) {
             $definition = $container->findDefinition($id);
             $class = $definition->getClass();

DependencyInjection/GraphqlControllersExtension.php

@@ -21,13 +21,6 @@
 class GraphqlControllersExtension extends Extension
 {
 
-    private $projectDir;
-
-    public function setProjectDir(string $projectDir): void
-    {
-        $this->projectDir = $projectDir;
-    }
-
     /**
      * Loads a specific configuration.
      *
@@ -44,27 +37,9 @@ public function load(array $configs, ContainerBuilder $container)
         $namespaceController = rtrim($configs[0]['namespace']['controllers'], '\\') . '\\';
         $namespaceType = rtrim($configs[0]['namespace']['types'], '\\') . '\\';
 
-        $definitionTemplateControllerClass = new Definition();
-        $definitionTemplateControllerClass->addTag('graphql.annotated.controller');
-        $definitionTemplateTypeClass = new Definition();
-        $definitionTemplateTypeClass->addTag('graphql.annotated.type');
-
-        if ($this->projectDir === null) {
-            $this->projectDir = dirname(__DIR__, 4).'/';
-        }
-
-        $controllersDir = $this->projectDir.$this->getNamespaceDir($namespaceController);
-        $typesDir = $this->projectDir.$this->getNamespaceDir($namespaceType);
-
-        if (!is_dir($controllersDir)) {
-            throw new GraphQLException(sprintf('GraphQL-Controllers bundle expects controllers to be located in the "%s" directory. This directory does not exists.', $controllersDir));
-        }
-        if (!is_dir($typesDir)) {
-            throw new GraphQLException(sprintf('GraphQL-Controllers bundle expects types to be located in the "%s" directory. This directory does not exists.', $typesDir));
-        }
+        $container->setParameter('graphql_controllers.namespace.controllers', $namespaceController);
+        $container->setParameter('graphql_controllers.namespace.types', $namespaceType);
 
-        $loader->registerClasses($definitionTemplateControllerClass, $namespaceController, $controllersDir.'/*.php');
-        $loader->registerClasses($definitionTemplateTypeClass, $namespaceType, $typesDir.'/*.php');
         $loader->load('graphql-controllers.xml');
 
         $definition = $container->getDefinition(ServerConfig::class);

Tests/GraphqlControllersTestingKernel.php

@@ -16,12 +16,9 @@ class GraphqlControllersTestingKernel extends Kernel
 
     public function registerBundles()
     {
-        $graphQlControllersBundle = new GraphqlControllersBundle();
-        $graphQlControllersBundle->getContainerExtension()->setProjectDir(__DIR__.'/..');
-
         return [
             new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            $graphQlControllersBundle,
+            new GraphqlControllersBundle(),
         ];
     }
 
@@ -42,8 +39,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
 
         $loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob');
         $loader->load($confDir.'/{packages}/'.$this->environment.'/**/*'.self::CONFIG_EXTS, 'glob');
-        //$loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob');
-        //$loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');
-
+        $loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob');
+        $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');
     }
 }

composer.json

@@ -23,8 +23,7 @@
     "doctrine/cache": "^1.8",
     "symfony/psr-http-message-bridge": "^1",
     "zendframework/zend-diactoros": "^1.8.6",
-    "overblog/graphiql-bundle": "^0.1.2",
-    "mouf/classname-mapper": "^1.0"
+    "overblog/graphiql-bundle": "^0.1.2"
   },
   "require-dev": {
     "symfony/security-bundle": "^4.1.9",