mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Use local app instance rather than facade

Browse Source
This commit is contained in:
Luke Towers 2022-11-21 15:40:39 -06:00
parent 5be4454c44
commit f2447bb136
2 changed files with 46 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
modules/cms/ServiceProvider.php
View File

@ -1,30 +1,28 @@
<?php namespace Cms;
use App;
use Url;
use Lang;
use File;
use Event;
use Config;
use Backend;
use BackendMenu;
use BackendAuth;
use Cms\Models\ThemeLog;
use Cms\Models\ThemeData;
use Cms\Classes\CmsObject;
use Backend\Models\UserRole;
use Cms\Classes\Page as CmsPage;
use Cms\Classes\ComponentManager;
use System\Classes\CombineAssets;
use Cms\Classes\Theme as CmsTheme;
use Backend\Classes\WidgetManager;
use Backend\Models\UserRole;
use BackendAuth;
use BackendMenu;
use Cms\Classes\CmsObject;
use Cms\Classes\ComponentManager;
use Cms\Classes\Page as CmsPage;
use Cms\Classes\Theme;
use Cms\Models\ThemeData;
use Cms\Models\ThemeLog;
use Cms\Twig\DebugExtension;
use Cms\Twig\Extension as CmsTwigExtension;
use Cms\Twig\Loader as CmsTwigLoader;
use Config;
use Event;
use File;
use Lang;
use System\Classes\CombineAssets;
use System\Classes\MarkupManager;
use System\Classes\SettingsManager;
use Twig\Cache\FilesystemCache as TwigCacheFilesystem;
use Cms\Twig\Loader as CmsTwigLoader;
use Cms\Twig\DebugExtension;
use Cms\Twig\Extension as CmsTwigExtension;
use Url;
use Winter\Storm\Support\ModuleServiceProvider;
class ServiceProvider extends ModuleServiceProvider
@ -97,7 +95,7 @@ class ServiceProvider extends ModuleServiceProvider
protected function registerTwigParser()
{
// Register CMS Twig environment
App::bind('twig.environment.cms', function ($app) {
$this->app->bind('twig.environment.cms', function ($app) {
// Load Twig options
$useCache = !Config::get('cms.twigNoCache');
$isDebugMode = Config::get('app.debug', false);
@ -166,7 +164,7 @@ class ServiceProvider extends ModuleServiceProvider
*/
protected function registerCombinerEvents()
{
if (App::runningInBackend() || App::runningInConsole()) {
if ($this->app->runningInBackend() || $this->app->runningInConsole()) {
return;
}
@ -389,7 +387,7 @@ class ServiceProvider extends ModuleServiceProvider
*/
protected function bootBackendLocalization()
{
$theme = CmsTheme::getActiveTheme();
$theme = Theme::getActiveTheme();
if (is_null($theme)) {
return;

53
modules/system/ServiceProvider.php
View File

@ -1,33 +1,30 @@
<?php namespace System;
use Db;
use App;
use View;
use Event;
use Config;
use Backend;
use Request;
use Validator;
use BackendMenu;
use BackendAuth;
use SystemException;
use Backend\Classes\WidgetManager;
use Backend\Models\UserRole;
use System\Classes\MailManager;
use BackendAuth;
use BackendMenu;
use Config;
use Event;
use Illuminate\Pagination\Paginator;
use Illuminate\Support\Facades\Schema;
use Request;
use System\Classes\CombineAssets;
use System\Classes\ErrorHandler;
use System\Classes\MailManager;
use System\Classes\MarkupManager;
use System\Classes\PluginManager;
use System\Classes\SettingsManager;
use System\Classes\UpdateManager;
use System\Twig\Engine as TwigEngine;
use System\Models\EventLog;
use System\Models\MailSetting;
use System\Classes\CombineAssets;
use Backend\Classes\WidgetManager;
use Winter\Storm\Support\ModuleServiceProvider;
use System\Twig\Engine as TwigEngine;
use SystemException;
use Validator;
use View;
use Winter\Storm\Router\Helper as RouterHelper;
use Illuminate\Pagination\Paginator;
use Illuminate\Support\Facades\Schema;
use System\Classes\MixAssets;
use Winter\Storm\Support\ModuleServiceProvider;
class ServiceProvider extends ModuleServiceProvider
{
@ -116,19 +113,19 @@ class ServiceProvider extends ModuleServiceProvider
*/
protected function registerSingletons()
{
App::singleton('cms.helper', function () {
$this->app->singleton('cms.helper', function () {
return new \Cms\Helpers\Cms;
});
App::singleton('backend.helper', function () {
$this->app->singleton('backend.helper', function () {
return new \Backend\Helpers\Backend;
});
App::singleton('backend.menu', function () {
$this->app->singleton('backend.menu', function () {
return \Backend\Classes\NavigationManager::instance();
});
App::singleton('backend.auth', function () {
$this->app->singleton('backend.auth', function () {
return \Backend\Classes\AuthManager::instance();
});
}
@ -159,7 +156,7 @@ class ServiceProvider extends ModuleServiceProvider
/*
* CLI
*/
if (App::runningInConsole() && count(array_intersect($commands, Request::server('argv', []))) > 0) {
if ($this->app->runningInConsole() && count(array_intersect($commands, Request::server('argv', []))) > 0) {
PluginManager::$noInit = true;
}
}
@ -223,7 +220,7 @@ class ServiceProvider extends ModuleServiceProvider
*/
Event::listen('console.schedule', function ($schedule) {
// Fix initial system migration with plugins that use settings for scheduling - see #3208
if (App::hasDatabase() && !Schema::hasTable(UpdateManager::instance()->getMigrationTableName())) {
if ($this->app->hasDatabase() && !Schema::hasTable(UpdateManager::instance()->getMigrationTableName())) {
return;
}
@ -309,20 +306,20 @@ class ServiceProvider extends ModuleServiceProvider
protected function registerTwigParser()
{
// Register System Twig environment
App::singleton('twig.environment', function ($app) {
$this->app->singleton('twig.environment', function ($app) {
return MarkupManager::makeBaseTwigEnvironment();
});
// Register Mailer Twig environment
App::singleton('twig.environment.mailer', function ($app) {
$this->app->singleton('twig.environment.mailer', function ($app) {
$twig = MarkupManager::makeBaseTwigEnvironment();
$twig->addTokenParser(new \System\Twig\MailPartialTokenParser);
return $twig;
});
// Register .htm extension for Twig views
App::make('view')->addExtension('htm', 'twig', function () {
return new TwigEngine(App::make('twig.environment'));
$this->app->make('view')->addExtension('htm', 'twig', function () {
return new TwigEngine($this->app->make('twig.environment'));
});
}