Completed
Push — master ( 2f2169...9f79b1 )
by Tobias
12:46
created
config/main.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 use Yii;
15 15
 
16 16
 // PHP Constants
17
-$version = is_file(__DIR__ . '/../src/version') ? trim(file_get_contents(__DIR__ . '/../src/version')) : 'dev';
17
+$version = is_file(__DIR__.'/../src/version') ? trim(file_get_contents(__DIR__.'/../src/version')) : 'dev';
18 18
 defined('APP_VERSION') or define('APP_VERSION', $version);
19 19
 $projectVersion = is_file(__DIR__.'/../project/version') ? trim(file_get_contents(__DIR__.'/../project/version')) : 'vanilla';
20 20
 defined('PROJECT_VERSION') or define('PROJECT_VERSION', $projectVersion);
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 Yii::setAlias('@webroot', '@root/web');
28 28
 
29 29
 // Use a closure to not pollute the global namespace
30
-return call_user_func(function () {
30
+return call_user_func(function() {
31 31
 
32 32
     /*function checkFile(){
33 33
         if (file_exists($file)) {
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
         "{$configDir}/".APP_TYPE.'.php' => true,
42 42
         "{$configDir}/common-".YII_ENV.'.php' => false,
43 43
         "{$configDir}/".APP_TYPE.'-'.YII_ENV.'.php' => false,
44
-        "{$configDir}/common-".((YII_DEBUG)?'debug':'release').'.php' => false,
45
-        "{$configDir}/".APP_TYPE.'-'.((YII_DEBUG)?'debug':'release').'.php' => false,
44
+        "{$configDir}/common-".((YII_DEBUG) ? 'debug' : 'release').'.php' => false,
45
+        "{$configDir}/".APP_TYPE.'-'.((YII_DEBUG) ? 'debug' : 'release').'.php' => false,
46 46
     ];
47 47
 
48 48
     if (!empty(getenv('APP_CONFIG_FILE'))) {
@@ -50,12 +50,12 @@  discard block
 block discarded – undo
50 50
         // Merge additional configurations
51 51
         foreach ($additionalConfigFiles as $alias) {
52 52
             $file = Yii::getAlias($alias);
53
-            $configFiles[$file] = true;
53
+            $configFiles[ $file ] = true;
54 54
         }
55 55
     }
56 56
 
57 57
     // Merge configurations
58
-    $config = [];
58
+    $config = [ ];
59 59
     Yii::trace($configFiles, __METHOD__);
60 60
     foreach ($configFiles as $file => $isRequired) {
61 61
         if (!is_file($file)) {
Please login to merge, or discard this patch.
config/common.php 1 patch
Spacing   +34 added lines, -34 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,11 +97,11 @@  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 106
     $table_name = getenv('DATABASE_TABLE_PREFIX').'queue_manager';
107 107
     if (Yii::$app->cache->get('queue_id_synced') !== true) {
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 return [
129 129
     'id' => 'app',
130 130
     'name' => getenv('APP_TITLE'),
131
-    'language' => $languages[0],
131
+    'language' => $languages[ 0 ],
132 132
     'basePath' => '@app',
133 133
     'vendorPath' => '@root/vendor',
134 134
     'runtimePath' => '@root/runtime',
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
     ],
147 147
     'params' => [
148 148
         'adminEmail' => getenv('APP_ADMIN_EMAIL'),
149
-        'context.menuItems' => [],
149
+        'context.menuItems' => [ ],
150 150
         'backend.iframe.name' => getenv('APP_PARAMS_BACKEND_IFRAME_NAME') ?: '_self',
151 151
         'backend.browserSupport' => [
152 152
             'Chrome' => 87,
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
     'container' => [
163 163
         'definitions' => [
164 164
             AuthDbManagerComponent::class => [
165
-                'defaultRoles' => ['Default'],
165
+                'defaultRoles' => [ 'Default' ],
166 166
                 'cache' => 'cache'
167 167
             ],
168 168
             AdminController::class => [
@@ -186,12 +186,12 @@  discard block
 block discarded – undo
186 186
                     'rules' => [
187 187
                         [
188 188
                             'allow' => true,
189
-                            'actions' => ['index'],
190
-                            'roles' => ['@'],
189
+                            'actions' => [ 'index' ],
190
+                            'roles' => [ '@' ],
191 191
                         ],
192 192
                         [
193 193
                             'allow' => true,
194
-                            'actions' => ['show'],
194
+                            'actions' => [ 'show' ],
195 195
                             // allow for all logged in users
196 196
                             #'roles' => ['@'],
197 197
                             // allow only if user has 'user' grant or requested his own profile (check by user->id)
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
                                 if (\Yii::$app->user->can('user')) {
203 203
                                     return true;
204 204
                                 }
205
-                                if (\Yii::$app->user->id === (int)Yii::$app->request->getQueryParam('id')) {
205
+                                if (\Yii::$app->user->id === (int) Yii::$app->request->getQueryParam('id')) {
206 206
                                     return true;
207 207
                                 }
208 208
                                 return false;
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
             'converter' => [
224 224
                 'class' => 'yii\web\AssetConverter',
225 225
                 'commands' => [
226
-                    'less' => ['css', 'nodepkg-linuxstatic lessc {from} {to} --no-color --source-map'],
226
+                    'less' => [ 'css', 'nodepkg-linuxstatic lessc {from} {to} --no-color --source-map' ],
227 227
                 ],
228 228
             ],
229 229
         ],
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
             'key' => getenv('AMAZON_S3_BUCKET_PUBLIC_KEY'),
264 264
             'secret' => getenv('AMAZON_S3_BUCKET_SECRET_KEY'),
265 265
             'bucket' => getenv('AMAZON_S3_BUCKET_NAME'),
266
-            'prefix' => getenv('APP_NAME') . '/public',
266
+            'prefix' => getenv('APP_NAME').'/public',
267 267
             'region' => getenv('AMAZON_S3_BUCKET_REGION')
268 268
         ],
269 269
         'fsRuntime' => [
@@ -310,8 +310,8 @@  discard block
 block discarded – undo
310 310
                 'common' => [
311 311
                     'class' => Target::class,
312 312
                     'url' => 'php://stderr',
313
-                    'levels' => ['error', 'warning'],
314
-                    'logVars' => [],
313
+                    'levels' => [ 'error', 'warning' ],
314
+                    'logVars' => [ ],
315 315
                     'replaceNewline' => APP_TYPE === 'console' ? null : ''
316 316
                 ]
317 317
             ]
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
             'transport' => [
324 324
                 'scheme' => getenv('APP_MAILER_SCHEME') ?: 'smtp',
325 325
                 'host' => getenv('APP_MAILER_HOST'),
326
-                'port' => (int)getenv('APP_MAILER_PORT'),
326
+                'port' => (int) getenv('APP_MAILER_PORT'),
327 327
                 'encryption' => getenv('APP_MAILER_ENCRYPTION'),
328 328
                 'username' => getenv('APP_MAILER_USERNAME'),
329 329
                 'password' => getenv('APP_MAILER_PASSWORD')
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
                 'charset' => 'UTF-8',
333 333
                 'replyTo' => getenv('APP_MAILER_REPLY_TO'),
334 334
                 'returnPath' => getenv('APP_MAILER_RETURN_PATH'),
335
-                'from' => [getenv('APP_MAILER_FROM') => getenv('APP_TITLE')]
335
+                'from' => [ getenv('APP_MAILER_FROM') => getenv('APP_TITLE') ]
336 336
             ]
337 337
         ],
338 338
         'queue' => [
@@ -359,9 +359,9 @@  discard block
 block discarded – undo
359 359
         'user' => [
360 360
             'class' => User::class,
361 361
             'enableAutoLogin' => true,
362
-            'loginUrl' => ['/user/security/login'],
362
+            'loginUrl' => [ '/user/security/login' ],
363 363
             'identityClass' => UserModel::class,
364
-            'rootUsers' => ['admin']
364
+            'rootUsers' => [ 'admin' ]
365 365
         ],
366 366
         'urlManager' => [
367 367
             'class' => UrlManager::class,
@@ -396,18 +396,18 @@  discard block
 block discarded – undo
396 396
                         'auto_reload' => true
397 397
                     ],
398 398
                     'globals' => [
399
-                        'Html' => ['class' => Html::class],
400
-                        'Json' => ['class' => Json::class],
401
-                        'Tree' => ['class' => Tree::class],
402
-                        'FA' => ['class' => FA::class],
403
-                        'Url' => ['class' => Url::class],
404
-                        'Markdown' => ['class' => Markdown::class]
399
+                        'Html' => [ 'class' => Html::class ],
400
+                        'Json' => [ 'class' => Json::class ],
401
+                        'Tree' => [ 'class' => Tree::class ],
402
+                        'FA' => [ 'class' => FA::class ],
403
+                        'Url' => [ 'class' => Url::class ],
404
+                        'Markdown' => [ 'class' => Markdown::class ]
405 405
                     ],
406 406
                     'functions' => [
407
-                        'image' => function ($imageSource, $preset = '') {
407
+                        'image' => function($imageSource, $preset = '') {
408 408
                             return ImageUrlHelper::image($imageSource, $preset);
409 409
                         },
410
-                        't' => function ($category, $message, $params = [], $language = null) {
410
+                        't' => function($category, $message, $params = [ ], $language = null) {
411 411
                             return Yii::t($category, $message, $params, $language);
412 412
                         }
413 413
                     ],
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
     'modules' => [
422 422
         'audit' => [
423 423
             'class' => AuditModule::class,
424
-            'accessRoles' => ['audit-module'],
424
+            'accessRoles' => [ 'audit-module' ],
425 425
             'layout' => $boxLayout,
426 426
             'panels' => [
427 427
                 'audit/trail' => [
@@ -523,12 +523,12 @@  discard block
 block discarded – undo
523 523
                 [
524 524
                     'connection' => 'db',
525 525
                     'table' => '{{%hrzg_widget_template}}',
526
-                    'columns' => ['twig_template']
526
+                    'columns' => [ 'twig_template' ]
527 527
                 ],
528 528
                 [
529 529
                     'connection' => 'db',
530 530
                     'table' => '{{%twig}}',
531
-                    'columns' => ['value']
531
+                    'columns' => [ 'value' ]
532 532
                 ]
533 533
             ],
534 534
             'scanners' => [
@@ -537,8 +537,8 @@  discard block
 block discarded – undo
537 537
                 ScannerJavaScriptFunction::class,
538 538
                 ScannerDatabase::class
539 539
             ],
540
-            'allowedIPs' => ['*'],
541
-            'roles' => ['translate-module']
540
+            'allowedIPs' => [ '*' ],
541
+            'roles' => [ 'translate-module' ]
542 542
         ],
543 543
         'user' => [
544 544
             'class' => UserModule::class,
@@ -546,12 +546,12 @@  discard block
 block discarded – undo
546 546
             'enableGdprCompliance' => true,
547 547
             'defaultRoute' => 'admin',
548 548
             'administratorPermissionName' => 'user-module',
549
-            'administrators' => ['admin'],
549
+            'administrators' => [ 'admin' ],
550 550
             'enableFlashMessages' => false,
551 551
             'generatePasswords' => true,
552 552
             'enableRegistration' => getenv('APP_USER_ENABLE_REGISTRATION'),
553 553
             'mailParams' => [
554
-                'fromEmail' => [getenv('APP_MAILER_FROM')=>getenv('APP_TITLE')]
554
+                'fromEmail' => [ getenv('APP_MAILER_FROM')=>getenv('APP_TITLE') ]
555 555
             ],
556 556
         ],
557 557
         'widgets' => [
Please login to merge, or discard this patch.