[8.x] Allow anonymous and class based migration coexisting (#37006)

* Update test to fail * Validate file path
laravel · Apr 15, 2021 · 8d16ccc · 8d16ccc
1 parent d51133b
commit 8d16ccc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/Illuminate/Database/Migrations/Migrator.php b/src/Illuminate/Database/Migrations/Migrator.php
@@ -470,7 +470,7 @@ protected function resolvePath(string $path)
     {
         $class = $this->getMigrationClass($this->getMigrationName($path));
 
-        if (class_exists($class)) {
+        if (class_exists($class) && realpath($path) == (new ReflectionClass($class))->getFileName()) {
             return new $class;
         }
 

diff --git a/tests/Integration/Migration/MigratorTest.php b/tests/Integration/Migration/MigratorTest.php
@@ -76,7 +76,7 @@ public function testPretendMigrate()
     {
         $this->expectOutput('<info>CreatePeopleTable:</info> create table "people" ("id" integer not null primary key autoincrement, "name" varchar not null, "email" varchar not null, "password" varchar not null, "remember_token" varchar, "created_at" datetime, "updated_at" datetime)');
         $this->expectOutput('<info>CreatePeopleTable:</info> create unique index "people_email_unique" on "people" ("email")');
-        $this->expectOutput('<info>2015_10_04_000000_modify_people_table:</info> alter table "people" add column "first_name" varchar');
+        $this->expectOutput('<info>ModifyPeopleTable:</info> alter table "people" add column "first_name" varchar');
         $this->expectOutput('<info>2016_10_04_000000_modify_people_table:</info> alter table "people" add column "last_name" varchar');
 
         $this->subject->run([__DIR__.'/fixtures'], ['pretend' => true]);

diff --git a/tests/Integration/Migration/fixtures/2015_10_04_000000_modify_people_table.php b/tests/Integration/Migration/fixtures/2015_10_04_000000_modify_people_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+class ModifyPeopleTable extends Migration
+{
     /**
      * Run the migrations.
      *
@@ -28,4 +29,4 @@ public function down()
             $table->dropColumn('first_name');
         });
     }
-};
+}