dmstr / phd5-app

src/views/site/index.php

Spacing +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 
 ?>
 <div class="site-index">
-    <?= TwigWidget::widget(['registerMenuItems' => true]) ?>
+    <?= TwigWidget::widget([ 'registerMenuItems' => true ]) ?>
 </div>

src/views/layouts/main.php

Spacing +12 added lines, -12 removed lines

@@ -24,8 +24,8 @@ 
 /* @var $this \yii\web\View */
 /* @var $content string */
 
-$this->title .= ' - ' . getenv('APP_TITLE');
-$this->title = (getenv('APP_PAGES_TITLE_PREFIX') ?? '') . $this->title;
+$this->title .= ' - '.getenv('APP_TITLE');
+$this->title = (getenv('APP_PAGES_TITLE_PREFIX') ?? '').$this->title;
 
 SettingsAsset::register($this);
 
@@ -33,18 +33,18 @@ 
     Event::on(
         View::class,
         View::EVENT_AFTER_RENDER,
-        function ($e) {
+        function($e) {
             // disable unbundled asset
-            $e->sender->assetBundles['yii\\bootstrap\\BootstrapAsset'] = null;
+            $e->sender->assetBundles[ 'yii\\bootstrap\\BootstrapAsset' ] = null;
             // disable bundled asset
-            $e->sender->assetBundles['bootstrap'] = null;
+            $e->sender->assetBundles[ 'bootstrap' ] = null;
         }
     );
 }
 
 // Favicon
 if ($favicon = \Yii::$app->settings->get('faviconPng', 'app.assets')) {
-    $this->registerLinkTag(['rel' => 'shortcut icon', 'type' => 'image/png', 'href' => $favicon]);
+    $this->registerLinkTag([ 'rel' => 'shortcut icon', 'type' => 'image/png', 'href' => $favicon ]);
 }
 
 ?>
@@ -65,12 +65,12 @@ 
 
 <?php $this->beginBody() ?>
 
-<?= TwigWidget::widget(['key' => '_beginBody', 'renderEmpty' => false]) ?>
+<?= TwigWidget::widget([ 'key' => '_beginBody', 'renderEmpty' => false ]) ?>
 
 <!-- Navbar -->
 <?php
 if (Yii::$app->settings->get('enableTwigNavbar', 'app.layout', false)) {
-    echo TwigWidget::widget(['key' => '_navbar']);
+    echo TwigWidget::widget([ 'key' => '_navbar' ]);
 } else {
     echo $this->render('_navbar');
 }
@@ -78,7 +78,7 @@ 
 ?>
 
 <!-- Content -->
-<?= TwigWidget::widget(['key' => '_beforeContent', 'renderEmpty' => false]) ?>
+<?= TwigWidget::widget([ 'key' => '_beforeContent', 'renderEmpty' => false ]) ?>
 
 <div class="wrap">
 
@@ -86,12 +86,12 @@ 
 
 </div>
 
-<?= TwigWidget::widget(['key' => '_afterContent', 'renderEmpty' => false]) ?>
+<?= TwigWidget::widget([ 'key' => '_afterContent', 'renderEmpty' => false ]) ?>
 
 
 <!-- Footer -->
 <footer class="footer">
-    <?= Cell::widget(['id' => '_footer', 'requestParam' => '_global']) ?>
+    <?= Cell::widget([ 'id' => '_footer', 'requestParam' => '_global' ]) ?>
 </footer>
 
 <!-- User flash messages -->
@@ -105,7 +105,7 @@ 
     ],
 ]) ?>
 
-<?= TwigWidget::widget(['key' => '_endBody', 'renderEmpty' => false]) ?>
+<?= TwigWidget::widget([ 'key' => '_endBody', 'renderEmpty' => false ]) ?>
 
 <?php if (Yii::$app->user->can('backend_default_index')): ?>
 

src/views/layouts/plain.php

Spacing +6 added lines, -6 removed lines

@@ -24,8 +24,8 @@ 
 /* @var $this \yii\web\View */
 /* @var $content string */
 
-$this->title .= ' - ' . getenv('APP_TITLE');
-$this->title = (getenv('APP_PAGES_TITLE_PREFIX') ?? '') . $this->title;
+$this->title .= ' - '.getenv('APP_TITLE');
+$this->title = (getenv('APP_PAGES_TITLE_PREFIX') ?? '').$this->title;
 
 SettingsAsset::register($this);
 
