Beta of query bundle is ready

Author: TheCelavi

src/RunOpenCode/Bundle/QueryBundle/composer.json

@@ -16,8 +16,7 @@
         "symfony/dependency-injection": "^7.0",
         "symfony/finder": "^7.0",
         "symfony/http-kernel": "^7.0",
-        "twig/twig": "^3.0",
-        "psr/container": "^2.0"
+        "twig/twig": "^3.0"
     },
     "autoload": {
         "psr-4": {

src/RunOpenCode/Bundle/QueryBundle/config/definition/cache.php

@@ -11,9 +11,9 @@
         ->addDefaultsIfNotSet()
         ->children()
             ->scalarNode('cache_pool')
-                ->defaultValue('app.cache')
+                ->defaultValue('cache.app')
                 ->info(<<<INFO
-Cache pool to use for cache middleware. By default `app.cache` is used. If `NULL` is provided, middleware will be still
+Cache pool to use for cache middleware. By default `cache.app` is used. If `NULL` is provided, middleware will be still
 registered, but `Symfony\Component\Cache\Adapter\NullAdapter` will be used (no caching). 
 INFO)
             ->end()

src/RunOpenCode/Bundle/QueryBundle/config/definition/middleware.php

@@ -15,13 +15,12 @@
             ->addDefaultsIfNotSet()
             ->children()
                 ->arrayNode('stack')
-                ->addDefaultsIfNotSet()
                 ->defaultValue([
                     'cache',
                     'parser',
                     'executor',
                 ])
-                    ->scalarPrototype()
+                    ->scalarPrototype()->end()
                 ->end()
                 ->arrayNode('replica')
                     ->useAttributeAsKey('connection')

src/RunOpenCode/Bundle/QueryBundle/config/services/executor.php

@@ -17,7 +17,7 @@
 
     $configurator
         ->set(AdapterRegistry::class)
-        ->arg('$executors', tagged_iterator('runopencode.query.adapter'));
+        ->arg('$adapters', tagged_iterator('runopencode.query.adapter'));
 
     $configurator
         ->set(MiddlewareRegistry::class);
@@ -31,8 +31,8 @@
 
     $configurator
         ->set(Executor::class)
-        ->arg('$middlewares', MiddlewareRegistry::class)
-        ->arg('$adapters', AdapterRegistry::class);
+        ->arg('$middlewares', service(MiddlewareRegistry::class))
+        ->arg('$adapters', service(AdapterRegistry::class));
 
     $configurator
         ->alias(ExecutorInterface::class, Executor::class);

src/RunOpenCode/Bundle/QueryBundle/config/services/twig.php

@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use Psr\Container\ContainerInterface;
 use RunOpenCode\Bundle\QueryBundle\CacheWarmer\TwigCacheWarmer;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Twig\Environment;
@@ -30,6 +29,6 @@
 
     $configurator
         ->set(TwigCacheWarmer::class)
-        ->arg('$container', service(ContainerInterface::class))
+        ->arg('$container', service('service_container'))
         ->tag('kernel.cache_warmer');
 };

src/RunOpenCode/Bundle/QueryBundle/src/CacheWarmer/TwigCacheWarmer.php

@@ -37,6 +37,7 @@ public function warmUp(string $cacheDir, ?string $buildDir = null): array
         /** @var Environment $twig */
         $twig = $this->container->get('runopencode.query.twig');
 
+        // TODO -> cache replacement is a must!
         if ($twig->getCache() instanceof NullCache) {
             return [];
         }

src/RunOpenCode/Bundle/QueryBundle/src/DependencyInjection/CompilerPass/ConfigureMiddlewareStack.php

@@ -55,13 +55,15 @@ private function getTaggedMiddlewares(ContainerBuilder $container): iterable
         $tagged = $container->findTaggedServiceIds('runopencode.query.middleware');
 
         /**
-         * @var array{ alias?: non-empty-string } $attributes
-         * @var non-empty-string                  $id
+         * @var list<array{ alias?: non-empty-string }> $attributes
+         * @var non-empty-string                        $id
          */
         foreach ($tagged as $id => $attributes) {
-            if (isset($attributes['alias'])) {
-                yield $attributes['alias'] => new Reference($id);
-                continue;
+            foreach ($attributes as $attribute) {
+                if (isset($attribute['alias'])) {
+                    yield $attribute['alias'] => new Reference($id);
+                    continue 2;
+                }
             }
 
             yield $id => new Reference($id);

src/RunOpenCode/Bundle/QueryBundle/src/DependencyInjection/CompilerPass/ConfigureTwigLoader.php

@@ -28,7 +28,12 @@ public function process(ContainerBuilder $container): void
 
         \assert(\is_string($projectDir));
 
-        $loader->addMethodCall('addPath', [$defaultPath, FilesystemLoader::MAIN_NAMESPACE]);
+        /** @var non-empty-string $defaultPath */
+        if (\is_dir($defaultPath)) {
+            $loader->addMethodCall('addPath', [$defaultPath, FilesystemLoader::MAIN_NAMESPACE]);
+        }
+
+        $container->addResource(new FileExistenceResource($defaultPath));
 
         /** @var array<string, string|null> $paths */
         foreach ($paths as $path => $namespace) {

src/RunOpenCode/Bundle/QueryBundle/src/DependencyInjection/CompilerPass/RegisterDbalAdapters.php

@@ -21,22 +21,22 @@ public function process(ContainerBuilder $container): void
             return;
         }
 
-        /** @var list<non-empty-string> $connections */
+        /** @var array<non-empty-string, non-empty-string> $connections */
         $connections = $container->getParameter('doctrine.connections');
-        $default     = $container->getParameter('doctrine.default_connection');
-        $sorted      = [
-            $default,
-            \array_filter($connections, static fn(string $connection): bool => $connection !== $default),
-        ];
 
         /** @var non-empty-string $connection */
-        foreach ($sorted as $connection) {
+        foreach ($connections as $alias => $connection) {
             $definition = new Definition(Adapter::class, [
-                $connection,
+                $alias,
                 new Reference($connection),
             ]);
 
             $definition->addTag('runopencode.query.adapter');
+            
+            $container->setDefinition(
+                \sprintf('runopencode.query.adapter.%s', $alias),
+                $definition,
+            );
         }
     }
 }