FEATURE: prevent running some service providers in artisan
This commit is contained in:
@@ -11,6 +11,7 @@ use App\Handlers\Search\Files;
|
|||||||
use App\Handlers\Search\Presenters\AdminContent as AdminContentPresenter;
|
use App\Handlers\Search\Presenters\AdminContent as AdminContentPresenter;
|
||||||
use App\Handlers\Search\Presenters\AdminFiles;
|
use App\Handlers\Search\Presenters\AdminFiles;
|
||||||
use App\Widgets\HtmlCode\HtmlCode;
|
use App\Widgets\HtmlCode\HtmlCode;
|
||||||
|
use Illuminate\Support\Facades\App;
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
|
||||||
class AppServiceProvider extends ServiceProvider
|
class AppServiceProvider extends ServiceProvider
|
||||||
@@ -22,6 +23,11 @@ class AppServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
public function boot()
|
public function boot()
|
||||||
{
|
{
|
||||||
|
// ignore running from artisan
|
||||||
|
if (App::runningInConsole()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$this->registerWidgets();
|
$this->registerWidgets();
|
||||||
$this->registerTemplates();
|
$this->registerTemplates();
|
||||||
$this->registerSettings();
|
$this->registerSettings();
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
namespace App\Providers;
|
namespace App\Providers;
|
||||||
|
|
||||||
use App\Models\Settings;
|
use App\Models\Settings;
|
||||||
|
use Illuminate\Support\Facades\App;
|
||||||
use Illuminate\Support\Facades\Blade;
|
use Illuminate\Support\Facades\Blade;
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
|
||||||
@@ -15,6 +16,11 @@ class GlobalViewDataProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
public function boot()
|
public function boot()
|
||||||
{
|
{
|
||||||
|
// ignore running from artisan
|
||||||
|
if (App::runningInConsole()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$settings = new Settings();
|
$settings = new Settings();
|
||||||
|
|
||||||
foreach ($settings->getForView() as $key => $value) {
|
foreach ($settings->getForView() as $key => $value) {
|
||||||
|
|||||||
@@ -3,17 +3,22 @@
|
|||||||
namespace App\Providers;
|
namespace App\Providers;
|
||||||
|
|
||||||
use App\Models\Module;
|
use App\Models\Module;
|
||||||
|
use Illuminate\Support\Facades\App;
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
|
||||||
class ModuleManager extends ServiceProvider
|
class ModuleManager extends ServiceProvider
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Bootstrap the application services.
|
* Bootstrap the application services.
|
||||||
*
|
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function boot()
|
public function boot()
|
||||||
{
|
{
|
||||||
|
// ignore running from artisan
|
||||||
|
if (App::runningInConsole()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// this service provider needs published config - config is merged right after this service provider
|
// this service provider needs published config - config is merged right after this service provider
|
||||||
$modules = Module::get();
|
$modules = Module::get();
|
||||||
|
|
||||||
@@ -25,7 +30,6 @@ class ModuleManager extends ServiceProvider
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Register the application services.
|
* Register the application services.
|
||||||
*
|
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function register()
|
public function register()
|
||||||
@@ -34,7 +38,6 @@ class ModuleManager extends ServiceProvider
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Read config file and merge it with module config in database.
|
* Read config file and merge it with module config in database.
|
||||||
*
|
|
||||||
* This method REQUIRES published config of given module (otherwise config(modulename) is not available)!
|
* This method REQUIRES published config of given module (otherwise config(modulename) is not available)!
|
||||||
*
|
*
|
||||||
* @param Module $module
|
* @param Module $module
|
||||||
|
|||||||
Reference in New Issue
Block a user