@@ -33,18 +33,18 @@ 
     Event::on(
         View::class,
         View::EVENT_AFTER_RENDER,
-        function ($e) {
+        function($e) {
             // disable unbundled asset
-            $e->sender->assetBundles['yii\\bootstrap\\BootstrapAsset'] = null;
+            $e->sender->assetBundles[ 'yii\\bootstrap\\BootstrapAsset' ] = null;
             // disable bundled asset
-            $e->sender->assetBundles['bootstrap'] = null;
+            $e->sender->assetBundles[ 'bootstrap' ] = null;
         }
     );
 }
 
 // Favicon
 if ($favicon = \Yii::$app->settings->get('faviconPng', 'app.assets')) {
-    $this->registerLinkTag(['rel' => 'shortcut icon', 'type' => 'image/png', 'href' => $favicon]);
+    $this->registerLinkTag([ 'rel' => 'shortcut icon', 'type' => 'image/png', 'href' => $favicon ]);
 }
 
 ?>

src/views/layouts/_navbar.php

Spacing +17 added lines, -17 removed lines

@@ -8,25 +8,25 @@ 
 use Yii;
 
 // initialize local variables
-$menuItems = [];
-$languageItems = [];
+$menuItems = [ ];
+$languageItems = [ ];
 
 
 // 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' =>  Yii::t('app', '{icon} {language}', [
         'icon' => '<i class="glyphicon glyphicon-globe"></i>',
         'language' => Yii::$app->language
     ]),
-    'options' => ['id' => 'link-languages-menu'],
+    'options' => [ 'id' => 'link-languages-menu' ],
     'items' => $languageItems,
 ];
 
