Refactor packages configuration

Signed-off-by: Tim Goudriaan <tim@codedmonkey.com>

Author: codedmonkey

src/DependencyInjection/DirigentConfiguration.php

@@ -69,15 +69,6 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->scalarNode('path')->defaultValue('%kernel.project_dir%/storage')->end()
                 ->end()
             ->end()
-            ->arrayNode('packages')
-                ->addDefaultsIfNotSet()
-                ->children()
-                    ->booleanNode('dynamic_updates')->defaultTrue()->end()
-                    ->scalarNode('dynamic_update_delay')->defaultValue('PT4H')->end()
-                    ->booleanNode('periodic_updates')->defaultTrue()->end()
-                    ->scalarNode('periodic_update_interval')->defaultValue('P1W')->end()
-                ->end()
-            ->end()
             ->arrayNode('dist_mirroring')
                 ->canBeEnabled()
                 ->children()
@@ -87,6 +78,7 @@ public function getConfigTreeBuilder(): TreeBuilder
             ->end();
 
         $this->addMetadataSection($rootNode);
+        $this->addPackagesSection($rootNode);
 
         return $treeBuilder;
     }
@@ -104,4 +96,32 @@ private function addMetadataSection(ArrayNodeDefinition|NodeDefinition $rootNode
                 ->end()
             ->end();
     }
+
+    private function addPackagesSection(ArrayNodeDefinition|NodeDefinition $rootNode): void
+    {
+        $rootNode->children()
+            ->arrayNode('packages')
+                ->addDefaultsIfNotSet()
+                ->children()
+                    ->booleanNode('dynamic_updates')
+                        ->defaultTrue()
+                        ->info('Whether to automatically update packages when using the (Composer) API')
+                    ->end()
+                    ->stringNode('dynamic_update_delay')
+                        ->cannotBeEmpty()
+                        ->defaultValue('PT4H')
+                        ->info('The delay between package updates when using the API, in ISO 8601 duration format')
+                    ->end()
+                    ->booleanNode('periodic_updates')
+                        ->defaultTrue()
+                        ->info('Whether to automatically update packages periodically')
+                    ->end()
+                    ->stringNode('periodic_update_interval')
+                        ->cannotBeEmpty()
+                        ->defaultValue('P1W')
+                        ->info('The interval between periodic package updates, in ISO 8601 duration format')
+                    ->end()
+                ->end()
+            ->end();
+    }
 }

src/DependencyInjection/DirigentExtension.php

@@ -19,6 +19,7 @@ protected function loadInternal(array $mergedConfig, ContainerBuilder $container
 
         $this->registerEncryptionConfiguration($mergedConfig['encryption'], $container);
         $this->registerMetadataConfiguration($mergedConfig['metadata'], $container);
+        $this->registerPackagesConfiguration($mergedConfig['packages'], $container);
 
         $container->setParameter('dirigent.security.public_access', $mergedConfig['security']['public']);
         $container->setParameter('dirigent.security.registration_enabled', $mergedConfig['security']['registration']);
@@ -29,11 +30,6 @@ protected function loadInternal(array $mergedConfig, ContainerBuilder $container
             $container->setParameter('dirigent.storage.path', $mergedConfig['storage']['path']);
         }
 
-        $container->setParameter('dirigent.packages.dynamic_updates', $mergedConfig['packages']['dynamic_updates']);
-        $container->setParameter('dirigent.packages.dynamic_update_delay', $mergedConfig['packages']['dynamic_update_delay']);
-        $container->setParameter('dirigent.packages.periodic_updates', $mergedConfig['packages']['periodic_updates']);
-        $container->setParameter('dirigent.packages.periodic_update_interval', $mergedConfig['packages']['periodic_update_interval']);
-
         $container->setParameter('dirigent.dist_mirroring.enabled', $mergedConfig['dist_mirroring']['enabled']);
         $container->setParameter('dirigent.dist_mirroring.preferred', $mergedConfig['dist_mirroring']['preferred']);
         $container->setParameter('dirigent.dist_mirroring.dev_packages', $mergedConfig['dist_mirroring']['dev_packages']);
@@ -65,4 +61,36 @@ private function registerMetadataConfiguration(array $config, ContainerBuilder $
     {
         $container->setParameter('dirigent.metadata.mirror_vcs_repositories', $config['mirror_vcs_repositories']);
     }
+
+    /**
+     * @param array{periodic_update_interval: string, periodic_updates: bool, dynamic_update_delay: string, dynamic_updates: bool} $config
+     */
+    private function registerPackagesConfiguration(array $config, ContainerBuilder $container): void
+    {
+        $dynamicUpdatesEnabled = $config['dynamic_updates'];
+        $dynamicUpdateDelay = $dynamicUpdatesEnabled ? $config['dynamic_update_delay'] : null;
+        $periodicUpdatesEnabled = $config['periodic_updates'];
+        $periodicUpdateInterval = $periodicUpdatesEnabled ? $config['periodic_update_interval'] : null;
+
+        if (null !== $dynamicUpdateDelay) {
+            try {
+                new \DateInterval($dynamicUpdateDelay);
+            } catch (\DateMalformedIntervalStringException) {
+                throw new \LogicException("Invalid dynamic update delay: '$dynamicUpdateDelay' is not a valid ISO 8601 duration.");
+            }
+        }
+
+        if (null !== $periodicUpdateInterval) {
+            try {
+                new \DateInterval($periodicUpdateInterval);
+            } catch (\DateMalformedIntervalStringException) {
+                throw new \LogicException("Invalid periodic update interval: '$periodicUpdateInterval' is not a valid ISO 8601 duration.");
+            }
+        }
+
+        $container->setParameter('dirigent.packages.dynamic_updates', $dynamicUpdatesEnabled);
+        $container->setParameter('dirigent.packages.dynamic_update_delay', $dynamicUpdateDelay);
+        $container->setParameter('dirigent.packages.periodic_updates', $periodicUpdatesEnabled);
+        $container->setParameter('dirigent.packages.periodic_update_interval', $periodicUpdateInterval);
+    }
 }