[5.7] Services can be injected in migrations

src/Illuminate/Database/MigrationServiceProvider.php

@@ -57,7 +57,7 @@ protected function registerMigrator()
         $this->app->singleton('migrator', function ($app) {
             $repository = $app['migration.repository'];
 
-            return new Migrator($repository, $app['db'], $app['files']);
+            return new Migrator($app, $repository, $app['db'], $app['files']);
         });
     }
 

src/Illuminate/Database/Migrations/Migrator.php

@@ -7,6 +7,7 @@
 use Illuminate\Support\Collection;
 use Illuminate\Console\OutputStyle;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Contracts\Container\Container;
 use Illuminate\Database\ConnectionResolverInterface as Resolver;
 
 class Migrator
@@ -54,17 +55,27 @@ class Migrator
     protected $output;
 
     /**
-     * Create a new migrator instance.
+     * The IoC container instance.
      *
-     * @param  \Illuminate\Database\Migrations\MigrationRepositoryInterface  $repository
-     * @param  \Illuminate\Database\ConnectionResolverInterface  $resolver
-     * @param  \Illuminate\Filesystem\Filesystem  $files
-     * @return void
+     * @var \Illuminate\Container\Container
      */
-    public function __construct(MigrationRepositoryInterface $repository,
-                                Resolver $resolver,
-                                Filesystem $files)
-    {
+    protected $container;
+
+    /**
+     * Create a new migrator instance.
+     *
+     * @param  \Illuminate\Contracts\Container\Container $container
+     * @param  \Illuminate\Database\Migrations\MigrationRepositoryInterface $repository
+     * @param  \Illuminate\Database\ConnectionResolverInterface $resolver
+     * @param  \Illuminate\Filesystem\Filesystem $files
+     */
+    public function __construct(
+        Container $container,
+        MigrationRepositoryInterface $repository,
+        Resolver $resolver,
+        Filesystem $files
+    ) {
+        $this->container = $container;
         $this->files = $files;
         $this->resolver = $resolver;
         $this->repository = $repository;
@@ -357,7 +368,7 @@ protected function runMigration($migration, $method)
 
         $callback = function () use ($migration, $method) {
             if (method_exists($migration, $method)) {
-                $migration->{$method}();
+                $this->container->call([$migration, $method]);
             }
         };
 

tests/Database/DatabaseMigratorIntegrationTest.php

@@ -6,14 +6,24 @@
 use Illuminate\Support\Str;
 use PHPUnit\Framework\TestCase;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Database\Schema\Builder;
+use Illuminate\Database\DatabaseManager;
 use Illuminate\Database\Migrations\Migrator;
 use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Database\Migrations\DatabaseMigrationRepository;
 
 class DatabaseMigratorIntegrationTest extends TestCase
 {
+    /**
+     * @var \Illuminate\Database\Capsule\Manager
+     */
     protected $db;
 
+    /**
+     * @var \Illuminate\Database\Migrations\Migrator
+     */
+    protected $migrator;
+
     /**
      * Bootstrap Eloquent.
      *
@@ -31,10 +41,14 @@ public function setUp()
         $db->setAsGlobal();
 
         $container = new \Illuminate\Container\Container;
-        $container->instance('db', $db->getDatabaseManager());
+        $databaseManager = $db->getDatabaseManager();
+        $container->instance('db', $databaseManager);
+        $container->instance(DatabaseManager::class, $databaseManager);
+        $container->instance(Builder::class, $databaseManager->getSchemaBuilder());
         \Illuminate\Support\Facades\Facade::setFacadeApplication($container);
 
         $this->migrator = new Migrator(
+            $container,
             $repository = new DatabaseMigrationRepository($db->getDatabaseManager(), 'migrations'),
             $db->getDatabaseManager(),
             new Filesystem
@@ -143,4 +157,13 @@ public function testMigrationsCanBeResetAcrossMultiplePaths()
         $this->assertFalse($this->db->schema()->hasTable('password_resets'));
         $this->assertFalse($this->db->schema()->hasTable('flights'));
     }
+
+    public function testServicesCanBeInjectedInTheMigrationMethods()
+    {
+        $this->migrator->run([__DIR__.'/migrations/three']);
+        $this->assertTrue($this->db->schema()->hasTable('test'));
+        $this->assertSame(1, $this->db->getConnection()->table('test')->where('name', '=', 'PirateKing')->count());
+        $this->migrator->rollback([__DIR__.'/migrations/three']);
+        $this->assertFalse($this->db->schema()->hasTable('test'));
+    }
 }

tests/Database/migrations/three/2018_07_31_000000_create_test_table.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Schema\Builder;
+use Illuminate\Database\DatabaseManager;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTestTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @param  Builder $builder
+     * @param  DatabaseManager $databaseManager
+     * @return void
+     */
+    public function up(Builder $builder, DatabaseManager $databaseManager)
+    {
+        $builder->create('test', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+        });
+
+        $databaseManager->table('test')->insert(['name' => 'PirateKing']);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @param  Builder $builder
+     * @return void
+     */
+    public function down(Builder $builder)
+    {
+        $builder->dropIfExists('test');
+    }
+}