Merge pull request #395 from doctrine/jackrabbit-command-service

always configure jackrabbit command parameters
doctrine · Feb 19, 2024 · e929ddf · e929ddf
2 parents f8b9e9b + ccc6062
commit e929ddf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -27,8 +27,8 @@ public function getConfigTreeBuilder(): TreeBuilder
 
         $root
             ->children()
-                ->scalarNode('jackrabbit_jar')->end()
-                ->scalarNode('workspace_dir')->end()
+                ->scalarNode('jackrabbit_jar')->defaultNull()->end()
+                ->scalarNode('workspace_dir')->defaultNull()->end()
                 ->scalarNode('dump_max_line_length')->defaultValue(120)->end()
                 ->scalarNode('manager_registry_service_id')->defaultNull()->end()
             ->end()

diff --git a/src/DependencyInjection/DoctrinePHPCRExtension.php b/src/DependencyInjection/DoctrinePHPCRExtension.php
@@ -90,9 +90,7 @@ public function load(array $configs, ContainerBuilder $container)
         ];
 
         foreach ($parameters as $param) {
-            if (isset($config[$param])) {
-                $container->setParameter('doctrine_phpcr.'.$param, $config[$param]);
-            }
+            $container->setParameter('doctrine_phpcr.'.$param, $config[$param]);
         }
 
         if (!empty($config['session'])) {

diff --git a/src/OptionalCommand/Jackalope/JackrabbitCommand.php b/src/OptionalCommand/Jackalope/JackrabbitCommand.php
@@ -16,8 +16,8 @@ class JackrabbitCommand extends BaseJackrabbitCommand
     private const NAME = 'doctrine:phpcr:jackrabbit';
 
     public function __construct(
-        private string $jackrabbitJar,
-        private string $workspaceDir,
+        private ?string $jackrabbitJar,
+        private ?string $workspaceDir,
     ) {
         parent::__construct(self::NAME);
     }

diff --git a/tests/Unit/DependencyInjection/ConfigurationTest.php b/tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -113,6 +113,7 @@ public function configurations(): array
                 'locale_chooser' => null,
             ],
             'jackrabbit_jar' => '/path/to/jackrabbit.jar',
+            'workspace_dir' => null,
             'dump_max_line_length' => 20,
             'manager_registry_service_id' => 'my_phpcr_registry',
         ];
@@ -208,6 +209,8 @@ public function configurations(): array
                 ],
                 'locale_chooser' => null,
             ],
+            'jackrabbit_jar' => null,
+            'workspace_dir' => null,
             'dump_max_line_length' => 120,
             'manager_registry_service_id' => null,
         ];