Completed
Push — master ( 862be8...163405 )
by Elias
14:09
created
config/common.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -77,10 +77,10 @@  discard block
 block discarded – undo
77 77
 $languages = explode(',', getenv('APP_LANGUAGES'));
78 78
 
79 79
 // prepare asset bundle config
80
-$bundles = [];
80
+$bundles = [ ];
81 81
 if (getenv('APP_ASSET_USE_BUNDLED')) {
82 82
     // include generated asset-bundle configuration
83
-    $bundles = include Yii::getAlias('@web/bundles') . '/config.php';
83
+    $bundles = include Yii::getAlias('@web/bundles').'/config.php';
84 84
     // disable loading of bundles skin file, when using bundled assets
85 85
     Yii::$container->set(
86 86
         AdminLteAsset::class,
@@ -97,13 +97,13 @@  discard block
 block discarded – undo
97 97
     PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => 0
98 98
 ];
99 99
 if (getenv('MYSQL_ATTR_SSL_CA')) {
100
-    $dbAttributes[PDO::MYSQL_ATTR_SSL_CA] = getenv('MYSQL_ATTR_SSL_CA');
100
+    $dbAttributes[ PDO::MYSQL_ATTR_SSL_CA ] = getenv('MYSQL_ATTR_SSL_CA');
101 101
 }
102 102
 
103 103
 // update Redis increment counter according to queue_manager db (workaround)
104
-Event::on(Queue::class, Queue::EVENT_BEFORE_PUSH, function ($event) {
104
+Event::on(Queue::class, Queue::EVENT_BEFORE_PUSH, function($event) {
105 105
     // added directly to the SQL query, since param binding
106
-    $table_name = getenv('DATABASE_TABLE_PREFIX') . 'queue_manager';
106
+    $table_name = getenv('DATABASE_TABLE_PREFIX').'queue_manager';
107 107
     if (Yii::$app->cache->get('queue_id_synced') !== true) {
108 108
         $lastQueueIdSql = <<<SQL
109 109
 SELECT `AUTO_INCREMENT`  
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 $common = [
148 148
     'id' => 'app',
149 149
     'name' => getenv('APP_TITLE'),
150
-    'language' => $languages[0],
150
+    'language' => $languages[ 0 ],
151 151
     'basePath' => '@app',
152 152
     'vendorPath' => '@root/vendor',
153 153
     'runtimePath' => '@root/runtime',
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
     ],
166 166
     'params' => [
167 167
         'adminEmail' => getenv('APP_ADMIN_EMAIL'),
168
-        'context.menuItems' => [],
168
+        'context.menuItems' => [ ],
169 169
         'backend.iframe.name' => getenv('APP_PARAMS_BACKEND_IFRAME_NAME') ?: '_self',
170 170
         'backend.browserSupport' => [
171 171
             'Chrome' => 87,
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
     'container' => [
182 182
         'definitions' => [
183 183
             AuthDbManagerComponent::class => [
184
-                'defaultRoles' => ['Default'],
184
+                'defaultRoles' => [ 'Default' ],
185 185
                 'cache' => 'cache'
186 186
             ],
187 187
             AdminController::class => [
@@ -205,12 +205,12 @@  discard block
 block discarded – undo
205 205
                     'rules' => [
206 206
                         [
207 207
                             'allow' => true,
208
-                            'actions' => ['index'],
209
-                            'roles' => ['@'],
208
+                            'actions' => [ 'index' ],
209
+                            'roles' => [ '@' ],
210 210
                         ],
211 211
                         [
212 212
                             'allow' => true,
213
-                            'actions' => ['show'],
213
+                            'actions' => [ 'show' ],
214 214
                             // allow for all logged in users
215 215
                             #'roles' => ['@'],
216 216
                             // allow only if user has 'user' grant or requested his own profile (check by user->id)
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
                                 if (\Yii::$app->user->can('user')) {
222 222
                                     return true;
223 223
                                 }
224
-                                if (\Yii::$app->user->id === (int)Yii::$app->request->getQueryParam('id')) {
224
+                                if (\Yii::$app->user->id === (int) Yii::$app->request->getQueryParam('id')) {
225 225
                                     return true;
226 226
                                 }
227 227
                                 return false;
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
             'converter' => [
243 243
                 'class' => 'yii\web\AssetConverter',
244 244
                 'commands' => [
245
-                    'less' => ['css', 'nodepkg-linuxstatic lessc {from} {to} --no-color --source-map'],
245
+                    'less' => [ 'css', 'nodepkg-linuxstatic lessc {from} {to} --no-color --source-map' ],
246 246
                 ],
247 247
             ],
248 248
         ],
@@ -307,8 +307,8 @@  discard block
 block discarded – undo
307 307
                 'common' => [
308 308
                     'class' => Target::class,
309 309
                     'url' => 'php://stderr',
310
-                    'levels' => ['error', 'warning'],
311
-                    'logVars' => [],
310
+                    'levels' => [ 'error', 'warning' ],
311
+                    'logVars' => [ ],
312 312
                     'replaceNewline' => APP_TYPE === 'console' ? null : ''
313 313
                 ]
314 314
             ]
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
             'transport' => [
321 321
                 'scheme' => getenv('APP_MAILER_SCHEME') ?: 'smtp',
322 322
                 'host' => getenv('APP_MAILER_HOST'),
323
-                'port' => (int)getenv('APP_MAILER_PORT'),
323
+                'port' => (int) getenv('APP_MAILER_PORT'),
324 324
                 'encryption' => getenv('APP_MAILER_ENCRYPTION'),
325 325
                 'username' => getenv('APP_MAILER_USERNAME'),
326 326
                 'password' => getenv('APP_MAILER_PASSWORD')
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
                 'charset' => 'UTF-8',
330 330
                 'replyTo' => getenv('APP_MAILER_REPLY_TO'),
331 331
                 'returnPath' => getenv('APP_MAILER_RETURN_PATH'),
332
-                'from' => [getenv('APP_MAILER_FROM') => getenv('APP_TITLE')]
332
+                'from' => [ getenv('APP_MAILER_FROM') => getenv('APP_TITLE') ]
333 333
             ]
334 334
         ],
335 335
         'queue' => [
@@ -356,9 +356,9 @@  discard block
 block discarded – undo
356 356
         'user' => [
357 357
             'class' => User::class,
358 358
             'enableAutoLogin' => true,
359
-            'loginUrl' => ['/user/security/login'],
359
+            'loginUrl' => [ '/user/security/login' ],
360 360
             'identityClass' => UserModel::class,
361
-            'rootUsers' => ['admin']
361
+            'rootUsers' => [ 'admin' ]
362 362
         ],
363 363
         'urlManager' => [
364 364
             'class' => UrlManager::class,
@@ -394,18 +394,18 @@  discard block
 block discarded – undo
394 394
                         'auto_reload' => true
395 395
                     ],
396 396
                     'globals' => [
397
-                        'Html' => ['class' => Html::class],
398
-                        'Json' => ['class' => Json::class],
399
-                        'Tree' => ['class' => Tree::class],
400
-                        'FA' => ['class' => FA::class],
401
-                        'Url' => ['class' => Url::class],
402
-                        'Markdown' => ['class' => Markdown::class]
397
+                        'Html' => [ 'class' => Html::class ],
398
+                        'Json' => [ 'class' => Json::class ],
399
+                        'Tree' => [ 'class' => Tree::class ],
400
+                        'FA' => [ 'class' => FA::class ],
401
+                        'Url' => [ 'class' => Url::class ],
402
+                        'Markdown' => [ 'class' => Markdown::class ]
403 403
                     ],
404 404
                     'functions' => [
405
-                        'image' => function ($imageSource, $preset = '') {
405
+                        'image' => function($imageSource, $preset = '') {
406 406
                             return ImageUrlHelper::image($imageSource, $preset);
407 407
                         },
408
-                        't' => function ($category, $message, $params = [], $language = null) {
408
+                        't' => function($category, $message, $params = [ ], $language = null) {
409 409
                             return Yii::t($category, $message, $params, $language);
410 410
                         }
411 411
                     ],
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
     'modules' => [
420 420
         'audit' => [
421 421
             'class' => AuditModule::class,
422
-            'accessRoles' => ['audit-module'],
422
+            'accessRoles' => [ 'audit-module' ],
423 423
             'layout' => $boxLayout,
424 424
             'panels' => [
425 425
                 'audit/trail' => [
@@ -521,12 +521,12 @@  discard block
 block discarded – undo
521 521
                 [
522 522
                     'connection' => 'db',
523 523
                     'table' => '{{%hrzg_widget_template}}',
524
-                    'columns' => ['twig_template']
524
+                    'columns' => [ 'twig_template' ]
525 525
                 ],
526 526
                 [
527 527
                     'connection' => 'db',
528 528
                     'table' => '{{%twig}}',
529
-                    'columns' => ['value']
529
+                    'columns' => [ 'value' ]
530 530
                 ]
531 531
             ],
532 532
             'scanners' => [
@@ -535,8 +535,8 @@  discard block
 block discarded – undo
535 535
                 ScannerJavaScriptFunction::class,
536 536
                 ScannerDatabase::class
537 537
             ],
538
-            'allowedIPs' => ['*'],
539
-            'roles' => ['translate-module']
538
+            'allowedIPs' => [ '*' ],
539
+            'roles' => [ 'translate-module' ]
540 540
         ],
541 541
         'user' => [
542 542
             'class' => UserModule::class,
@@ -544,12 +544,12 @@  discard block
 block discarded – undo
544 544
             'enableGdprCompliance' => true,
545 545
             'defaultRoute' => 'admin',
546 546
             'administratorPermissionName' => 'user-module',
547
-            'administrators' => ['admin'],
547
+            'administrators' => [ 'admin' ],
548 548
             'enableFlashMessages' => false,
549 549
             'generatePasswords' => true,
550 550
             'enableRegistration' => getenv('APP_USER_ENABLE_REGISTRATION'),
551 551
             'mailParams' => [
552
-                'fromEmail' => [getenv('APP_MAILER_FROM')=>getenv('APP_TITLE')]
552
+                'fromEmail' => [ getenv('APP_MAILER_FROM')=>getenv('APP_TITLE') ]
553 553
             ],
554 554
         ],
555 555
         'widgets' => [
@@ -564,16 +564,16 @@  discard block
 block discarded – undo
564 564
 ];
565 565
 
566 566
 if ($s3Enabled) {
567
-    $common['components']['fsS3'] = [
567
+    $common[ 'components' ][ 'fsS3' ] = [
568 568
         'class' => AwsS3Filesystem::class,
569 569
         'key' => getenv('AMAZON_S3_BUCKET_PUBLIC_KEY'),
570 570
         'secret' => getenv('AMAZON_S3_BUCKET_SECRET_KEY'),
571 571
         'bucket' => getenv('AMAZON_S3_BUCKET_NAME'),
572
-        'prefix' => getenv('APP_NAME') . '/public',
572
+        'prefix' => getenv('APP_NAME').'/public',
573 573
         'region' => getenv('AMAZON_S3_BUCKET_REGION')
574 574
     ];
575 575
 
576
-    $common['modules']['filefly']['filesystemComponents']['s3'] = 'fsS3';
576
+    $common[ 'modules' ][ 'filefly' ][ 'filesystemComponents' ][ 's3' ] = 'fsS3';
577 577
 }
578 578
 
579 579
 return $common;
Please login to merge, or discard this patch.