Completed
Pull Request — master (#37)
by Elias
14:10
created
config/common.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -21,10 +21,10 @@  discard block
 block discarded – undo
21 21
 $languages = explode(',', getenv('APP_LANGUAGES'));
22 22
 
23 23
 // prepare asset bundle config
24
-$bundles = [];
24
+$bundles = [ ];
25 25
 if (getenv('APP_ASSET_USE_BUNDLED')) {
26 26
     // include generated asset-bundle configuration
27
-    $bundles = include Yii::getAlias('@web/bundles') . '/config.php';
27
+    $bundles = include Yii::getAlias('@web/bundles').'/config.php';
28 28
     // disable loading of bundles skin file, when using bundled assets
29 29
     Yii::$container->set(
30 30
         AdminLteAsset::className(),
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 return [
41 41
     'id' => 'app',
42 42
     'name' => getenv('APP_TITLE'),
43
-    'language' => $languages[0],
43
+    'language' => $languages[ 0 ],
44 44
     'basePath' => '@app',
45 45
     'vendorPath' => '@root/vendor',
46 46
     'runtimePath' => '@root/runtime',
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
     ],
59 59
     'params' => [
60 60
         'adminEmail' => getenv('APP_ADMIN_EMAIL'),
61
-        'context.menuItems' => [],
61
+        'context.menuItems' => [ ],
62 62
         'backend.iframe.name' => getenv('APP_PARAMS_BACKEND_IFRAME_NAME') ?: '_self',
63 63
         'backend.browserSupport' => [
64 64
             'Chrome' => 72,
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
     'container' => [
75 75
         'definitions' => [
76 76
             AuthDbManagerComponent::class => [
77
-                'defaultRoles' => ['Default'],
77
+                'defaultRoles' => [ 'Default' ],
78 78
                 'cache' => 'cache'
79 79
             ],
80 80
             Da\User\Controller\AdminController::class => [
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
             'key' => getenv('AMAZON_S3_BUCKET_PUBLIC_KEY'),
125 125
             'secret' => getenv('AMAZON_S3_BUCKET_SECRET_KEY'),
126 126
             'bucket' => getenv('AMAZON_S3_BUCKET_NAME'),
127
-            'prefix' => getenv('APP_NAME') . '/public',
127
+            'prefix' => getenv('APP_NAME').'/public',
128 128
             'region' => getenv('AMAZON_S3_BUCKET_REGION'),
129 129
         ],
130 130
         'fsRuntime' => [
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
                 'common' => [
151 151
                     'class' => \codemix\streamlog\Target::class,
152 152
                     'url' => 'php://stderr',
153
-                    'levels' => ['error', 'warning'],
154
-                    'logVars' => [],
153
+                    'levels' => [ 'error', 'warning' ],
154
+                    'logVars' => [ ],
155 155
                     'replaceNewline' => (APP_TYPE == 'console') ? null : '',
156 156
                 ],
157 157
             ],
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
             'messageConfig' => [
173 173
                 'charset' => 'UTF-8',
174 174
                 'returnPath' => getenv('APP_MAILER_RETURN_PATH'),
175
-                'from' => [getenv('APP_MAILER_FROM') => getenv('APP_TITLE')],
175
+                'from' => [ getenv('APP_MAILER_FROM') => getenv('APP_TITLE') ],
176 176
             ],
177 177
         ],
178 178
         'queue' => [
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
                 getenv('APP_LOGIN_URL') ?: '/user/security/login'
200 200
             ],
201 201
             'identityClass' => Da\User\Model\User::class,
202
-            'rootUsers' => ['admin'],
202
+            'rootUsers' => [ 'admin' ],
203 203
         ],
204 204
         'urlManager' => [
205 205
             'class' => \codemix\localeurls\UrlManager::class,
@@ -230,37 +230,37 @@  discard block
 block discarded – undo
230 230
                         'auto_reload' => true,
231 231
                     ],
232 232
                     'globals' => [
233
-                        'Html' => ['class' => \yii\helpers\Html::class],
234
-                        'Json' => ['class' => \yii\helpers\Json::class],
235
-                        'Tree' => ['class' => \dmstr\modules\pages\models\Tree::class],
236
-                        'FA' => ['class' => \rmrevin\yii\fontawesome\FA::class],
237
-                        'FileUrl' => ['class' => \hrzg\filemanager\helpers\Url::class],
238
-                        'Url' => ['class' => \yii\helpers\Url::class],
239
-                        'Markdown' => ['class' => \yii\helpers\Markdown::class],
233
+                        'Html' => [ 'class' => \yii\helpers\Html::class ],
234
+                        'Json' => [ 'class' => \yii\helpers\Json::class ],
235
+                        'Tree' => [ 'class' => \dmstr\modules\pages\models\Tree::class ],
236
+                        'FA' => [ 'class' => \rmrevin\yii\fontawesome\FA::class ],
237
+                        'FileUrl' => [ 'class' => \hrzg\filemanager\helpers\Url::class ],
238
+                        'Url' => [ 'class' => \yii\helpers\Url::class ],
239
+                        'Markdown' => [ 'class' => \yii\helpers\Markdown::class ],
240 240
                     ],
241 241
                     'functions' => [
242
-                        'image' => function ($imageSource, $preset = null) {
242
+                        'image' => function($imageSource, $preset = null) {
243 243
                             // sanitize input
244 244
                             $preset = trim($preset, "/");
245 245
                             $baseUrl = trim(Yii::$app->settings->get('imgBaseUrl', 'app.frontend'), "/");
246 246
                             $prefix = trim(Yii::$app->settings->get('imgHostPrefix', 'app.frontend'), "/");
247
-                            $imageSourceFull = $imageSource . Yii::$app->settings->get('imgHostSuffix', 'app.frontend');
247
+                            $imageSourceFull = $imageSource.Yii::$app->settings->get('imgHostSuffix', 'app.frontend');
248 248
 
249 249
                             // build remote URL
250
-                            $remoteUrl = implode('/', array_filter([$prefix, $imageSourceFull]));
250
+                            $remoteUrl = implode('/', array_filter([ $prefix, $imageSourceFull ]));
251 251
 
252 252
                             // add HMAC sign key to preset when using imageproxy, see also https://github.com/willnorris/imageproxy#examples
253 253
                             if (getenv('IMAGEPROXY_SIGNATURE_KEY')) {
254 254
                                 $key = getenv('IMAGEPROXY_SIGNATURE_KEY');
255
-                                $preset .= ',s' . strtr(
255
+                                $preset .= ',s'.strtr(
256 256
                                     base64_encode(hash_hmac('sha256', $remoteUrl, $key, 1)),
257 257
                                     '/+',
258 258
                                     '_-'
259 259
                                     );
260 260
                             }
261
-                            return implode('/', array_filter([$baseUrl,$preset,$remoteUrl]));
261
+                            return implode('/', array_filter([ $baseUrl, $preset, $remoteUrl ]));
262 262
                         },
263
-                        't' => function ($category, $message, $params = [], $language = null) {
263
+                        't' => function($category, $message, $params = [ ], $language = null) {
264 264
                             return Yii::t($category, $message, $params, $language);
265 265
                         },
266 266
                     ],
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
     'modules' => [
275 275
         'audit' => [
276 276
             'class' => \bedezign\yii2\audit\Audit::class,
277
-            'accessRoles' => ['audit-module'],
277
+            'accessRoles' => [ 'audit-module' ],
278 278
             'layout' => $boxLayout,
279 279
             'panels' => [
280 280
                 'audit/trail' => [
@@ -361,12 +361,12 @@  discard block
 block discarded – undo
361 361
                 [
362 362
                     'connection' => 'db',
363 363
                     'table' => '{{%hrzg_widget_template}}',
364
-                    'columns' => ['twig_template']
364
+                    'columns' => [ 'twig_template' ]
365 365
                 ],
366 366
                 [
367 367
                     'connection' => 'db',
368 368
                     'table' => '{{%twig}}',
369
-                    'columns' => ['value']
369
+                    'columns' => [ 'value' ]
370 370
                 ]
371 371
             ],
372 372
             'scanners' => [
@@ -375,15 +375,15 @@  discard block
 block discarded – undo
375 375
                 ScannerJavaScriptFunction::class,
376 376
                 ScannerDatabase::class
377 377
             ],
378
-            'allowedIPs' => ['*'],
379
-            'roles' => ['translate-module'],
378
+            'allowedIPs' => [ '*' ],
379
+            'roles' => [ 'translate-module' ],
380 380
         ],
381 381
         'user' => [
382 382
             'class' => Da\User\Module::class,
383 383
             'layout' => '@app/views/layouts/container',
384 384
             'defaultRoute' => 'admin',
385 385
             'administratorPermissionName' => 'user-module',
386
-            'administrators' => ['admin'],
386
+            'administrators' => [ 'admin' ],
387 387
             'enableFlashMessages' => false,
388 388
             'enableRegistration' => getenv('APP_USER_ENABLE_REGISTRATION'),
389 389
             'mailParams' => [
Please login to merge, or discard this patch.
src/controllers/SecurityController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
     public function behaviors()
31 31
     {
32 32
         $behaviors = parent::behaviors();
33
-        $behaviors['access-control'] = [
33
+        $behaviors[ 'access-control' ] = [
34 34
             'class' => AccessControl::class,
35 35
             'rules' => [
36 36
                 [
Please login to merge, or discard this patch.
src/views/security/login.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,12 +18,12 @@
 block discarded – undo
18 18
 ?>
19 19
 <div class="login-box">
20 20
     <div class="login-logo">
21
-        <?= Html::a(getenv('APP_TITLE'), ['']) ?>
21
+        <?= Html::a(getenv('APP_TITLE'), [ '' ]) ?>
22 22
     </div>
23 23
     <div class="login-box-body">
24 24
         <?php
25 25
         $form = ActiveForm::begin([
26
-            'action' => ['/user/login'],
26
+            'action' => [ '/user/login' ],
27 27
             'enableAjaxValidation' => true,
28 28
             'enableClientValidation' => false,
29 29
             'validateOnBlur' => false,
Please login to merge, or discard this patch.