Skip to content

DI via constructor for Migration classes #4259

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 7 commits into from
Closed

DI via constructor for Migration classes #4259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8d2343e
PSR-2 formatting of function interface
hannesvdvreken Apr 28, 2014
95f715c
DI via constructor for Migration classes
hannesvdvreken Apr 28, 2014
456bd19
Docblock consistency
hannesvdvreken Apr 28, 2014
d689a6a
Fixed tests
hannesvdvreken Apr 28, 2014
ec4ceb4
Suggested change application to container
hannesvdvreken Apr 28, 2014
1d80e95
Fixed docblock spacing
hannesvdvreken Apr 28, 2014
b440bdd
I'm advised not to use PSR-2 guidelines
hannesvdvreken Apr 28, 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 @@ -66,7 +66,7 @@ protected function registerMigrator()
{
$repository = $app['migration.repository'];

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

Expand Down
19 changes: 15 additions & 4 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\Database\ConnectionResolverInterface as Resolver;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Container\Container;

class Migrator {

/**
* The application container.
*
* @var \Illuminate\Container\Container
*/
protected $app;

/**
* The migration repository implementation.
*
Expand Down Expand Up @@ -43,15 +51,18 @@ class Migrator {
/**
* Create a new migrator instance.
*
* @param \Illuminate\Container\Container $app
* @param \Illuminate\Database\Migrations\MigrationRepositoryInterface $repository
* @param \Illuminate\Database\ConnectionResolverInterface $resolver
* @param \Illuminate\Filesystem\Filesystem $files
* @return void
*/
public function __construct(MigrationRepositoryInterface $repository,
public function __construct(Container $app,
MigrationRepositoryInterface $repository,
Resolver $resolver,
Filesystem $files)
Filesystem $files)
{
$this->app = $app;
$this->files = $files;
$this->resolver = $resolver;
$this->repository = $repository;
Expand Down Expand Up @@ -294,7 +305,7 @@ public function resolve($file)

$class = studly_case($file);

return new $class;
return $this->app->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 @@ -13,6 +13,7 @@ public function tearDown()
public function testMigrationAreRunUpWhenOutstandingMigrationsExist()
{
$migrator = $this->getMock('Illuminate\Database\Migrations\Migrator', array('resolve'), array(
m::mock('Illuminate\Container\Container'),
m::mock('Illuminate\Database\Migrations\MigrationRepositoryInterface'),
$resolver = m::mock('Illuminate\Database\ConnectionResolverInterface'),
m::mock('Illuminate\Filesystem\Filesystem'),
Expand Down Expand Up @@ -47,6 +48,7 @@ public function testMigrationAreRunUpWhenOutstandingMigrationsExist()
public function testUpMigrationCanBePretended()
{
$migrator = $this->getMock('Illuminate\Database\Migrations\Migrator', array('resolve'), array(
m::mock('Illuminate\Container\Container'),
m::mock('Illuminate\Database\Migrations\MigrationRepositoryInterface'),
$resolver = m::mock('Illuminate\Database\ConnectionResolverInterface'),
m::mock('Illuminate\Filesystem\Filesystem'),
Expand Down Expand Up @@ -95,6 +97,7 @@ function($closure)
public function testNothingIsDoneWhenNoMigrationsAreOutstanding()
{
$migrator = $this->getMock('Illuminate\Database\Migrations\Migrator', array('resolve'), array(
m::mock('Illuminate\Container\Container'),
m::mock('Illuminate\Database\Migrations\MigrationRepositoryInterface'),
$resolver = m::mock('Illuminate\Database\ConnectionResolverInterface'),
m::mock('Illuminate\Filesystem\Filesystem'),
Expand All @@ -114,6 +117,7 @@ public function testNothingIsDoneWhenNoMigrationsAreOutstanding()
public function testLastBatchOfMigrationsCanBeRolledBack()
{
$migrator = $this->getMock('Illuminate\Database\Migrations\Migrator', array('resolve'), array(
m::mock('Illuminate\Container\Container'),
m::mock('Illuminate\Database\Migrations\MigrationRepositoryInterface'),
$resolver = m::mock('Illuminate\Database\ConnectionResolverInterface'),
m::mock('Illuminate\Filesystem\Filesystem'),
Expand Down Expand Up @@ -142,6 +146,7 @@ public function testLastBatchOfMigrationsCanBeRolledBack()
public function testRollbackMigrationsCanBePretended()
{
$migrator = $this->getMock('Illuminate\Database\Migrations\Migrator', array('resolve'), array(
m::mock('Illuminate\Container\Container'),
m::mock('Illuminate\Database\Migrations\MigrationRepositoryInterface'),
$resolver = m::mock('Illuminate\Database\ConnectionResolverInterface'),
m::mock('Illuminate\Filesystem\Filesystem'),
Expand Down Expand Up @@ -182,6 +187,7 @@ function($closure)
public function testNothingIsRolledBackWhenNothingInRepository()
{
$migrator = $this->getMock('Illuminate\Database\Migrations\Migrator', array('resolve'), array(
m::mock('Illuminate\Container\Container'),
m::mock('Illuminate\Database\Migrations\MigrationRepositoryInterface'),
$resolver = m::mock('Illuminate\Database\ConnectionResolverInterface'),
m::mock('Illuminate\Filesystem\Filesystem'),
Expand Down