Completed
Push — master ( 163405...6d46e7 )
by Tobias
48s queued 39s
created
config/common.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -78,10 +78,10 @@  discard block
 block discarded – undo
78 78
 $languages = explode(',', getenv('APP_LANGUAGES'));
79 79
 
80 80
 // prepare asset bundle config
81
-$bundles = [];
81
+$bundles = [ ];
82 82
 if (getenv('APP_ASSET_USE_BUNDLED')) {
83 83
     // include generated asset-bundle configuration
84
-    $bundles = include Yii::getAlias('@web/bundles') . '/config.php';
84
+    $bundles = include Yii::getAlias('@web/bundles').'/config.php';
85 85
     // disable loading of bundles skin file, when using bundled assets
86 86
     Yii::$container->set(
87 87
         AdminLteAsset::class,
@@ -98,13 +98,13 @@  discard block
 block discarded – undo
98 98
     PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => 0
99 99
 ];
100 100
 if (getenv('MYSQL_ATTR_SSL_CA')) {
101
-    $dbAttributes[PDO::MYSQL_ATTR_SSL_CA] = getenv('MYSQL_ATTR_SSL_CA');
101
+    $dbAttributes[ PDO::MYSQL_ATTR_SSL_CA ] = getenv('MYSQL_ATTR_SSL_CA');
102 102
 }
103 103
 
104 104
 // update Redis increment counter according to queue_manager db (workaround)
105
-Event::on(Queue::class, Queue::EVENT_BEFORE_PUSH, function ($event) {
105
+Event::on(Queue::class, Queue::EVENT_BEFORE_PUSH, function($event) {
106 106
     // added directly to the SQL query, since param binding
107
-    $table_name = getenv('DATABASE_TABLE_PREFIX') . 'queue_manager';
107
+    $table_name = getenv('DATABASE_TABLE_PREFIX').'queue_manager';
108 108
     if (Yii::$app->cache->get('queue_id_synced') !== true) {
109 109
         $lastQueueIdSql = <<<SQL
110 110
 SELECT `AUTO_INCREMENT`  
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 $common = [
149 149
     'id' => 'app',
150 150
     'name' => getenv('APP_TITLE'),
151
-    'language' => $languages[0],
151
+    'language' => $languages[ 0 ],
152 152
     'basePath' => '@app',
153 153
     'vendorPath' => '@root/vendor',
154 154
     'runtimePath' => '@root/runtime',
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
     ],
167 167
     'params' => [
168 168
         'adminEmail' => getenv('APP_ADMIN_EMAIL'),
169
-        'context.menuItems' => [],
169
+        'context.menuItems' => [ ],
170 170
         'backend.iframe.name' => getenv('APP_PARAMS_BACKEND_IFRAME_NAME') ?: '_self',
171 171
         'backend.browserSupport' => [
172 172
             'Chrome' => 87,
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
     'container' => [
183 183
         'definitions' => [
184 184
             AuthDbManagerComponent::class => [
185
-                'defaultRoles' => ['Default'],
185
+                'defaultRoles' => [ 'Default' ],
186 186
                 'cache' => 'cache'
187 187
             ],
188 188
             AdminController::class => [
@@ -206,12 +206,12 @@  discard block
 block discarded – undo
206 206
                     'rules' => [
207 207
                         [
208 208
                             'allow' => true,
209
-                            'actions' => ['index'],
210
-                            'roles' => ['@'],
209
+                            'actions' => [ 'index' ],
210
+                            'roles' => [ '@' ],
211 211
                         ],
212 212
                         [
213 213
                             'allow' => true,
214
-                            'actions' => ['show'],
214
+                            'actions' => [ 'show' ],
215 215
                             // allow for all logged in users
216 216
                             #'roles' => ['@'],
217 217
                             // allow only if user has 'user' grant or requested his own profile (check by user->id)
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
                                 if (\Yii::$app->user->can('user')) {
223 223
                                     return true;
224 224
                                 }
225
-                                if (\Yii::$app->user->id === (int)Yii::$app->request->getQueryParam('id')) {
225
+                                if (\Yii::$app->user->id === (int) Yii::$app->request->getQueryParam('id')) {
226 226
                                     return true;
227 227
                                 }
228 228
                                 return false;
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
             'converter' => [
244 244
                 'class' => 'yii\web\AssetConverter',
245 245
                 'commands' => [
246
-                    'less' => ['css', 'nodepkg-linuxstatic lessc {from} {to} --no-color --source-map'],
246
+                    'less' => [ 'css', 'nodepkg-linuxstatic lessc {from} {to} --no-color --source-map' ],
247 247
                 ],
248 248
             ],
249 249
         ],
@@ -308,8 +308,8 @@  discard block
 block discarded – undo
308 308
                 'common' => [
309 309
                     'class' => Target::class,
310 310
                     'url' => 'php://stderr',
311
-                    'levels' => ['error', 'warning'],
312
-                    'logVars' => [],
311
+                    'levels' => [ 'error', 'warning' ],
312
+                    'logVars' => [ ],
313 313
                     'replaceNewline' => APP_TYPE === 'console' ? null : ''
314 314
                 ]
315 315
             ]
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
             'transport' => [
322 322
                 'scheme' => getenv('APP_MAILER_SCHEME') ?: 'smtp',
323 323
                 'host' => getenv('APP_MAILER_HOST'),
324
-                'port' => (int)getenv('APP_MAILER_PORT'),
324
+                'port' => (int) getenv('APP_MAILER_PORT'),
325 325
                 'encryption' => getenv('APP_MAILER_ENCRYPTION'),
326 326
                 'username' => getenv('APP_MAILER_USERNAME'),
327 327
                 'password' => getenv('APP_MAILER_PASSWORD')
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
                 'charset' => 'UTF-8',
331 331
                 'replyTo' => getenv('APP_MAILER_REPLY_TO'),
332 332
                 'returnPath' => getenv('APP_MAILER_RETURN_PATH'),
333
-                'from' => [getenv('APP_MAILER_FROM') => getenv('APP_TITLE')]
333
+                'from' => [ getenv('APP_MAILER_FROM') => getenv('APP_TITLE') ]
334 334
             ]
335 335
         ],
336 336
         'queue' => [
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
             'channel' => getenv('APP_QUEUE_CHANNEL'),
339 339
             'as log' => LogBehavior::class,
340 340
             'as queuemanager' => QueueManagerBehavior::class,
341
-            'on ' . Queue::EVENT_AFTER_ERROR => function (ExecEvent $event) {
341
+            'on '.Queue::EVENT_AFTER_ERROR => function(ExecEvent $event) {
342 342
                 if ($event->error instanceof Throwable) {
343 343
                     Yii::$app->getModule('audit')->exception($event->error);
344 344
                 } else {
@@ -364,9 +364,9 @@  discard block
 block discarded – undo
364 364
         'user' => [
365 365
             'class' => User::class,
366 366
             'enableAutoLogin' => true,
367
-            'loginUrl' => ['/user/security/login'],
367
+            'loginUrl' => [ '/user/security/login' ],
368 368
             'identityClass' => UserModel::class,
369
-            'rootUsers' => ['admin']
369
+            'rootUsers' => [ 'admin' ]
370 370
         ],
371 371
         'urlManager' => [
372 372
             'class' => UrlManager::class,
@@ -402,18 +402,18 @@  discard block
 block discarded – undo
402 402
                         'auto_reload' => true
403 403
                     ],
404 404
                     'globals' => [
405
-                        'Html' => ['class' => Html::class],
406
-                        'Json' => ['class' => Json::class],
407
-                        'Tree' => ['class' => Tree::class],
408
-                        'FA' => ['class' => FA::class],
409
-                        'Url' => ['class' => Url::class],
410
-                        'Markdown' => ['class' => Markdown::class]
405
+                        'Html' => [ 'class' => Html::class ],
406
+                        'Json' => [ 'class' => Json::class ],
407
+                        'Tree' => [ 'class' => Tree::class ],
408
+                        'FA' => [ 'class' => FA::class ],
409
+                        'Url' => [ 'class' => Url::class ],
410
+                        'Markdown' => [ 'class' => Markdown::class ]
411 411
                     ],
412 412
                     'functions' => [
413
-                        'image' => function ($imageSource, $preset = '') {
413
+                        'image' => function($imageSource, $preset = '') {
414 414
                             return ImageUrlHelper::image($imageSource, $preset);
415 415
                         },
416
-                        't' => function ($category, $message, $params = [], $language = null) {
416
+                        't' => function($category, $message, $params = [ ], $language = null) {
417 417
                             return Yii::t($category, $message, $params, $language);
418 418
                         }
419 419
                     ],
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
     'modules' => [
428 428
         'audit' => [
429 429
             'class' => AuditModule::class,
430
-            'accessRoles' => ['audit-module'],
430
+            'accessRoles' => [ 'audit-module' ],
431 431
             'layout' => $boxLayout,
432 432
             'panels' => [
433 433
                 'audit/trail' => [
@@ -529,12 +529,12 @@  discard block
 block discarded – undo
529 529
                 [
530 530
                     'connection' => 'db',
531 531
                     'table' => '{{%hrzg_widget_template}}',
532
-                    'columns' => ['twig_template']
532
+                    'columns' => [ 'twig_template' ]
533 533
                 ],
534 534
                 [
535 535
                     'connection' => 'db',
536 536
                     'table' => '{{%twig}}',
537
-                    'columns' => ['value']
537
+                    'columns' => [ 'value' ]
538 538
                 ]
539 539
             ],
540 540
             'scanners' => [
@@ -543,8 +543,8 @@  discard block
 block discarded – undo
543 543
                 ScannerJavaScriptFunction::class,
544 544
                 ScannerDatabase::class
545 545
             ],
546
-            'allowedIPs' => ['*'],
547
-            'roles' => ['translate-module']
546
+            'allowedIPs' => [ '*' ],
547
+            'roles' => [ 'translate-module' ]
548 548
         ],
549 549
         'user' => [
550 550
             'class' => UserModule::class,
@@ -552,12 +552,12 @@  discard block
 block discarded – undo
552 552
             'enableGdprCompliance' => true,
553 553
             'defaultRoute' => 'admin',
554 554
             'administratorPermissionName' => 'user-module',
555
-            'administrators' => ['admin'],
555
+            'administrators' => [ 'admin' ],
556 556
             'enableFlashMessages' => false,
557 557
             'generatePasswords' => true,
558 558
             'enableRegistration' => getenv('APP_USER_ENABLE_REGISTRATION'),
559 559
             'mailParams' => [
560
-                'fromEmail' => [getenv('APP_MAILER_FROM')=>getenv('APP_TITLE')]
560
+                'fromEmail' => [ getenv('APP_MAILER_FROM')=>getenv('APP_TITLE') ]
561 561
             ],
562 562
         ],
563 563
         'widgets' => [
@@ -572,16 +572,16 @@  discard block
 block discarded – undo
572 572
 ];
573 573
 
574 574
 if ($s3Enabled) {
575
-    $common['components']['fsS3'] = [
575
+    $common[ 'components' ][ 'fsS3' ] = [
576 576
         'class' => AwsS3Filesystem::class,
577 577
         'key' => getenv('AMAZON_S3_BUCKET_PUBLIC_KEY'),
578 578
         'secret' => getenv('AMAZON_S3_BUCKET_SECRET_KEY'),
579 579
         'bucket' => getenv('AMAZON_S3_BUCKET_NAME'),
580
-        'prefix' => getenv('APP_NAME') . '/public',
580
+        'prefix' => getenv('APP_NAME').'/public',
581 581
         'region' => getenv('AMAZON_S3_BUCKET_REGION')
582 582
     ];
583 583
 
584
-    $common['modules']['filefly']['filesystemComponents']['s3'] = 'fsS3';
584
+    $common[ 'modules' ][ 'filefly' ][ 'filesystemComponents' ][ 's3' ] = 'fsS3';
585 585
 }
586 586
 
587 587
 return $common;
Please login to merge, or discard this patch.