dmstr / phd5-app

src/config/common.php

Spacing +30 added lines, -30 removed lines

@@ -16,10 +16,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(),
@@ -61,7 +61,7 @@ 
 return [
     'id' => 'app',
     'name' => getenv('APP_TITLE'),
-    'language' => $languages[0],
+    'language' => $languages[ 0 ],
     'basePath' => dirname(__DIR__),
     'vendorPath' => '@app/../vendor',
     'runtimePath' => '@app/../runtime',
@@ -79,8 +79,8 @@ 
     ],
     'params' => [
         'adminEmail' => getenv('APP_ADMIN_EMAIL'),
-        'context.menuItems' => [],
-        'backend.iframe.name' => 'backend-' . getenv('HOSTNAME'),
+        'context.menuItems' => [ ],
+        'backend.iframe.name' => 'backend-'.getenv('HOSTNAME'),
     ],
     'components' => [
         'assetManager' => [
@@ -92,7 +92,7 @@ 
         ],
         'authManager' => [
             'class' => \yii\rbac\DbManager::class,
-            'defaultRoles' => ['Default'],
+            'defaultRoles' => [ 'Default' ],
         ],
         'cache' => getenv('APP_NO_CACHE') ? null : [
             'class' => \yii\redis\Cache::class,
@@ -115,7 +115,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' => [
@@ -140,8 +140,8 @@ 
                 'common' => [
                     'class' => \codemix\streamlog\Target::class,
                     'url' => 'php://stderr',
-                    'levels' => ['error', 'warning'],
-                    'logVars' => [],
+                    'levels' => [ 'error', 'warning' ],
+                    'logVars' => [ ],
                     'replaceNewline' => (APP_TYPE == 'console') ? null : '',
                 ],
             ],
@@ -176,9 +176,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,
@@ -209,24 +209,24 @@ 
                         '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],
+                        '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 ],
                     ],
                     'functions' => [
-                        'image' => function ($imageSource, $preset = null) {
+                        'image' => function($imageSource, $preset = null) {
                             // preset example, when using imageproxy, https://github.com/willnorris/imageproxy#examples
                             if (getenv('IMAGEPROXY_SIGNATURE_KEY')) {
                                 $key = getenv('IMAGEPROXY_SIGNATURE_KEY');
-                                $preset .= ',s' . strtr(base64_encode(hash_hmac('sha256', $imageSource, $key, 1)), '/+', '_-');
+                                $preset .= ',s'.strtr(base64_encode(hash_hmac('sha256', $imageSource, $key, 1)), '/+', '_-');
                             }
-                            return Yii::$app->settings->get('imgBaseUrl', 'app.frontend') .
-                                $preset .
-                                Yii::$app->settings->get('imgHostPrefix', 'app.frontend') .
-                                $imageSource .
+                            return Yii::$app->settings->get('imgBaseUrl', 'app.frontend').
+                                $preset.
+                                Yii::$app->settings->get('imgHostPrefix', 'app.frontend').
+                                $imageSource.
                                 Yii::$app->settings->get('imgHostSuffix', 'app.frontend');
                         },
                     ],
@@ -240,7 +240,7 @@ 
     'modules' => [
         'audit' => [
             'class' => \bedezign\yii2\audit\Audit::class,
-            'accessRoles' => ['audit-module'],
+            'accessRoles' => [ 'audit-module' ],
             'layout' => $boxLayout,
             'panels' => [
                 'audit/request',
@@ -248,9 +248,9 @@ 
                 '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',
@@ -322,14 +322,14 @@ 
             'class' => \lajax\translatemanager\Module::class,
             'root' => '@app/views',
             'layout' => $boxLayout,
-            'allowedIPs' => ['*'],
-            'roles' => ['translate-module'],
+            'allowedIPs' => [ '*' ],
+            'roles' => [ 'translate-module' ],
         ],
         'user' => [
             'class' => Da\User\Module::class,
             'layout' => '@app/views/layouts/container',
             'defaultRoute' => 'admin',
-            'administrators' => ['admin'],
+            'administrators' => [ 'admin' ],
             'enableFlashMessages' => false,
             'enableRegistration' => getenv('APP_USER_ENABLE_REGISTRATION'),
         ],

src/commands/AppController.php

Spacing +14 added lines, -14 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));
@@ -56,7 +56,7 @@ 
     public function actionVersion()
     {
         $this->stdout('Application Version: ');
-        $this->stdout(getenv('APP_NAME') . ' ');
+        $this->stdout(getenv('APP_NAME').' ');
         $this->stdout(APP_VERSION);
         echo "\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');
-        $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");
     }
@@ -99,8 +99,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') ]);
     }
 
     /**
@@ -114,20 +114,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();
             }
         }