dmstr / phd5-app

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/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')): ?>
 

config/common.php

Spacing +28 added lines, -28 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 : '',
                 ],
             ],
@@ -182,7 +182,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' => [
@@ -204,9 +204,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,
@@ -237,16 +237,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'), "/");
@@ -258,15 +258,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);
                         },
                     ],
@@ -280,7 +280,7 @@ 
     'modules' => [
         'audit' => [
             'class' => \bedezign\yii2\audit\Audit::class,
-            'accessRoles' => ['audit-module'],
+            'accessRoles' => [ 'audit-module' ],
             'layout' => $boxLayout,
             'panels' => [
                 'audit/trail' => [
@@ -364,12 +364,12 @@ 
                 [
                     'connection' => 'db',
                     'table' => '{{%hrzg_widget_template}}',
-                    'columns' => ['twig_template']
+                    'columns' => [ 'twig_template' ]
                 ],
                 [
                     'connection' => 'db',
                     'table' => '{{%twig}}',
-                    'columns' => ['value']
+                    'columns' => [ 'value' ]
                 ]
             ],
             'scanners' => [
@@ -378,15 +378,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' => [

src/commands/AppController.php

Spacing +16 added lines, -16 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,7 +57,7 @@ 
     public function actionVersion()
     {
         $this->stdout('Application Version: ');
-        $this->stdout(getenv('APP_NAME') . ' ');
+        $this->stdout(getenv('APP_NAME').' ');
         $this->stdout(APP_VERSION);
         echo "\n";
     }
@@ -72,12 +72,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');
-        $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");
@@ -87,7 +87,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');
 
@@ -102,8 +102,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') ]);
     }
 
     /**
@@ -117,20 +117,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()) {
                 echo "Web assets have been deleted.\n\n";
             } else {
-                echo "\n" . $command->getError() . "\n";
+                echo "\n".$command->getError()."\n";
                 echo $command->getStdErr();
             }
         }
@@ -143,8 +143,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');