Merge pull request #229 from buggregator/feature/228

Add support for both `yaml` and `yml` file extensions.
buggregator · Jul 28, 2024 · ab82861 · ab82861
2 parents 15a57b7 + a9707fd
commit ab82861
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/app/database/Migrations/20240728.115465_1_1_default_create_default_project.php b/app/database/Migrations/20240728.115465_1_1_default_create_default_project.php
@@ -17,6 +17,13 @@ class OrmDefaultD93e77c9f5556975e93bfbc969442732 extends Migration
 
     public function up(): void
     {
+        $defaultProject = $this->getRepository()->findOne(['key' => Project::DEFAULT_KEY]);
+
+        // Ignore if default project already exists
+        if ($defaultProject !== null) {
+            return;
+        }
+
         $this->getEntityManager()
             ->persist(new Project(Key::create(Project::DEFAULT_KEY), 'Default project'))
             ->run();
@@ -25,6 +32,7 @@ public function up(): void
     public function down(): void
     {
         $defaultProject = $this->getRepository()->findOne(['key' => Project::DEFAULT_KEY]);
+        // Delete default project if exists
         if ($defaultProject !== null) {
             $this->getEntityManager()->delete($defaultProject)->run();
         }

diff --git a/app/modules/Projects/Application/YamlFileProjectLocator.php b/app/modules/Projects/Application/YamlFileProjectLocator.php
@@ -22,7 +22,7 @@ public function __construct(
 
     public function findAll(): iterable
     {
-        $this->finder->files()->in($this->directory)->name('*.project.yaml');
+        $this->finder->files()->in($this->directory)->name(['*.project.yaml', '*.project.yml']);
 
         foreach ($this->finder as $file) {
             try {

diff --git a/app/modules/Webhooks/Application/WebhooksBootloader.php b/app/modules/Webhooks/Application/WebhooksBootloader.php
@@ -78,12 +78,14 @@ public function defineSingletons(): array
                         finder: \Symfony\Component\Finder\Finder::create()
                             ->files()
                             ->in($dirs->get('runtime') . '/configs')
-                            ->name('*.webhook.yaml'),
+                            ->name(['*.webhook.yaml', '*.webhook.yml']),
                     ),
                 ],
             ),
 
-            WebhookLocatorInterface::class => static fn(YamlFileWebhookLocator $locator): WebhookLocatorInterface => new CompositeWebhookLocator([
+            WebhookLocatorInterface::class => static fn(
+                YamlFileWebhookLocator $locator,
+            ): WebhookLocatorInterface => new CompositeWebhookLocator([
                 $locator,
             ]),