Merge pull request #280 from Magnesium38/handle-parens

Handle Parentheses On Anonymous Settings Migrations
spatie · Aug 13, 2024 · 9c6e6c0 · 9c6e6c0
2 parents e96ad62 + 0916596
commit 9c6e6c0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/LaravelSettingsServiceProvider.php b/src/LaravelSettingsServiceProvider.php
@@ -78,6 +78,8 @@ private function removeMigrationsWhenSchemaLoaded(SchemaLoaded $event)
                 if (
                     str_contains($contents, 'return new class extends '.SettingsMigration::class)
                     || str_contains($contents, 'return new class extends SettingsMigration')
+                    || str_contains($contents, 'return new class() extends '.SettingsMigration::class)
+                    || str_contains($contents, 'return new class() extends SettingsMigration')
                 ) {
                     return $file->getBasename('.php');
                 }

diff --git a/tests/Migrations/2018_11_21_091111_create_fake_anonymous_class_with_parentheses_settings.php b/tests/Migrations/2018_11_21_091111_create_fake_anonymous_class_with_parentheses_settings.php
@@ -0,0 +1,14 @@
+<?php
+
+use Spatie\LaravelSettings\Migrations\SettingsBlueprint;
+use Spatie\LaravelSettings\Migrations\SettingsMigration;
+
+return new class() extends SettingsMigration {
+    public function up(): void
+    {
+        $this->migrator->inGroup('anonymous-class-with-parentheses-general', function (SettingsBlueprint $migrator) {
+            $migrator->add('name', 'laravel-settings');
+            $migrator->add('organization', 'spatie');
+        });
+    }
+};
diff --git a/tests/SettingsTest.php b/tests/SettingsTest.php
@@ -453,6 +453,7 @@
     assertDatabaseHas('migrations', ['migration' => '2018_11_21_091111_create_fake_anonymous_class_settings']);
     assertDatabaseHas('migrations', ['migration' => '2018_11_21_091111_create_fake_table']);
     assertDatabaseHas('migrations', ['migration' => '2018_11_21_091111_create_fake_anonymous_class_table']);
+    assertDatabaseHas('migrations', ['migration' => '2018_11_21_091111_create_fake_anonymous_class_with_parentheses_settings']);
 
     event(new SchemaLoaded(
         DB::connection(),
@@ -461,6 +462,7 @@
 
     assertDatabaseMissing('migrations', ['migration' => '2018_11_21_091111_create_fake_settings']);
     assertDatabaseMissing('migrations', ['migration' => '2018_11_21_091111_create_fake_anonymous_class_settings']);
+    assertDatabaseMissing('migrations', ['migration' => '2018_11_21_091111_create_fake_anonymous_class_with_parentheses_settings']);
     assertDatabaseHas('migrations', ['migration' => '2018_11_21_091111_create_fake_table']);
     assertDatabaseHas('migrations', ['migration' => '2018_11_21_091111_create_fake_anonymous_class_table']);
 })->skip(fn () => Str::startsWith(app()->version(), '7'), 'No support for dumping migrations in Laravel 7');