Fixing bundle

Author: TheCelavi

composer.json

@@ -21,6 +21,7 @@
         "symfony/http-kernel": "^7.0",
         "symfony/process": "^7.3",
         "symfony/string": "^7.0",
+        "thecodingmachine/safe": "^3.3",
         "twig/twig": "^3.0"
     },
     "require-dev": {

composer.lock

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\Config\Definition\Configurator\DefinitionConfigurator;
+
+return static function(DefinitionConfigurator $definition): void {
+    // @phpstan-ignore-next-line
+    $definition
+        ->rootNode()
+        ->addDefaultsIfNotSet()
+        ->children()
+            ->scalarNode('default_connection')
+                ->defaultNull()
+                ->info('Default connection name. If not provided, first registered adapter connection will be considered as default one.')
+            ->end()
+            ->scalarNode('default_path')
+                ->info('The default path used to load queries.')
+                ->defaultValue('%kernel.project_dir%/query')
+            ->end()
+            ->arrayNode('query_paths')
+                ->info('Additional paths where queries can be found.')
+                ->defaultValue([])
+                ->beforeNormalization()
+                ->ifArray()
+                    ->then(static function(array $paths): array {
+                        $normalized = [];
+            
+                        /**
+                         * @var string|int $path
+                         * @var string     $namespace
+                         */
+                        foreach ($paths as $path => $namespace) {
+                            // path within the default namespace
+                            if (\ctype_digit((string) $path)) {
+                                $path = $namespace;
+                                $namespace = null;
+                            }
+            
+                            $normalized[$path] = $namespace;
+                        }
+            
+                        return $normalized;
+                    })
+                ->end()
+                ->prototype('variable')->end()
+            ->end()
+        
+        ->end();
+};

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

@@ -2,10 +2,27 @@
 
 declare(strict_types=1);
 
+use Psr\Log\LogLevel;
 use RunOpenCode\Component\Query\Replica\FallbackStrategy;
 use Symfony\Component\Config\Definition\Configurator\DefinitionConfigurator;
 
 return static function(DefinitionConfigurator $definition): void {
+    $assertCatchable = static function (?array $value): bool {
+        if (null === $value) {
+            return true;
+        }
+
+        foreach ($value as $current) {
+            if (\is_string($current) && \is_a($current, \Exception::class, true)) {
+                continue;
+            }
+
+            return false;
+        }
+
+        return true;
+    };
+    
     // @phpstan-ignore-next-line
     $definition
         ->rootNode()
@@ -18,7 +35,6 @@
                 ->defaultValue([
                     'cache',
                     'parser',
-                    'executor',
                 ])
                     ->scalarPrototype()->end()
                 ->end()
@@ -40,31 +56,52 @@
                             ->booleanNode('disabled')
                                 ->defaultValue('%kernel.debug%')
                             ->end()
+                            ->arrayNode('catch')
+                                ->scalarPrototype()->end()
+                                ->defaultValue(null)
+                                ->validate()
+                                    ->ifFalse($assertCatchable)
+                                    ->thenInvalid('Replica middleware expects a list of full qualified class names which extends "\Exception" to catch.')
+                                ->end()
+                            ->end()
                         ->end()
                     ->end()
                 ->end()
                 ->arrayNode('retry')
                     ->scalarPrototype()->end()
                     ->defaultValue(null)
                     ->validate()
-                        ->ifFalse(static function(?array $value): bool {
-                            if (null === $value) {
-                                return true;
-                            }
-
-                            foreach ($value as $current) {
-                                if (\is_string($current) && \is_a($current, \Exception::class, true)) {
-                                    continue;
-                                }
-
-                                return false;
-                            }
-
-                            return true;
-                        })
+                        ->ifFalse($assertCatchable)
                         ->thenInvalid('Retry middleware expects a list of full qualified class names which extends "\Exception".')
                     ->end()
                 ->end()
+                ->arrayNode('slow')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->scalarNode('logger')
+                            ->defaultNull()
+                        ->end()    
+                        ->scalarNode('level')
+                            ->defaultValue(LogLevel::ERROR)
+                        ->end()
+                        ->integerNode('threshold')
+                            ->min(1)
+                            ->defaultValue(30)
+                        ->end()
+                        ->booleanNode('always')
+                            ->defaultFalse()
+                        ->end()
+                    ->end()
+                    ->arrayNode('cache')
+                        ->addDefaultsIfNotSet()
+                        ->children()
+                            ->scalarNode('cache_pool')
+                                ->defaultValue('cache.app')
+                                ->info('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). ')
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
             ->end()
         ->end();
 };