dmstr / phd5-app

config/console.php

Spacing +17 added lines, -17 removed lines

@@ -19,22 +19,22 @@ 
         'db' => [
             'class' => \dmstr\console\controllers\MysqlController::class,
             'noDataTables' => [
-                getenv('DATABASE_TABLE_PREFIX') . 'auth_assignment',
-                getenv('DATABASE_TABLE_PREFIX') . 'migration',
-                getenv('DATABASE_TABLE_PREFIX') . 'user',
-                getenv('DATABASE_TABLE_PREFIX') . 'profile',
-                getenv('DATABASE_TABLE_PREFIX') . 'token',
-                getenv('DATABASE_TABLE_PREFIX') . 'social_account',
-                getenv('DATABASE_TABLE_PREFIX') . 'log',
-                getenv('DATABASE_TABLE_PREFIX') . 'session',
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_data',
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_entry',
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_error',
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_javascript',
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_mail',
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_trail',
-                getenv('DATABASE_TABLE_PREFIX') . 'dmstr_contact_log',
-                getenv('DATABASE_TABLE_PREFIX') . 'queue_manager',
+                getenv('DATABASE_TABLE_PREFIX').'auth_assignment',
+                getenv('DATABASE_TABLE_PREFIX').'migration',
+                getenv('DATABASE_TABLE_PREFIX').'user',
+                getenv('DATABASE_TABLE_PREFIX').'profile',
+                getenv('DATABASE_TABLE_PREFIX').'token',
+                getenv('DATABASE_TABLE_PREFIX').'social_account',
+                getenv('DATABASE_TABLE_PREFIX').'log',
+                getenv('DATABASE_TABLE_PREFIX').'session',
+                getenv('DATABASE_TABLE_PREFIX').'audit_data',
+                getenv('DATABASE_TABLE_PREFIX').'audit_entry',
+                getenv('DATABASE_TABLE_PREFIX').'audit_error',
+                getenv('DATABASE_TABLE_PREFIX').'audit_javascript',
+                getenv('DATABASE_TABLE_PREFIX').'audit_mail',
+                getenv('DATABASE_TABLE_PREFIX').'audit_trail',
+                getenv('DATABASE_TABLE_PREFIX').'dmstr_contact_log',
+                getenv('DATABASE_TABLE_PREFIX').'queue_manager',
                 'filefly_hashmap', # TODO: fix prefix in module
             ],
         ],
@@ -76,7 +76,7 @@ 
                     'class' => \yii\log\FileTarget::class,
                     'logFile' => '@runtime/logs/console.log',
                     //'levels' => ['info', 'trace'],
-                    'logVars' => [],
+                    'logVars' => [ ],
                     'dirMode' => YII_ENV_DEV ? 0777 : 0775,
                     'fileMode' => YII_ENV_DEV ? 0666 : null,
                     'enabled' => YII_DEBUG && !YII_ENV_TEST,

web/index.php

Spacing +3 added lines, -3 removed lines

@@ -3,10 +3,10 @@ 
 // Prepare environment
 $rootPath = realpath(__DIR__.'/..');
 require($rootPath.'/vendor/autoload.php');
-require($rootPath . '/config/env.php');
+require($rootPath.'/config/env.php');
 
 // Define framework & application constants
-defined('YII_DEBUG') or define('YII_DEBUG', (boolean)getenv('YII_DEBUG'));
+defined('YII_DEBUG') or define('YII_DEBUG', (boolean) getenv('YII_DEBUG'));
 defined('YII_ENV') or define('YII_ENV', getenv('YII_ENV'));
 defined('APP_TYPE') or define('APP_TYPE', 'web');
 
@@ -22,4 +22,4 @@ 
 }
 
 // Run application
-(new yii\web\Application(require($rootPath . '/config/main.php')))->run();
+(new yii\web\Application(require($rootPath.'/config/main.php')))->run();

