Skip to content

Commit

Permalink
[5.0] Illuminate\Foundation\Artisan is no longer needed in after the …
Browse files Browse the repository at this point in the history
…HTTP Kernel refactors.

Signed-off-by: crynobone <[email protected]>
  • Loading branch information
crynobone committed Oct 25, 2014
1 parent 10c4057 commit bc5b04c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 63 deletions.
60 changes: 0 additions & 60 deletions src/Illuminate/Foundation/Artisan.php

This file was deleted.

2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/Console/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function handle($input, $output = null)
{
$this->app->bootstrapWith($this->bootstrappers);

return (new Artisan($this->app, $this->events))
return $this->app->make('artisan')
->resolveCommands($this->commands)
->run($input, $output);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php namespace Illuminate\Foundation\Providers;

use Illuminate\Foundation\Artisan;
use Illuminate\Console\Application;
use Illuminate\Support\ServiceProvider;
use Illuminate\Foundation\Console\UpCommand;
use Illuminate\Foundation\Console\DownCommand;
Expand Down Expand Up @@ -68,7 +68,7 @@ public function register()
// entire Artisan command line then pass the method into the main app.
$this->app->bindShared('artisan', function($app)
{
return new Artisan($app);
return new Application($app, $app['events']);
});

foreach (array_keys($this->commands) as $command)
Expand Down
2 changes: 2 additions & 0 deletions tests/Console/ConsoleApplicationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ protected function getMockConsole(array $methods)
$app = m::mock('Illuminate\Contracts\Foundation\Application', ['version' => '5.0']);
$events = m::mock('Illuminate\Contracts\Events\Dispatcher', ['fire' => null]);

$app->shouldReceive('loadDeferredProviders')->once();

$console = $this->getMock('Illuminate\Console\Application', $methods, [
$app, $events
]);
Expand Down

0 comments on commit bc5b04c

Please sign in to comment.