mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-01 06:00:24 +02:00
Code Issues Releases Wiki Activity

Split up Site into several classes

Browse Source 
Depending on the state of the Flarum installation (installed, not
installed, currently upgrading, maintenance mode), we should enable
different sets of service providers.

For example, during installation we should not resolve a setting
repository from the container. This new architecture lets us do so,
but we can easily (and cleanly) register a different implementation
during installation.

This should prevent problems such as #1370 in the future.
This commit is contained in:
Franz Liedke
2018-04-16 01:31:00 +02:00
parent 7a6e208554
commit 5b821b21b1
10 changed files with 683 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/Console/Server.php
View File

@@ -12,74 +12,37 @@
namespace Flarum\Console;
use Flarum\Console\Event\Configuring;
use Flarum\Database\Console\GenerateMigrationCommand;
use Flarum\Database\Console\MigrateCommand;
use Flarum\Database\Console\ResetCommand;
use Flarum\Foundation\Application;
use Flarum\Foundation\Console\CacheClearCommand;
use Flarum\Foundation\Console\InfoCommand;
use Flarum\Foundation\Site;
use Flarum\Install\Console\InstallCommand;
use Flarum\Install\InstallServiceProvider;
use Illuminate\Contracts\Events\Dispatcher;
use Symfony\Component\Console\Application as ConsoleApplication;
class Server
{
/**
* @param Site $site
* @return Server
*/
public static function fromSite(Site $site)
{
return new static($site->boot());
}
protected $commands;
public function __construct(Application $app)
public function __construct(array $commands)
{
$this->app = $app;
$this->commands = $commands;
}
public function listen()
{
$console = $this->getConsoleApplication();
$console = new ConsoleApplication('Flarum', Application::VERSION);
foreach ($this->commands as $command) {
$console->add($command);
}
$this->extend($console);
exit($console->run());
}
/**
* @return ConsoleApplication
*/
protected function getConsoleApplication()
private function extend(ConsoleApplication $console)
{
$console = new ConsoleApplication('Flarum', $this->app->version());
$app = Application::getInstance();
$this->app->register(InstallServiceProvider::class);
$commands = [
InstallCommand::class,
MigrateCommand::class,
ResetCommand::class,
GenerateMigrationCommand::class,
];
if ($this->app->isInstalled()) {
$commands = array_merge($commands, [
InfoCommand::class,
CacheClearCommand::class
]);
}
foreach ($commands as $command) {
$console->add($this->app->make(
$command,
['config' => $this->app->isInstalled() ? $this->app->make('flarum.config') : []]
));
}
$events = $this->app->make(Dispatcher::class);
$events->fire(new Configuring($this->app, $console));
return $console;
$events = $app->make(Dispatcher::class);
$events->fire(new Configuring($app, $console));
}
}