migrations/legacy/migration-command/m000508_053522_fix_migration_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     public function safeUp()
     {
         $table = $this->db->schema->getTableSchema('{{%migration}}');
-        if (isset($table->columns['alias'])) {
+        if (isset($table->columns[ 'alias' ])) {
             // Column exists
             $this->alterColumn('{{%migration}}', 'alias', 'varchar(180) DEFAULT NULL');
         }

config/common.php

Spacing +27 added lines, -27 removed lines

@@ -20,10 +20,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::className(),
@@ -65,7 +65,7 @@ 
 return [
     'id' => 'app',
     'name' => getenv('APP_TITLE'),
-    'language' => $languages[0],
+    'language' => $languages[ 0 ],
     'basePath' => '@app',
     'vendorPath' => '@root/vendor',
     'runtimePath' => '@root/runtime',
@@ -83,7 +83,7 @@ 
     ],
     'params' => [
         'adminEmail' => getenv('APP_ADMIN_EMAIL'),
-        'context.menuItems' => [],
+        'context.menuItems' => [ ],
         'backend.iframe.name' => getenv('APP_PARAMS_BACKEND_IFRAME_NAME') ?: '_self',
         'backend.browserSupport' => [
             'Chrome' => 72,
@@ -108,7 +108,7 @@ 
         ],
         'authManager' => [
             'class' => \yii\rbac\DbManager::class,
-            'defaultRoles' => ['Default'],
+            'defaultRoles' => [ 'Default' ],
             'cache' => 'cache'
         ],
         'cache' =>
@@ -134,7 +134,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' => [
@@ -160,8 +160,8 @@ 
                 'common' => [
                     'class' => \codemix\streamlog\Target::class,
                     'url' => 'php://stderr',
-                    'levels' => ['error', 'warning'],
-                    'logVars' => [],
+                    'levels' => [ 'error', 'warning' ],
+                    'logVars' => [ ],
                     'replaceNewline' => (APP_TYPE == 'console') ? null : '',
                 ],
             ],
@@ -197,9 +197,9 @@ 
         'user' => [
             'class' => \dmstr\web\User::class,
             'enableAutoLogin' => true,
-            'loginUrl' => ['/user/security/login'],
+            'loginUrl' => [ '/user/security/login' ],
             'identityClass' => Da\User\Model\User::class,
-            'rootUsers' => ['admin'],
+            'rootUsers' => [ 'admin' ],
         ],
         'urlManager' => [
             'class' => \codemix\localeurls\UrlManager::class,
@@ -230,16 +230,16 @@ 
                         'auto_reload' => true,
                     ],
                     'globals' => [
-                        'Html' => ['class' => \yii\helpers\Html::class],
-                        'Json' => ['class' => \yii\helpers\Json::class],
-                        'Tree' => ['class' => \dmstr\modules\pages\models\Tree::class],
-                        'FA' => ['class' => \rmrevin\yii\fontawesome\FA::class],
-                        'FileUrl' => ['class' => \hrzg\filemanager\helpers\Url::class],
-                        'Url' => ['class' => \yii\helpers\Url::class],
-                        'Markdown' => ['class' => \yii\helpers\Markdown::class],
+                        'Html' => [ 'class' => \yii\helpers\Html::class ],
+                        'Json' => [ 'class' => \yii\helpers\Json::class ],
+                        'Tree' => [ 'class' => \dmstr\modules\pages\models\Tree::class ],
+                        'FA' => [ 'class' => \rmrevin\yii\fontawesome\FA::class ],
+                        'FileUrl' => [ 'class' => \hrzg\filemanager\helpers\Url::class ],
+                        'Url' => [ 'class' => \yii\helpers\Url::class ],
+                        'Markdown' => [ 'class' => \yii\helpers\Markdown::class ],
                     ],
                     'functions' => [
-                        'image' => function ($imageSource, $preset = null) {
+                        'image' => function($imageSource, $preset = null) {
                             // sanitize input
                             $preset = trim($preset, "/");
                             $baseUrl = trim(Yii::$app->settings->get('imgBaseUrl', 'app.frontend'), "/");
@@ -251,15 +251,15 @@ 
                             // add HMAC sign key to preset when using imageproxy, see also https://github.com/willnorris/imageproxy#examples
                             if (getenv('IMAGEPROXY_SIGNATURE_KEY')) {
                                 $key = getenv('IMAGEPROXY_SIGNATURE_KEY');
-                                $preset .= ',s' . strtr(
+                                $preset .= ',s'.strtr(
                                     base64_encode(hash_hmac('sha256', $remoteUrl, $key, 1)),
                                     '/+',
                                     '_-'
                                     );
                             }
-                            return implode('/', array_filter([$baseUrl,$preset,$remoteUrl]));
+                            return implode('/', array_filter([ $baseUrl, $preset, $remoteUrl ]));
                         },
-                        't' => function ($category, $message) {
+                        't' => function($category, $message) {
                             return Yii::t($category, $message);
                         },
                     ],
@@ -273,7 +273,7 @@ 
     'modules' => [
         'audit' => [
             'class' => \bedezign\yii2\audit\Audit::class,
-            'accessRoles' => ['audit-module'],
+            'accessRoles' => [ 'audit-module' ],
             'layout' => $boxLayout,
             'panels' => [
                 'audit/trail' => [
@@ -354,12 +354,12 @@ 
                 [
                     'connection' => 'db',
                     'table' => '{{%hrzg_widget_template}}',
-                    'columns' => ['twig_template']
+                    'columns' => [ 'twig_template' ]
                 ],
                 [
                     'connection' => 'db',
                     'table' => '{{%twig}}',
-                    'columns' => ['value']
+                    'columns' => [ 'value' ]
                 ]
             ],
             'scanners' => [
@@ -368,15 +368,15 @@ 
                 ScannerJavaScriptFunction::class,
                 ScannerDatabase::class
             ],
-            'allowedIPs' => ['*'],
-            'roles' => ['translate-module'],
+            'allowedIPs' => [ '*' ],
+            'roles' => [ 'translate-module' ],
         ],
         'user' => [
             'class' => Da\User\Module::class,
             'layout' => '@app/views/layouts/container',
             'defaultRoute' => 'admin',
             'administratorPermissionName' => 'user-module',
-            'administrators' => ['admin'],
+            'administrators' => [ 'admin' ],
             'enableFlashMessages' => false,
             'enableRegistration' => getenv('APP_USER_ENABLE_REGISTRATION'),
             'mailParams' => [

config/env.php

Indentation +7 added lines, -7 removed lines

@@ -32,13 +32,13 @@
 $dotenv->required('YII_DEBUG', ['', '0', '1', 'true', true]);
 $dotenv->required('YII_ENV', ['dev', 'prod', 'test']);
 $dotenv->required([
-                      'YII_TRACE_LEVEL',
-                      'APP_NAME',
-                      'APP_TITLE',
-                      'APP_ADMIN_EMAIL',
-                      'APP_LANGUAGES',
-                      'APP_COOKIE_VALIDATION_KEY',
-                  ])->notEmpty();
+                        'YII_TRACE_LEVEL',
+                        'APP_NAME',
+                        'APP_TITLE',
+                        'APP_ADMIN_EMAIL',
+                        'APP_LANGUAGES',
+                        'APP_COOKIE_VALIDATION_KEY',
+                    ])->notEmpty();
 
 // Additional validations
 if (!preg_match('/^[a-z0-9_-]{2,16}$/', getenv('APP_NAME'))) {

Spacing +4 added lines, -4 removed lines

@@ -15,12 +15,12 @@ 
 
 // Load default settings via dotenv from file, load local environment first, if available
 if (getenv('ENV_LOCAL_FILE')) {
-    $localEnv = FileHelper::normalizePath($configPath . '/' . getenv('ENV_LOCAL_FILE'));
+    $localEnv = FileHelper::normalizePath($configPath.'/'.getenv('ENV_LOCAL_FILE'));
     if (is_file($localEnv)) {
         $dotenvLocal = new Dotenv\Dotenv($configPath, getenv('ENV_LOCAL_FILE'));
         $dotenvLocal->load();
     } else {
-        exit("Error: ENV_LOCAL_FILE '{$localEnv}' not found" . PHP_EOL);
+        exit("Error: ENV_LOCAL_FILE '{$localEnv}' not found".PHP_EOL);
     }
 }
 
@@ -29,8 +29,8 @@ 
 $dotenv->load();
 
 // Basic checks & validation
-$dotenv->required('YII_DEBUG', ['', '0', '1', 'true', true]);
-$dotenv->required('YII_ENV', ['dev', 'prod', 'test']);
+$dotenv->required('YII_DEBUG', [ '', '0', '1', 'true', true ]);
+$dotenv->required('YII_ENV', [ 'dev', 'prod', 'test' ]);
 $dotenv->required([
                       'YII_TRACE_LEVEL',
                       'APP_NAME',

src/views/layouts/main.php

Indentation +8 added lines, -8 removed lines

@@ -65,20 +65,20 @@
 <?php $this->beginBody() ?>
 
 <?php Pjax::begin([
-                      'id' => 'main-content',
-                      'timeout' => 5000,
-                      'linkSelector' => '.frontend-reload',
-                  ]) ?>
+                        'id' => 'main-content',
+                        'timeout' => 5000,
+                        'linkSelector' => '.frontend-reload',
+                    ]) ?>
 
 <?= TwigWidget::widget(['key' => '_beginBody', 'renderEmpty' => false]) ?>
 
 <!-- Navbar -->
 <?php
 if (Yii::$app->settings->get('enableTwigNavbar', 'app.layout', false)) {
-                      echo \dmstr\modules\prototype\widgets\TwigWidget::widget(['key' => '_navbar']);
-                  } else {
-                      echo $this->render('_navbar');
-                  }
+                        echo \dmstr\modules\prototype\widgets\TwigWidget::widget(['key' => '_navbar']);
+                    } else {
+                        echo $this->render('_navbar');
+                    }
 
 ?>
 

Spacing +10 added lines, -10 removed lines

@@ -23,8 +23,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);
 
@@ -32,18 +32,18 @@ 
     \yii\base\Event::on(
         \yii\web\View::className(),
         \yii\web\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', null)) {
-    $this->registerLinkTag(['rel' => 'shortcut icon', 'type' => 'image/png', 'href' => $favicon]);
+    $this->registerLinkTag([ 'rel' => 'shortcut icon', 'type' => 'image/png', 'href' => $favicon ]);
 }
 
 ?>
@@ -70,12 +70,12 @@ 
                       'linkSelector' => '.frontend-reload',
                   ]) ?>
 
-<?= TwigWidget::widget(['key' => '_beginBody', 'renderEmpty' => false]) ?>
+<?= TwigWidget::widget([ 'key' => '_beginBody', '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');
                   }
@@ -91,7 +91,7 @@ 
 
 <!-- Footer -->
 <footer class="footer">
-    <?= Cell::widget(['id' => '_footer', 'requestParam' => '_global']) ?>
+    <?= Cell::widget([ 'id' => '_footer', 'requestParam' => '_global' ]) ?>
 </footer>
 
 <?php Pjax::end() ?>
@@ -106,7 +106,7 @@ 
                         ],
                     ]) ?>
 
-<?= TwigWidget::widget(['key' => '_endBody', 'renderEmpty' => false]) ?>
+<?= TwigWidget::widget([ 'key' => '_endBody', 'renderEmpty' => false ]) ?>
 
 <?php if (Yii::$app->user->can('backend_default_index')): ?>