From a4eff64560fb30c522e30d3c6a3ea68d5f956566 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 2 Aug 2019 00:42:37 +0300 Subject: [PATCH] Flextype Core and Plugins: Doctrine Coding Standard #200 #186 - next round of code improvements --- site/plugins/admin/bootstrap.php | 8 ++++-- site/plugins/admin/dependencies.php | 28 +++++++++---------- site/plugins/admin/routes/web.php | 8 +++--- .../twig/GlobalVarsAdminTwigExtension.php | 13 +++++---- 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/site/plugins/admin/bootstrap.php b/site/plugins/admin/bootstrap.php index 077be02b..0081c731 100755 --- a/site/plugins/admin/bootstrap.php +++ b/site/plugins/admin/bootstrap.php @@ -1,10 +1,10 @@ * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE @@ -13,6 +13,8 @@ namespace Flextype; +use function is_file; + /** * Set base admin route */ @@ -21,7 +23,7 @@ $admin_route = $flextype->registry->get('plugins.admin.route'); /** * Ensure vendor libraries exist */ -!is_file($admin_autoload = __DIR__ . '/vendor/autoload.php') and exit("Please run: composer install"); +! is_file($admin_autoload = __DIR__ . '/vendor/autoload.php') and exit('Please run: composer install'); /** * Register The Auto Loader diff --git a/site/plugins/admin/dependencies.php b/site/plugins/admin/dependencies.php index 33bc52d9..9725ed30 100644 --- a/site/plugins/admin/dependencies.php +++ b/site/plugins/admin/dependencies.php @@ -1,9 +1,8 @@ * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE @@ -12,7 +11,6 @@ namespace Flextype; -use Flextype\Component\Arr\Arr; use Flextype\Component\I18n\I18n; use function Flextype\Component\I18n\__; @@ -31,46 +29,46 @@ $flextype->registry->set('admin_navigation.settings.settings', ['title' => 'view->addExtension(new GlobalVarsAdminTwigExtension($flextype)); -$flextype['DashboardController'] = function ($container) { +$flextype['DashboardController'] = static function ($container) { return new DashboardController($container); }; -$flextype['SettingsController'] = function ($container) { +$flextype['SettingsController'] = static function ($container) { return new SettingsController($container); }; -$flextype['InformationController'] = function ($container) { +$flextype['InformationController'] = static function ($container) { return new InformationController($container); }; -$flextype['PluginsController'] = function ($container) { +$flextype['PluginsController'] = static function ($container) { return new PluginsController($container); }; -$flextype['EntriesController'] = function ($container) { +$flextype['EntriesController'] = static function ($container) { return new EntriesController($container); }; -$flextype['FieldsetsController'] = function ($container) { +$flextype['FieldsetsController'] = static function ($container) { return new FieldsetsController($container); }; -$flextype['SnippetsController'] = function ($container) { +$flextype['SnippetsController'] = static function ($container) { return new SnippetsController($container); }; -$flextype['ThemesController'] = function ($container) { +$flextype['ThemesController'] = static function ($container) { return new ThemesController($container); }; -$flextype['TemplatesController'] = function ($container) { +$flextype['TemplatesController'] = static function ($container) { return new TemplatesController($container); }; -$flextype['UsersController'] = function ($container) { +$flextype['UsersController'] = static function ($container) { return new UsersController($container); }; -$flextype['ToolsController'] = function ($container) { +$flextype['ToolsController'] = static function ($container) { return new ToolsController($container); }; diff --git a/site/plugins/admin/routes/web.php b/site/plugins/admin/routes/web.php index b2ac4e7c..9a0803f0 100644 --- a/site/plugins/admin/routes/web.php +++ b/site/plugins/admin/routes/web.php @@ -1,17 +1,18 @@ group('/' . $admin_route, function () use ($flextype, $app) { +$app->group('/' . $admin_route, static function () use ($app) : void { $app->get('/installation', 'UsersController:installation')->setName('admin.users.installation'); $app->post('/installation', 'UsersController:installationProcess')->setName('admin.users.installationProcess'); $app->get('/login', 'UsersController:login')->setName('admin.users.login'); $app->post('/login', 'UsersController:loginProcess')->setName('admin.users.loginProcess'); }); -$app->group('/' . $admin_route, function () use ($flextype, $app) { - +$app->group('/' . $admin_route, static function () use ($app) : void { // Dashboard $app->get('', 'DashboardController:index')->setName('admin.dashboard.index'); @@ -88,5 +89,4 @@ $app->group('/' . $admin_route, function () use ($flextype, $app) { $app->get('/tools/cache', 'ToolsController:cache')->setName('admin.tools.cache'); $app->post('/tools/cache', 'ToolsController:clearCacheProcess')->setName('admin.tools.clearCacheProcess'); $app->post('/tools/cache-all', 'ToolsController:clearCacheAllProcess')->setName('admin.tools.clearCacheAllProcess'); - })->add(new AuthMiddleware($flextype)); diff --git a/site/plugins/admin/twig/GlobalVarsAdminTwigExtension.php b/site/plugins/admin/twig/GlobalVarsAdminTwigExtension.php index 47ffddb4..b44bfd6d 100644 --- a/site/plugins/admin/twig/GlobalVarsAdminTwigExtension.php +++ b/site/plugins/admin/twig/GlobalVarsAdminTwigExtension.php @@ -1,9 +1,8 @@ * @link http://romanenko.digital * * For the full copyright and license information, please view the LICENSE @@ -13,8 +12,10 @@ namespace Flextype; use Flextype\Component\Session\Session; +use Twig_Extension; +use Twig_Extension_GlobalsInterface; -class GlobalVarsAdminTwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsInterface +class GlobalVarsAdminTwigExtension extends Twig_Extension implements Twig_Extension_GlobalsInterface { /** * Flextype Dependency Container @@ -35,9 +36,9 @@ class GlobalVarsAdminTwigExtension extends \Twig_Extension implements \Twig_Exte public function getGlobals() { return [ - 'is_logged' => ((Session::exists('role') && Session::get('role') == 'admin') ? true : false), + 'is_logged' => (Session::exists('role') && Session::get('role') === 'admin'), 'username' => Session::exists('username') ? Session::get('username') : '', - 'rolename' => Session::exists('role') ? Session::get('role') : '' + 'rolename' => Session::exists('role') ? Session::get('role') : '', ]; } }