diff --git a/app/Subscribers/CommandSubscriber.php b/app/Subscribers/CommandSubscriber.php index b73a7b6e8040..accddefe9e53 100644 --- a/app/Subscribers/CommandSubscriber.php +++ b/app/Subscribers/CommandSubscriber.php @@ -11,6 +11,7 @@ namespace CachetHQ\Cachet\Subscribers; +use CachetHQ\Cachet\Settings\Cache; use Carbon\Carbon; use Exception; use Illuminate\Console\Command; @@ -26,7 +27,14 @@ class CommandSubscriber { /** - * The config repository. + * The settings cache instance. + * + * @var \CachetHQ\Cachet\Settings\Cache + */ + protected $cache; + + /** + * The config repository instance. * * @var \Illuminate\Contracts\Config\Repository */ @@ -35,12 +43,14 @@ class CommandSubscriber /** * Create a new command subscriber instance. * + * @param \CachetHQ\Cachet\Settings\Cache $cache * @param \Illuminate\Contracts\Config\Repository $config * * @return void */ - public function __construct(Repository $config) + public function __construct(Cache $cache, Repository $config) { + $this->cache = $cache; $this->config = $config; } @@ -59,14 +69,20 @@ public function subscribe(Dispatcher $events) } /** - * Backup the databases. + * Clear the settings cache, and backup the databases. * * @param \Illuminate\Console\Command $command * * @return void */ - public function backup(Command $command) + public function fire(Command $command) { + $command->line('Clearing settings cache...'); + + $this->cache->clear(); + + $command->line('Settings cache cleared!'); + $command->line('Backing up database...'); try { @@ -84,20 +100,4 @@ public function backup(Command $command) $command->line('Backup completed!'); } - - /** - * Clear the cachet settings cache. - * - * @param \Illuminate\Console\Command $command - * - * @return void - */ - public function clear(Command $command) - { - $command->line('Clearing settings cache...'); - - $this->loader->clear(); - - $command->line('Settings cache cleared!'); - } }