Allow configuration files with .yml extensions

codedmonkey · codedmonkey · commit 0ac1a7d2655e · 2025-03-19T23:42:11.000+01:00
diff --git a/.dockerignore b/.dockerignore
@@ -1,6 +1,9 @@
 /.github/
 /.idea/
+/config/dirigent.json
+/config/dirigent.php
 /config/dirigent.yaml
+/config/dirigent.yml
 /config/packages/dirigent.yaml
 /node_modules/
 /public/build/
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,9 @@
 /.env
 /compose.override.yaml
+/config/dirigent.json
+/config/dirigent.php
 /config/dirigent.yaml
+/config/dirigent.yml
 /config/packages/dirigent.yaml
 /storage/
 
diff --git a/src/Kernel.php b/src/Kernel.php
@@ -20,10 +20,10 @@ protected function configureContainer(ContainerConfigurator $container): void
 
         $container->import($configDir . '/packages/*.yaml');
         $container->import($configDir . '/services.yaml');
-        $container->import($configDir . '/dirigent.{json,php,yaml}');
+        $container->import($configDir . '/dirigent.{json,php,yml,yaml}');
 
         if (isset($_SERVER['DIRIGENT_IMAGE'])) {
-            $container->import('/srv/config/*.{json,php,yaml}');
+            $container->import('/srv/config/*.{json,php,yml,yaml}');
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,10 @@ protected function configureContainer(ContainerConfigurator $container): void`
`20`	`20`
`21`	`21`	`$container->import($configDir . '/packages/*.yaml');`
`22`	`22`	`$container->import($configDir . '/services.yaml');`
`23`		`- $container->import($configDir . '/dirigent.{json,php,yaml}');`
	`23`	`+ $container->import($configDir . '/dirigent.{json,php,yml,yaml}');`
`24`	`24`
`25`	`25`	`if (isset($_SERVER['DIRIGENT_IMAGE'])) {`
`26`		`- $container->import('/srv/config/*.{json,php,yaml}');`
	`26`	`+ $container->import('/srv/config/*.{json,php,yml,yaml}');`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`