@@ -35,39 +35,39 @@ 
     if (Yii::$app->user->isGuest) {
         // unauthorized users
         //$menuItems[] = ['label' => 'Signup', 'url' => ['/user/registration/register']];
-        $menuItems[] = [
+        $menuItems[ ] = [
             'label' => Yii::t('app', 'Login'),
-            'url' => ['/user/security/login'],
-            'linkOptions' => ['id' => 'link-login'],
+            'url' => [ '/user/security/login' ],
+            'linkOptions' => [ 'id' => 'link-login' ],
         ];
     } else {
         // logged in users
-        $menuItems[] = [
+        $menuItems[ ] = [
             'label' => Yii::t('app', '{icon} {username}', [
                 'icon' => '<i class="glyphicon glyphicon-user"></i>',
                 'username' => Yii::$app->user->identity->username
             ]),
-            'options' => ['id' => 'link-user-menu'],
+            'options' => [ 'id' => 'link-user-menu' ],
             'items' => [
                 [
                     'label' => Yii::t('app', '{icon} Profile', [
                         'icon' => '<i class="glyphicon glyphicon-user"></i>'
                     ]),
-                    'url' => ['/user/profile/show', 'id' => Yii::$app->user->id],
+                    'url' => [ '/user/profile/show', 'id' => Yii::$app->user->id ],
                 ],
                 [
                     'label' => Yii::t('app', '{icon} Settings', [
                         'icon' => '<i class="glyphicon glyphicon-cog"></i>'
                     ]),
-                    'url' => ['/user/settings/profile'],
+                    'url' => [ '/user/settings/profile' ],
                 ],
                 '<li class="divider"></li>',
                 [
                     'label' => Yii::t('app', '{icon} Logout', [
                         'icon' => '<i class="glyphicon glyphicon-log-out"></i>'
                     ]),
-                    'url' => ['/user/security/logout'],
-                    'linkOptions' => ['data-method' => 'post', 'id' => 'link-logout'],
+                    'url' => [ '/user/security/logout' ],
+                    'linkOptions' => [ 'data-method' => 'post', 'id' => 'link-logout' ],
                 ],
             ],
         ];
@@ -88,7 +88,7 @@ 
 // render root pages
 echo Nav::widget(
     [
-        'options' => ['class' => 'navbar-nav'],
+        'options' => [ 'class' => 'navbar-nav' ],
         'encodeLabels' => false,
         'items' => Tree::getMenuItems('root'),
     ]
@@ -97,7 +97,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/views/layouts/container-fluid.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
     <div class="container-layout">
         <div class="container-fluid">
-            <?= Breadcrumbs::widget(['links' => $this->params['breadcrumbs'] ?? []]) ?>
+            <?= Breadcrumbs::widget([ 'links' => $this->params[ 'breadcrumbs' ] ?? [ ] ]) ?>
         </div>
 
         <div class="container-fluid">

src/views/layouts/container.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     <div class="container-layout">
         <div class="container">
             <?=
-            Breadcrumbs::widget(['links' => $this->params['breadcrumbs'] ?? []]) ?>
+            Breadcrumbs::widget([ 'links' => $this->params[ 'breadcrumbs' ] ?? [ ] ]) ?>
         </div>
 
         <div class="container">

src/controllers/SiteController.php

Spacing +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
 
     public function actionRootNode()
     {
-        $rootNodeQuery = Tree::find()->where(['domain_id' => 'root']);
+        $rootNodeQuery = Tree::find()->where([ 'domain_id' => 'root' ]);
         $rootNode = $rootNodeQuery->one();
-        return $this->run('/pages/default/page', ['pageId' => $rootNode->id]);
+        return $this->run('/pages/default/page', [ 'pageId' => $rootNode->id ]);
     }
 }

src/commands/AppController.php

Spacing +18 added lines, -18 removed lines

@@ -28,14 +28,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));
@@ -57,8 +57,8 @@ 
     public function actionVersion()
     {
         $this->stdout('Application Version: ');
-        $this->stdout(getenv('APP_NAME') . ' ');
-        $this->stdout(APP_VERSION . "\n");
+        $this->stdout(getenv('APP_NAME').' ');
+        $this->stdout(APP_VERSION."\n");
     }
 
     /**
@@ -71,12 +71,12 @@ 
         $this->stdout("=====================\n");
         $this->stdout("Initializing application\n");
 
-        $this->interactive = (bool)getenv('APP_INTERACTIVE');
+        $this->interactive = (bool) getenv('APP_INTERACTIVE');
 
         $this->stdout("\nDatabase\n");
         $this->stdout("--------\n");
-        $this->run('db/create', [getenv('DB_ENV_MYSQL_ROOT_USER'),getenv('DB_ENV_MYSQL_ROOT_PASSWORD')]);
-        $this->run('migrate/up', ['interactive' => (bool)getenv('APP_INTERACTIVE')]);
+        $this->run('db/create', [ getenv('DB_ENV_MYSQL_ROOT_USER'), getenv('DB_ENV_MYSQL_ROOT_PASSWORD') ]);
+        $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('Initializing modules');
 
@@ -101,8 +101,8 @@ 
         $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') ]);
     }
 
     /**
@@ -116,20 +116,20 @@ 
         $matchRegex = '"^[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]\?[a-z0-9]$"';
 
         // create $cmd command
-        $cmd = 'cd "' . $assets . '" && ls | grep -e ' . $matchRegex . ' | xargs rm -rf ';
+        $cmd = 'cd "'.$assets.'" && ls | grep -e '.$matchRegex.' | xargs rm -rf ';
 
         // Set command
         $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
             if ($command->execute()) {
                 $this->stdout("Web assets have been deleted.\n\n");
             } else {
-                $this->stderr("\n" . $command->getError() . "\n");
+                $this->stderr("\n".$command->getError()."\n");
                 $this->stderr($command->getStdErr());
             }
         }
@@ -142,8 +142,8 @@ 
         $message = $mailer->compose();
         $message
             ->setTo($to)
-            ->setSubject('Test-Mail from ' . getenv('APP_NAME'))
-            ->setTextBody(getenv('APP_TITLE') . ' | ' . getenv('HOSTNAME'));
+            ->setSubject('Test-Mail from '.getenv('APP_NAME'))
+            ->setTextBody(getenv('APP_TITLE').' | '.getenv('HOSTNAME'));
 
         if ($message->send()) {
             $this->stdout('Mail sent');

config/common.php

Spacing +26 added lines, -26 removed lines

@@ -74,10 +74,10 @@ 
 $languages = explode(',', getenv('APP_LANGUAGES'));
 
 // prepare asset bundle config
-$bundles = [];
+$bundles = [ ];
 if (getenv('APP_ASSET_USE_BUNDLED')) {
     // include generated asset-bundle configuration
-    $bundles = include Yii::getAlias('@web/bundles') . '/config.php';
+    $bundles = include Yii::getAlias('@web/bundles').'/config.php';
     // disable loading of bundles skin file, when using bundled assets
     Yii::$container->set(
         AdminLteAsset::class,
@@ -94,7 +94,7 @@ 
 ];
 
 if (getenv('MYSQL_ATTR_SSL_CA')) {
-    $dbAttributes[PDO::MYSQL_ATTR_SSL_CA] = getenv('MYSQL_ATTR_SSL_CA');
+    $dbAttributes[ PDO::MYSQL_ATTR_SSL_CA ] = getenv('MYSQL_ATTR_SSL_CA');
 }
 
 $boxLayout = '@backend/views/layouts/box';
@@ -103,7 +103,7 @@ 
 return [
     'id' => 'app',
     'name' => getenv('APP_TITLE'),
-    'language' => $languages[0],
+    'language' => $languages[ 0 ],
     'basePath' => '@app',
     'vendorPath' => '@root/vendor',
     'runtimePath' => '@root/runtime',
@@ -121,7 +121,7 @@ 
     ],
     'params' => [
         'adminEmail' => getenv('APP_ADMIN_EMAIL'),
-        'context.menuItems' => [],
+        'context.menuItems' => [ ],
         'backend.iframe.name' => getenv('APP_PARAMS_BACKEND_IFRAME_NAME') ?: '_self',
         'backend.browserSupport' => [
             'Chrome' => 87,
@@ -137,7 +137,7 @@ 
     'container' => [
         'definitions' => [
             AuthDbManagerComponent::class => [
-                'defaultRoles' => ['Default'],
+                'defaultRoles' => [ 'Default' ],
                 'cache' => 'cache'
             ],
             AdminController::class => [
@@ -201,7 +201,7 @@ 
             'key' => getenv('AMAZON_S3_BUCKET_PUBLIC_KEY'),
             'secret' => getenv('AMAZON_S3_BUCKET_SECRET_KEY'),
             'bucket' => getenv('AMAZON_S3_BUCKET_NAME'),
-            'prefix' => getenv('APP_NAME') . '/public',
+            'prefix' => getenv('APP_NAME').'/public',
             'region' => getenv('AMAZON_S3_BUCKET_REGION')
         ],
         'fsRuntime' => [
@@ -235,8 +235,8 @@ 
                 'common' => [
                     'class' => Target::class,
                     'url' => 'php://stderr',
-                    'levels' => ['error', 'warning'],
-                    'logVars' => [],
+                    'levels' => [ 'error', 'warning' ],
+                    'logVars' => [ ],
                     'replaceNewline' => APP_TYPE === 'console' ? null : ''
                 ]
             ]
@@ -257,7 +257,7 @@ 
             'messageConfig' => [
                 'charset' => 'UTF-8',
                 'returnPath' => getenv('APP_MAILER_RETURN_PATH'),
-                'from' => [getenv('APP_MAILER_FROM') => getenv('APP_TITLE')]
+                'from' => [ getenv('APP_MAILER_FROM') => getenv('APP_TITLE') ]
             ]
         ],
         'queue' => [
@@ -284,9 +284,9 @@ 
         'user' => [
             'class' => User::class,
             'enableAutoLogin' => true,
-            'loginUrl' => ['/user/security/login'],
+            'loginUrl' => [ '/user/security/login' ],
             'identityClass' => UserModel::class,
-            'rootUsers' => ['admin']
+            'rootUsers' => [ 'admin' ]
         ],
         'urlManager' => [
             'class' => UrlManager::class,
@@ -320,18 +320,18 @@ 
                         'auto_reload' => true
                     ],
                     'globals' => [
-                        'Html' => ['class' => Html::class],
-                        'Json' => ['class' => Json::class],
-                        'Tree' => ['class' => Tree::class],
-                        'FA' => ['class' => FA::class],
-                        'Url' => ['class' => Url::class],
-                        'Markdown' => ['class' => Markdown::class]
+                        'Html' => [ 'class' => Html::class ],
+                        'Json' => [ 'class' => Json::class ],
+                        'Tree' => [ 'class' => Tree::class ],
+                        'FA' => [ 'class' => FA::class ],
+                        'Url' => [ 'class' => Url::class ],
+                        'Markdown' => [ 'class' => Markdown::class ]
                     ],
                     'functions' => [
-                        'image' => function ($imageSource, $preset = null) {
+                        'image' => function($imageSource, $preset = null) {
                             return ImageUrlHelper::image($imageSource, $preset);
                         },
-                        't' => function ($category, $message, $params = [], $language = null) {
+                        't' => function($category, $message, $params = [ ], $language = null) {
                             return Yii::t($category, $message, $params, $language);
                         }
                     ],
@@ -345,7 +345,7 @@ 
     'modules' => [
         'audit' => [
             'class' => AuditModule::class,
-            'accessRoles' => ['audit-module'],
+            'accessRoles' => [ 'audit-module' ],
             'layout' => $boxLayout,
             'panels' => [
                 'audit/trail' => [
@@ -447,12 +447,12 @@ 
                 [
                     'connection' => 'db',
                     'table' => '{{%hrzg_widget_template}}',
-                    'columns' => ['twig_template']
+                    'columns' => [ 'twig_template' ]
                 ],
                 [
                     'connection' => 'db',
                     'table' => '{{%twig}}',
-                    'columns' => ['value']
+                    'columns' => [ 'value' ]
                 ]
             ],
             'scanners' => [
@@ -461,8 +461,8 @@ 
                 ScannerJavaScriptFunction::class,
                 ScannerDatabase::class
             ],
-            'allowedIPs' => ['*'],
-            'roles' => ['translate-module']
+            'allowedIPs' => [ '*' ],
+            'roles' => [ 'translate-module' ]
         ],
         'user' => [
             'class' => UserModule::class,
@@ -470,7 +470,7 @@ 
             'enableGdprCompliance' => true,
             'defaultRoute' => 'admin',
             'administratorPermissionName' => 'user-module',
-            'administrators' => ['admin'],
+            'administrators' => [ 'admin' ],
             'enableFlashMessages' => false,
             'enableRegistration' => getenv('APP_USER_ENABLE_REGISTRATION'),
             'mailParams' => [