dmstr / phd5-app

src/views/layouts/_navbar.php

Spacing +27 added lines, -27 removed lines

@@ -6,8 +6,8 @@ 
 use yii\bootstrap\NavBar;
 
 // initialize local variables
-$menuItems = [];
-$languageItems = [];
+$menuItems = [ ];
+$languageItems = [ ];
 
 // create label for dev and test environment
 switch (YII_ENV) {
@@ -21,22 +21,22 @@ 
 $debugLabel = YII_DEBUG ? "<span class='label label-danger'>DEBUG</span>" : '';
 
 // add env & debug label to menu
-$menuItems[] = [
+$menuItems[ ] = [
     'label' => $envLabel.' '.$debugLabel,
 ];
 
 // prepare languages
 foreach (\Yii::$app->urlManager->languages as $language) {
-    $languageItems[] = [
-        'url' => ['/', \Yii::$app->urlManager->languageParam => $language],
+    $languageItems[ ] = [
+        'url' => [ '/', \Yii::$app->urlManager->languageParam => $language ],
         'label' => $language,
     ];
 }
 
 // add language items to menu
-$menuItems[] = [
+$menuItems[ ] = [
     'label' => '<i class="glyphicon glyphicon-globe"></i> '.\Yii::$app->language,
-    'options' => ['id' => 'link-languages-menu'],
+    'options' => [ 'id' => 'link-languages-menu' ],
     'items' => $languageItems,
 ];
 
@@ -45,30 +45,30 @@ 
     if (\Yii::$app->user->isGuest) {
         // unauthorized users
         //$menuItems[] = ['label' => 'Signup', 'url' => ['/user/registration/register']];
-        $menuItems[] = [
+        $menuItems[ ] = [
             'label' => 'Login',
-            'url' => ['/user/security/login'],
-            'linkOptions' => ['id' => 'link-login'],
+            'url' => [ '/user/security/login' ],
+            'linkOptions' => [ 'id' => 'link-login' ],
         ];
     } else {
         // logged in users
-        $menuItems[] = [
+        $menuItems[ ] = [
             'label' => '<i class="glyphicon glyphicon-user"></i> '.\Yii::$app->user->identity->username,
-            'options' => ['id' => 'link-user-menu'],
+            'options' => [ 'id' => 'link-user-menu' ],
             'items' => [
                 [
                     'label' => '<i class="glyphicon glyphicon-user"></i> Profile',
-                    'url' => ['/user/profile/show', 'id' => \Yii::$app->user->id],
+                    'url' => [ '/user/profile/show', 'id' => \Yii::$app->user->id ],
                 ],
                 [
                     'label' => '<i class="glyphicon glyphicon-cog"></i> Settings',
-                    'url' => ['/user/settings/profile'],
+                    'url' => [ '/user/settings/profile' ],
                 ],
                 '<li class="divider"></li>',
                 [
                     'label' => '<i class="glyphicon glyphicon-log-out"></i> Logout',
-                    'url' => ['/user/security/logout'],
-                    'linkOptions' => ['data-method' => 'post', 'id' => 'link-logout'],
+                    'url' => [ '/user/security/logout' ],
+                    'linkOptions' => [ 'data-method' => 'post', 'id' => 'link-logout' ],
                 ],
             ],
         ];
@@ -78,19 +78,19 @@ 
             'key' => 'frontend.extra.menuItems',
             'renderEmpty' => false,
         ]);
-        $menuItems[] = '<li class="nav-extra">'.$extraButtons.'</li>';
+        $menuItems[ ] = '<li class="nav-extra">'.$extraButtons.'</li>';
 
         // context menu
-        $menuItems[] = [
-            'options' => ['class' => 'nav-backend'],
+        $menuItems[ ] = [
+            'options' => [ 'class' => 'nav-backend' ],
             'label' => '<i class="glyphicon glyphicon-pencil"></i>',
-            'visible' => \Yii::$app->user->can('backend_default_index', ['route' => true]),
-            'items' => \Yii::$app->params['context.menuItems'],
+            'visible' => \Yii::$app->user->can('backend_default_index', [ 'route' => true ]),
+            'items' => \Yii::$app->params[ 'context.menuItems' ],
         ];
 
         $backendMenu = \dmstr\widgets\Menu::widget(
             [
-                'options' => ['class' => 'dropdown-menu'],
+                'options' => [ 'class' => 'dropdown-menu' ],
                 'encodeLabels' => false,
                 'items' => \dmstr\modules\pages\models\Tree::getMenuItems(
                     'backend',
@@ -99,10 +99,10 @@ 
                 ),
             ]
         );
-        $menuItems[] = [
+        $menuItems[ ] = [
             'label' => '<i class="glyphicon glyphicon-dashboard"></i>',
-            'url' => ['/backend'],
-            'visible' => \Yii::$app->user->can('backend_default_index', ['route' => true]),
+            'url' => [ '/backend' ],
+            'visible' => \Yii::$app->user->can('backend_default_index', [ 'route' => true ]),
             'items' => $backendMenu,
         ];
     }
@@ -122,7 +122,7 @@ 
 // render root pages
 echo Nav::widget(
     [
-        'options' => ['class' => 'navbar-nav'],
+        'options' => [ 'class' => 'navbar-nav' ],
         'encodeLabels' => false,
         'items' => \dmstr\modules\pages\models\Tree::getMenuItems('root'),
     ]
@@ -131,7 +131,7 @@ 
 // render additional menu items (languages, user)
 echo Nav::widget(
     [
-        'options' => ['class' => 'navbar-nav navbar-right'],
+        'options' => [ 'class' => 'navbar-nav navbar-right' ],
         'encodeLabels' => false,
         'items' => $menuItems,
     ]

src/config/common.php

Spacing +22 added lines, -23 removed lines

@@ -13,13 +13,13 @@ 
 $languages = explode(',', getenv('APP_LANGUAGES'));
 
 // prepare asset bundle config
-$bundles = [];
+$bundles = [ ];
 if (getenv('APP_ASSET_USE_BUNDLED')) {
     $bundles = include Yii::getAlias('@web/bundles').'/config.php';
 }
 if (getenv('APP_ASSET_DISABLE_BOOTSTRAP_BUNDLE')) {
-    $bundles['yii\bootstrap\BootstrapAsset'] = [
-        'css' => [],
+    $bundles[ 'yii\bootstrap\BootstrapAsset' ] = [
+        'css' => [ ],
     ];
 }
 
@@ -41,7 +41,7 @@ 
 return [
     'id' => 'app',
     'name' => getenv('APP_TITLE'),
-    'language' => $languages[0],
+    'language' => $languages[ 0 ],
     'basePath' => realpath(__DIR__.'/..'),
     'vendorPath' => '@app/../vendor',
     'runtimePath' => '@app/../runtime',
@@ -55,7 +55,7 @@ 
     ],
     'params' => [
         'adminEmail' => getenv('APP_ADMIN_EMAIL'),
-        'context.menuItems' => [],
+        'context.menuItems' => [ ],
         'yii.migrations' => [
             getenv('APP_MIGRATION_LOOKUP'),
             '@yii/rbac/migrations',
@@ -73,8 +73,7 @@ 
             'dirMode' => 0775,
             // Hashing for distributed systems
             'hashCallback' => YII_ENV_DEV ?
-                null :
-                function ($path) {
+                null : function($path) {
                     return YII_ENV.'-'.substr(hash('sha256', $path), 0, 8).'-'.APP_VERSION.'-'.\Yii::$app->cache->get('prototype.less.changed_at');
                 },
             // Note: You need to bundle asset with `yii asset` for development/debugging
@@ -83,7 +82,7 @@ 
         ],
         'authManager' => [
             'class' => 'dektrium\rbac\components\DbManager',
-            'defaultRoles' => ['Default'],
+            'defaultRoles' => [ 'Default' ],
         ],
         'cache' => [
             'class' => 'yii\redis\Cache',
@@ -127,8 +126,8 @@ 
                 [
                     'class' => 'codemix\streamlog\Target',
                     'url' => 'php://stderr',
-                    'levels' => ['error', 'warning'],
-                    'logVars' => [],
+                    'levels' => [ 'error', 'warning' ],
+                    'logVars' => [ ],
                     'replaceNewline' => ''
                 ],
             ],
@@ -158,9 +157,9 @@ 
         'user' => [
             'class' => 'dmstr\web\User',
             'enableAutoLogin' => true,
-            'loginUrl' => ['/user/security/login'],
+            'loginUrl' => [ '/user/security/login' ],
             'identityClass' => 'dektrium\user\models\User',
-            'rootUsers' => ['admin'],
+            'rootUsers' => [ 'admin' ],
         ],
         'urlManager' => [
             'class' => 'codemix\localeurls\UrlManager',
@@ -168,7 +167,7 @@ 
             'showScriptName' => false,
             'enableDefaultLanguageUrlCode' => true,
             'baseUrl' => '/',
-            'rules' => [],
+            'rules' => [ ],
             'ignoreLanguageUrlPatterns' => [
                 // route pattern => url pattern
                 '#^filefly/api#' => '#^filefly/api#',
@@ -185,10 +184,10 @@ 
                         'auto_reload' => true,
                     ],
                     'globals' => [
-                        'html' => ['class'=>'\yii\helpers\Html'],
-                        'Tree' => ['class'=>'\dmstr\modules\pages\models\Tree'],
-                        'FA' => ['class'=>'\rmrevin\yii\fontawesome\FA'],
-                        'Url' => ['class'=>'\hrzg\filemanager\helpers\Url'],
+                        'html' => [ 'class'=>'\yii\helpers\Html' ],
+                        'Tree' => [ 'class'=>'\dmstr\modules\pages\models\Tree' ],
+                        'FA' => [ 'class'=>'\rmrevin\yii\fontawesome\FA' ],
+                        'Url' => [ 'class'=>'\hrzg\filemanager\helpers\Url' ],
                     ],
                     'uses' => [
                         'yii\bootstrap',
@@ -209,15 +208,15 @@ 
                 'audit/trail',
                 'audit/javascript', # enable app.assets.registerJSLoggingAsset via settings
                 // These provide special functionality and get loaded to activate it
-                'audit/error',      // Links the extra error reporting functions (`exception()` and `errorMessage()`)
-                'audit/extra',      // Links the data functions (`data()`)
-                'audit/curl',       // Links the curl tracking function (`curlBegin()`, `curlEnd()` and `curlExec()`)
+                'audit/error', // Links the extra error reporting functions (`exception()` and `errorMessage()`)
+                'audit/extra', // Links the data functions (`data()`)
+                'audit/curl', // Links the curl tracking function (`curlBegin()`, `curlEnd()` and `curlExec()`)
                 //'audit/db',
                 //'audit/log',
                 //'audit/profiling',
             ],
             'ignoreActions' => [
-                (getenv('APP_AUDIT_DISABLE_ALL_ACTIONS') ? '*':'_'),
+                (getenv('APP_AUDIT_DISABLE_ALL_ACTIONS') ? '*' : '_'),
                 'app/*',
                 'audit/*',
                 'help/*',
@@ -268,8 +267,8 @@ 
             'class' => 'lajax\translatemanager\Module',
             'root' => '@app/views',
             'layout' => '@backend/views/layouts/box',
-            'allowedIPs' => ['*'],
-            'roles' => ['translate-module'],
+            'allowedIPs' => [ '*' ],
+            'roles' => [ 'translate-module' ],
         ],
         'user' => [
             'class' => 'dektrium\user\Module',

src/views/layouts/main.php

Spacing +7 added lines, -7 removed lines

@@ -52,14 +52,14 @@ 
 // SEO
 $route = Url::toRoute(Yii::$app->controller->action->uniqueId);
 if ($keywords = \Yii::$app->settings->get($route, 'app.seo.keywords', null)) {
-    $this->registerMetaTag(['name' => 'keywords', 'content' => $keywords]);
+    $this->registerMetaTag([ 'name' => 'keywords', 'content' => $keywords ]);
 }
 if ($description = \Yii::$app->settings->get($route, 'app.seo.descriptions', null)) {
-    $this->registerMetaTag(['name' => 'description', 'content' => $description]);
+    $this->registerMetaTag([ 'name' => 'description', 'content' => $description ]);
 }
 
 if ($favicon = \Yii::$app->settings->get('faviconPng', 'app.assets', null)) {
-    $this->registerLinkTag(['rel' => 'shortcut icon', 'type'=>'image/png', 'href' => $favicon]);
+    $this->registerLinkTag([ 'rel' => 'shortcut icon', 'type'=>'image/png', 'href' => $favicon ]);
 }
 
 ?>
@@ -80,12 +80,12 @@ 
 
 <?php $this->beginBody() ?>
 
-<?= TwigWidget::widget(['key' => '_top', 'renderEmpty'=>false]) ?>
+<?= TwigWidget::widget([ 'key' => '_top', 'renderEmpty'=>false ]) ?>
 
 <!-- Navbar -->
 <?php
 if (Yii::$app->settings->get('enableTwigNavbar', 'app.layout', false)) {
-    echo \dmstr\modules\prototype\widgets\TwigWidget::widget(['key' => '_navbar']);
+    echo \dmstr\modules\prototype\widgets\TwigWidget::widget([ 'key' => '_navbar' ]);
 } else {
     echo $this->render('_navbar');
 }
@@ -109,7 +109,7 @@ 
 
 <!-- Footer -->
 <footer class="footer">
-    <?= Cell::widget(['id' => '_footer', 'requestParam' => '_global']) ?>
+    <?= Cell::widget([ 'id' => '_footer', 'requestParam' => '_global' ]) ?>
 </footer>
 
 <!-- Info Modal -->
@@ -118,7 +118,7 @@ 
     <?= Html::a(
         '<i class="fa fa-heartbeat"></i>',
         '#',
-        ['class' => 'text-muted', 'data-toggle' => 'modal', 'data-target' => '#infoModal']
+        [ 'class' => 'text-muted', 'data-toggle' => 'modal', 'data-target' => '#infoModal' ]
     ) ?>
     </p>
 </div>

src/commands/AppController.php

Spacing +11 added lines, -11 removed lines

@@ -27,14 +27,14 @@ 
     public function actionConfig($key = null)
     {
         // get config from global variable (TODO)
-        $data = $GLOBALS['config'];
+        $data = $GLOBALS[ 'config' ];
         if ($key) {
             $keys = explode('.', $key);
-            if (isset($keys[0])) {
-                $data = $GLOBALS['config'][$keys[0]];
+            if (isset($keys[ 0 ])) {
+                $data = $GLOBALS[ 'config' ][ $keys[ 0 ] ];
             }
-            if (isset($keys[1])) {
-                $data = $GLOBALS['config'][$keys[0]][$keys[1]];
+            if (isset($keys[ 1 ])) {
+                $data = $GLOBALS[ 'config' ][ $keys[ 0 ] ][ $keys[ 1 ] ];
             }
         }
         $this->stdout(VarDumper::dumpAsString($data));
@@ -76,7 +76,7 @@ 
         $this->stdout("\nDatabase\n");
         $this->stdout("--------\n");
         $this->run('db/create');
-        $this->run('migrate/up', ['interactive' => (bool) getenv('APP_INTERACTIVE')]);
+        $this->run('migrate/up', [ 'interactive' => (bool) getenv('APP_INTERACTIVE') ]);
 
         $this->stdout("\nUser\n");
         $this->stdout("----\n");
@@ -86,7 +86,7 @@ 
                 'default' => getenv('APP_ADMIN_PASSWORD') ?: \Yii::$app->security->generateRandomString(8),
             ]
         );
-        $this->run('user/create', [getenv('APP_ADMIN_EMAIL'), 'admin', $adminPassword]);
+        $this->run('user/create', [ getenv('APP_ADMIN_EMAIL'), 'admin', $adminPassword ]);
 
         $this->stdout("\n\nDone.\n");
     }
@@ -94,12 +94,12 @@ 
     /**
      * Clean cache, assets and audit tables
      */
-    public function actionCleanup(){
+    public function actionCleanup() {
         $this->stdout("\nCleanup\n");
         $this->stdout("-------\n");
         $this->run('cache/flush-all');
-        $this->run('audit/cleanup', ['age' => 30, 'interactive' => (bool) getenv('APP_INTERACTIVE')]);
-        $this->run('app/clear-assets', ['interactive' => (bool) getenv('APP_INTERACTIVE')]);
+        $this->run('audit/cleanup', [ 'age' => 30, 'interactive' => (bool) getenv('APP_INTERACTIVE') ]);
+        $this->run('app/clear-assets', [ 'interactive' => (bool) getenv('APP_INTERACTIVE') ]);
     }
 
     /**
@@ -119,7 +119,7 @@ 
         $command = new Command($cmd);
 
         // Prompt user
-        $delete = $this->confirm("\nDo you really want to delete web assets?", ['default' => true]);
+        $delete = $this->confirm("\nDo you really want to delete web assets?", [ 'default' => true ]);
 
         if ($delete) {
             // Try to execute $command