github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-08 20:07:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Inject app, not container, to avoid global helpers

Browse Source
This commit is contained in:
Franz Liedke 2019-06-12 23:27:56 +02:00
parent 2e8d4e4b6b
commit 6e26b988bd
No known key found for this signature in database
GPG Key ID: 9A0231A879B055F4
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Database/Console/MigrateCommand.php
View File

@ -12,21 +12,21 @@
namespace Flarum\Database\Console; namespace Flarum\Database\Console;
use Flarum\Console\AbstractCommand; use Flarum\Console\AbstractCommand;
use Illuminate\Contracts\Container\Container; use Flarum\Foundation\Application;
class MigrateCommand extends AbstractCommand class MigrateCommand extends AbstractCommand
{ {
/** /**
* @var Container * @var Application
*/ */
protected $container; protected $app;
/** /**
* @param Container $container * @param Application $application
*/ */
public function __construct(Container $container) public function __construct(Application $application)
{ {
$this->container = $container; $this->app = $application;
parent::__construct(); parent::__construct();
} }
@ -55,16 +55,16 @@ class MigrateCommand extends AbstractCommand
public function upgrade() public function upgrade()
{ {
$this->container->bind('Illuminate\Database\Schema\Builder', function ($container) { $this->app->bind('Illuminate\Database\Schema\Builder', function ($app) {
return $container->make('Illuminate\Database\ConnectionInterface')->getSchemaBuilder(); return $app->make('Illuminate\Database\ConnectionInterface')->getSchemaBuilder();
}); });
$migrator = $this->container->make('Flarum\Database\Migrator'); $migrator = $this->app->make('Flarum\Database\Migrator');
$migrator->setOutput($this->output); $migrator->setOutput($this->output);
$migrator->run(__DIR__.'/../../../migrations'); $migrator->run(__DIR__.'/../../../migrations');
$extensions = $this->container->make('Flarum\Extension\ExtensionManager'); $extensions = $this->app->make('Flarum\Extension\ExtensionManager');
$extensions->getMigrator()->setOutput($this->output); $extensions->getMigrator()->setOutput($this->output);
foreach ($extensions->getEnabledExtensions() as $name => $extension) { foreach ($extensions->getEnabledExtensions() as $name => $extension) {
@ -75,13 +75,13 @@ class MigrateCommand extends AbstractCommand
} }
} }
$this->container->make('Flarum\Settings\SettingsRepositoryInterface')->set('version', $this->container->version()); $this->app->make('Flarum\Settings\SettingsRepositoryInterface')->set('version', $this->app->version());
$this->info('Publishing assets...'); $this->info('Publishing assets...');
$this->container->make('files')->copyDirectory( $this->app->make('files')->copyDirectory(
base_path().'/vendor/components/font-awesome/webfonts', $this->app->basePath().'/vendor/components/font-awesome/webfonts',
public_path().'/assets/fonts' $this->app->publicPath().'/assets/fonts'
); );
} }
} }