Skip to content

[5.0] Automatically Resolve Migrations Dependencies #6784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[5.0] Automatically Resolve Migrations Dependencies #6784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd1fd95
Automatically instantiate migrations dependencies
antonioribeiro Dec 23, 2014
a5e8841
Aliasing the contract
antonioribeiro Dec 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Illuminate/Database/MigrationServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected function registerMigrator()
{
$repository = $app['migration.repository'];

return new Migrator($repository, $app['db'], $app['files']);
return new Migrator($repository, $app, $app['db'], $app['files']);
});
}

Expand Down
21 changes: 16 additions & 5 deletions src/Illuminate/Database/Migrations/Migrator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
<?php namespace Illuminate\Database\Migrations;

use Illuminate\Filesystem\Filesystem;
use Illuminate\Contracts\Container\Container as ContainerContract;
use Illuminate\Database\ConnectionResolverInterface as Resolver;

class Migrator {

/**
* The container instance.
*
* @var \Illuminate\Contracts\Container\Container
*/
protected $container;

/**
* The migration repository implementation.
*
Expand Down Expand Up @@ -44,17 +52,20 @@ class Migrator {
* Create a new migrator instance.
*
* @param \Illuminate\Database\Migrations\MigrationRepositoryInterface $repository
* @param \Illuminate\Contracts\Container\Container $container
* @param \Illuminate\Database\ConnectionResolverInterface $resolver
* @param \Illuminate\Filesystem\Filesystem $files
* @return void
*/
public function __construct(MigrationRepositoryInterface $repository,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already indented with tabs.

Resolver $resolver,
Filesystem $files)
ContainerContract $container,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is already aligned with spaces.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

incorrect indentation

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this still needs fixing

Resolver $resolver,
Filesystem $files)
{
$this->files = $files;
$this->resolver = $resolver;
$this->repository = $repository;
$this->container = $container;
$this->resolver = $resolver;
$this->files = $files;
}

/**
Expand Down Expand Up @@ -298,7 +309,7 @@ public function resolve($file)

$class = studly_case($file);

return new $class;
return $this->container->make($class);
}

/**
Expand Down
6 changes: 6 additions & 0 deletions tests/Database/DatabaseMigratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public function testMigrationAreRunUpWhenOutstandingMigrationsExist()
{
$migrator = $this->getMock('Illuminate\Database\Migrations\Migrator', array('resolve'), array(
m::mock('Illuminate\Database\Migrations\MigrationRepositoryInterface'),
m::mock('Illuminate\Container\Container'),
$resolver = m::mock('Illuminate\Database\ConnectionResolverInterface'),
m::mock('Illuminate\Filesystem\Filesystem'),
));
Expand Down Expand Up @@ -48,6 +49,7 @@ public function testUpMigrationCanBePretended()
{
$migrator = $this->getMock('Illuminate\Database\Migrations\Migrator', array('resolve'), array(
m::mock('Illuminate\Database\Migrations\MigrationRepositoryInterface'),
m::mock('Illuminate\Container\Container'),
$resolver = m::mock('Illuminate\Database\ConnectionResolverInterface'),
m::mock('Illuminate\Filesystem\Filesystem'),
));
Expand Down Expand Up @@ -96,6 +98,7 @@ public function testNothingIsDoneWhenNoMigrationsAreOutstanding()
{
$migrator = $this->getMock('Illuminate\Database\Migrations\Migrator', array('resolve'), array(
m::mock('Illuminate\Database\Migrations\MigrationRepositoryInterface'),
m::mock('Illuminate\Container\Container'),
$resolver = m::mock('Illuminate\Database\ConnectionResolverInterface'),
m::mock('Illuminate\Filesystem\Filesystem'),
));
Expand All @@ -115,6 +118,7 @@ public function testLastBatchOfMigrationsCanBeRolledBack()
{
$migrator = $this->getMock('Illuminate\Database\Migrations\Migrator', array('resolve'), array(
m::mock('Illuminate\Database\Migrations\MigrationRepositoryInterface'),
m::mock('Illuminate\Container\Container'),
$resolver = m::mock('Illuminate\Database\ConnectionResolverInterface'),
m::mock('Illuminate\Filesystem\Filesystem'),
));
Expand Down Expand Up @@ -143,6 +147,7 @@ public function testRollbackMigrationsCanBePretended()
{
$migrator = $this->getMock('Illuminate\Database\Migrations\Migrator', array('resolve'), array(
m::mock('Illuminate\Database\Migrations\MigrationRepositoryInterface'),
m::mock('Illuminate\Container\Container'),
$resolver = m::mock('Illuminate\Database\ConnectionResolverInterface'),
m::mock('Illuminate\Filesystem\Filesystem'),
));
Expand Down Expand Up @@ -183,6 +188,7 @@ public function testNothingIsRolledBackWhenNothingInRepository()
{
$migrator = $this->getMock('Illuminate\Database\Migrations\Migrator', array('resolve'), array(
m::mock('Illuminate\Database\Migrations\MigrationRepositoryInterface'),
m::mock('Illuminate\Container\Container'),
$resolver = m::mock('Illuminate\Database\ConnectionResolverInterface'),
m::mock('Illuminate\Filesystem\Filesystem'),
));
Expand Down