Completed
Push — master ( 9bb0f0...900abb )
by Tobias
23:10 queued 08:03
created
src/views/layouts/main.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -31,11 +31,11 @@  discard block
 block discarded – undo
31 31
     \yii\base\Event::on(
32 32
         \yii\web\View::className(),
33 33
         \yii\web\View::EVENT_AFTER_RENDER,
34
-        function ($e) {
34
+        function($e) {
35 35
             // disable unbundled asset
36
-            $e->sender->assetBundles['yii\\bootstrap\\BootstrapAsset'] = null;
36
+            $e->sender->assetBundles[ 'yii\\bootstrap\\BootstrapAsset' ] = null;
37 37
             // disable bundled asset
38
-            $e->sender->assetBundles['bootstrap'] = null;
38
+            $e->sender->assetBundles[ 'bootstrap' ] = null;
39 39
         }
40 40
     );
41 41
 }
@@ -43,16 +43,16 @@  discard block
 block discarded – undo
43 43
 // SEO
44 44
 $route = Url::toRoute(Yii::$app->controller->action->uniqueId);
45 45
 if ($keywords = \Yii::$app->settings->get($route, 'app.seo.keywords', null)) {
46
-    $this->registerMetaTag(['name' => 'keywords', 'content' => $keywords]);
46
+    $this->registerMetaTag([ 'name' => 'keywords', 'content' => $keywords ]);
47 47
 }
48 48
 if ($description = \Yii::$app->settings->get($route, 'app.seo.descriptions', null)) {
49
-    $this->registerMetaTag(['name' => 'description', 'content' => $description]);
49
+    $this->registerMetaTag([ 'name' => 'description', 'content' => $description ]);
50 50
 }
51 51
 if ($title = \Yii::$app->settings->get($route, 'app.seo.titles', null)) {
52 52
     $this->title = $title;
53 53
 }
54 54
 if ($favicon = \Yii::$app->settings->get('faviconPng', 'app.assets', null)) {
55
-    $this->registerLinkTag(['rel' => 'shortcut icon', 'type' => 'image/png', 'href' => $favicon]);
55
+    $this->registerLinkTag([ 'rel' => 'shortcut icon', 'type' => 'image/png', 'href' => $favicon ]);
56 56
 }
57 57
 
58 58
 ?>
@@ -79,12 +79,12 @@  discard block
 block discarded – undo
79 79
     'linkSelector' => '.frontend-reload',
80 80
 ]) ?>
81 81
 
82
-<?= TwigWidget::widget(['key' => '_beginBody', 'renderEmpty' => false]) ?>
82
+<?= TwigWidget::widget([ 'key' => '_beginBody', 'renderEmpty' => false ]) ?>
83 83
 
84 84
 <!-- Navbar -->
85 85
 <?php
86 86
 if (Yii::$app->settings->get('enableTwigNavbar', 'app.layout', false)) {
87
-    echo \dmstr\modules\prototype\widgets\TwigWidget::widget(['key' => '_navbar']);
87
+    echo \dmstr\modules\prototype\widgets\TwigWidget::widget([ 'key' => '_navbar' ]);
88 88
 } else {
89 89
     echo $this->render('_navbar');
90 90
 }
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 
101 101
 <!-- Footer -->
102 102
 <footer class="footer">
103
-    <?= Cell::widget(['id' => '_footer', 'requestParam' => '_global']) ?>
103
+    <?= Cell::widget([ 'id' => '_footer', 'requestParam' => '_global' ]) ?>
104 104
 </footer>
105 105
 
106 106
 <!-- Info Modal -->
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
         <?= Html::a(
111 111
             '<i class="fa fa-heartbeat"></i>',
112 112
             '#',
113
-            ['class' => 'text-muted', 'data-toggle' => 'modal', 'data-target' => '#phd-info-modal']
113
+            [ 'class' => 'text-muted', 'data-toggle' => 'modal', 'data-target' => '#phd-info-modal' ]
114 114
         ) ?>
115 115
     </p>
116 116
 </div>
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
     ],
131 131
 ]) ?>
132 132
 
133
-<?= TwigWidget::widget(['key' => '_endBody', 'renderEmpty' => false]) ?>
133
+<?= TwigWidget::widget([ 'key' => '_endBody', 'renderEmpty' => false ]) ?>
134 134
 
135 135
 <?php if (Yii::$app->user->can('backend_default_index')): ?>
136 136
     <?= Toolbar::widget([
Please login to merge, or discard this patch.
src/config/web.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@  discard block
 block discarded – undo
11 11
 
12 12
 // Settings for web-application only
13 13
 return [
14
-    'on registerMenuItems' => function ($event) {
15
-        Yii::$app->params['context.menuItems'] = \yii\helpers\ArrayHelper::merge(
16
-            Yii::$app->params['context.menuItems'],
14
+    'on registerMenuItems' => function($event) {
15
+        Yii::$app->params[ 'context.menuItems' ] = \yii\helpers\ArrayHelper::merge(
16
+            Yii::$app->params[ 'context.menuItems' ],
17 17
             $event->sender->getMenuItems()
18 18
         );
19 19
         $event->handled = true;
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
                 'web' => [
30 30
                     'class' => 'codemix\streamlog\Target',
31 31
                     'url' => 'php://stdout',
32
-                    'levels' => ['info', 'trace'],
33
-                    'logVars' => [],
32
+                    'levels' => [ 'info', 'trace' ],
33
+                    'logVars' => [ ],
34 34
                     'replaceNewline' => YII_DEBUG ? null : '',
35 35
                     'enabled' => YII_DEBUG && !YII_ENV_TEST,
36 36
                 ],
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
         'settings' => [
51 51
             'class' => 'pheme\settings\Module',
52 52
             'layout' => '@backend/views/layouts/box',
53
-            'accessRoles' => ['settings-module'],
53
+            'accessRoles' => [ 'settings-module' ],
54 54
         ],
55 55
     ],
56 56
 ];
Please login to merge, or discard this patch.
src/config/env.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -11,16 +11,16 @@  discard block
 block discarded – undo
11 11
 
12 12
 use yii\helpers\FileHelper;
13 13
 
14
-$srcPath = __DIR__ . '/..';
14
+$srcPath = __DIR__.'/..';
15 15
 
16 16
 // Load default settings via dotenv from file, load local environment first, if available
17 17
 if (getenv('ENV_LOCAL_FILE')) {
18
-    $localEnv = FileHelper::normalizePath($srcPath . '/' . getenv('ENV_LOCAL_FILE'));
18
+    $localEnv = FileHelper::normalizePath($srcPath.'/'.getenv('ENV_LOCAL_FILE'));
19 19
     if (is_file($localEnv)) {
20 20
         $dotenvLocal = new Dotenv\Dotenv($srcPath, getenv('ENV_LOCAL_FILE'));
21 21
         $dotenvLocal->load();
22 22
     } else {
23
-        exit("Error: ENV_LOCAL_FILE '{$localEnv}' not found" . PHP_EOL);
23
+        exit("Error: ENV_LOCAL_FILE '{$localEnv}' not found".PHP_EOL);
24 24
     }
25 25
 }
26 26
 
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 $dotenv->load();
30 30
 
31 31
 // Basic checks & validation
32
-$dotenv->required('YII_DEBUG', ['', '0', '1', 'true', true]);
33
-$dotenv->required('YII_ENV', ['dev', 'prod', 'test']);
32
+$dotenv->required('YII_DEBUG', [ '', '0', '1', 'true', true ]);
33
+$dotenv->required('YII_ENV', [ 'dev', 'prod', 'test' ]);
34 34
 $dotenv->required([
35 35
     'YII_TRACE_LEVEL',
36 36
     'APP_NAME',
Please login to merge, or discard this patch.
migrations/legacy/migration-command/m000508_053522_fix_migration_table.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
     public function safeUp()
14 14
     {
15 15
         $table = $this->db->schema->getTableSchema('{{%migration}}');
16
-        if (isset($table->columns['alias'])) {
16
+        if (isset($table->columns[ 'alias' ])) {
17 17
             // Column exists
18 18
             $this->alterColumn('{{%migration}}', 'alias', 'varchar(180) DEFAULT NULL');
19 19
         }
Please login to merge, or discard this patch.
src/config/console.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -19,22 +19,22 @@  discard block
 block discarded – undo
19 19
         'db' => [
20 20
             'class' => \dmstr\console\controllers\MysqlController::class,
21 21
             'noDataTables' => [
22
-                getenv('DATABASE_TABLE_PREFIX') . 'auth_assignment',
23
-                getenv('DATABASE_TABLE_PREFIX') . 'migration',
24
-                getenv('DATABASE_TABLE_PREFIX') . 'user',
25
-                getenv('DATABASE_TABLE_PREFIX') . 'profile',
26
-                getenv('DATABASE_TABLE_PREFIX') . 'token',
27
-                getenv('DATABASE_TABLE_PREFIX') . 'social_account',
28
-                getenv('DATABASE_TABLE_PREFIX') . 'log',
29
-                getenv('DATABASE_TABLE_PREFIX') . 'session',
30
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_data',
31
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_entry',
32
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_error',
33
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_javascript',
34
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_mail',
35
-                getenv('DATABASE_TABLE_PREFIX') . 'audit_trail',
36
-                getenv('DATABASE_TABLE_PREFIX') . 'dmstr_contact_log',
37
-                getenv('DATABASE_TABLE_PREFIX') . 'queue_manager',
22
+                getenv('DATABASE_TABLE_PREFIX').'auth_assignment',
23
+                getenv('DATABASE_TABLE_PREFIX').'migration',
24
+                getenv('DATABASE_TABLE_PREFIX').'user',
25
+                getenv('DATABASE_TABLE_PREFIX').'profile',
26
+                getenv('DATABASE_TABLE_PREFIX').'token',
27
+                getenv('DATABASE_TABLE_PREFIX').'social_account',
28
+                getenv('DATABASE_TABLE_PREFIX').'log',
29
+                getenv('DATABASE_TABLE_PREFIX').'session',
30
+                getenv('DATABASE_TABLE_PREFIX').'audit_data',
31
+                getenv('DATABASE_TABLE_PREFIX').'audit_entry',
32
+                getenv('DATABASE_TABLE_PREFIX').'audit_error',
33
+                getenv('DATABASE_TABLE_PREFIX').'audit_javascript',
34
+                getenv('DATABASE_TABLE_PREFIX').'audit_mail',
35
+                getenv('DATABASE_TABLE_PREFIX').'audit_trail',
36
+                getenv('DATABASE_TABLE_PREFIX').'dmstr_contact_log',
37
+                getenv('DATABASE_TABLE_PREFIX').'queue_manager',
38 38
                 'filefly_hashmap', # TODO: fix prefix in module
39 39
             ],
40 40
         ],
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
                     'class' => \yii\log\FileTarget::class,
77 77
                     'logFile' => '@runtime/logs/console.log',
78 78
                     //'levels' => ['info', 'trace'],
79
-                    'logVars' => [],
79
+                    'logVars' => [ ],
80 80
                     'dirMode' => YII_ENV_DEV ? 0777 : 0775,
81 81
                     'fileMode' => YII_ENV_DEV ? 0666 : null,
82 82
                     'enabled' => YII_DEBUG && !YII_ENV_TEST,
Please login to merge, or discard this patch.
src/config/common.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -17,10 +17,10 @@  discard block
 block discarded – undo
17 17
 $languages = explode(',', getenv('APP_LANGUAGES'));
18 18
 
19 19
 // prepare asset bundle config
20
-$bundles = [];
20
+$bundles = [ ];
21 21
 if (getenv('APP_ASSET_USE_BUNDLED')) {
22 22
     // include generated asset-bundle configuration
23
-    $bundles = include Yii::getAlias('@web/bundles') . '/config.php';
23
+    $bundles = include Yii::getAlias('@web/bundles').'/config.php';
24 24
     // disable loading of bundles skin file, when using bundled assets
25 25
     Yii::$container->set(
26 26
         AdminLteAsset::className(),
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 return [
43 43
     'id' => 'app',
44 44
     'name' => getenv('APP_TITLE'),
45
-    'language' => $languages[0],
46
-    'basePath' => realpath(__DIR__ . '/..'),
45
+    'language' => $languages[ 0 ],
46
+    'basePath' => realpath(__DIR__.'/..'),
47 47
     'vendorPath' => '@app/../vendor',
48 48
     'runtimePath' => '@app/../runtime',
49 49
     // Bootstrapped modules are loaded in every request
@@ -60,8 +60,8 @@  discard block
 block discarded – undo
60 60
     ],
61 61
     'params' => [
62 62
         'adminEmail' => getenv('APP_ADMIN_EMAIL'),
63
-        'context.menuItems' => [],
64
-        'backend.iframe.name' => 'backend-' . getenv('HOSTNAME'),
63
+        'context.menuItems' => [ ],
64
+        'backend.iframe.name' => 'backend-'.getenv('HOSTNAME'),
65 65
     ],
66 66
     'components' => [
67 67
         'assetManager' => [
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
         ],
74 74
         'authManager' => [
75 75
             'class' => \dektrium\rbac\components\DbManager::class,
76
-            'defaultRoles' => ['Default'],
76
+            'defaultRoles' => [ 'Default' ],
77 77
         ],
78 78
         'cache' => getenv('APP_NO_CACHE') ? null : [
79 79
             'class' => \yii\redis\Cache::class,
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
             'key' => getenv('AMAZON_S3_BUCKET_PUBLIC_KEY'),
97 97
             'secret' => getenv('AMAZON_S3_BUCKET_SECRET_KEY'),
98 98
             'bucket' => getenv('AMAZON_S3_BUCKET_NAME'),
99
-            'prefix' => getenv('APP_NAME') . '/public',
99
+            'prefix' => getenv('APP_NAME').'/public',
100 100
             'region' => getenv('AMAZON_S3_BUCKET_REGION'),
101 101
         ],
102 102
         'fsRuntime' => [
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
121 121
                 'common' => [
122 122
                     'class' => \codemix\streamlog\Target::class,
123 123
                     'url' => 'php://stderr',
124
-                    'levels' => ['error', 'warning'],
125
-                    'logVars' => [],
124
+                    'levels' => [ 'error', 'warning' ],
125
+                    'logVars' => [ ],
126 126
                     'replaceNewline' => (APP_TYPE == 'console') ? null : '',
127 127
                 ],
128 128
             ],
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
157 157
         'user' => [
158 158
             'class' => \dmstr\web\User::class,
159 159
             'enableAutoLogin' => true,
160
-            'loginUrl' => ['/user/security/login'],
160
+            'loginUrl' => [ '/user/security/login' ],
161 161
             'identityClass' => \dektrium\user\models\User::class,
162
-            'rootUsers' => ['admin'],
162
+            'rootUsers' => [ 'admin' ],
163 163
         ],
164 164
         'urlManager' => [
165 165
             'class' => \codemix\localeurls\UrlManager::class,
@@ -190,24 +190,24 @@  discard block
 block discarded – undo
190 190
                         'auto_reload' => true,
191 191
                     ],
192 192
                     'globals' => [
193
-                        'Html' => ['class' => \yii\helpers\Html::class],
194
-                        'Json' => ['class' => \yii\helpers\Json::class],
195
-                        'Tree' => ['class' => \dmstr\modules\pages\models\Tree::class],
196
-                        'FA' => ['class' => \rmrevin\yii\fontawesome\FA::class],
197
-                        'FileUrl' => ['class' => \hrzg\filemanager\helpers\Url::class],
198
-                        'Url' => ['class' => \yii\helpers\Url::class],
193
+                        'Html' => [ 'class' => \yii\helpers\Html::class ],
194
+                        'Json' => [ 'class' => \yii\helpers\Json::class ],
195
+                        'Tree' => [ 'class' => \dmstr\modules\pages\models\Tree::class ],
196
+                        'FA' => [ 'class' => \rmrevin\yii\fontawesome\FA::class ],
197
+                        'FileUrl' => [ 'class' => \hrzg\filemanager\helpers\Url::class ],
198
+                        'Url' => [ 'class' => \yii\helpers\Url::class ],
199 199
                     ],
200 200
                     'functions' => [
201
-                        'image' => function ($imageSource, $preset = null) {
201
+                        'image' => function($imageSource, $preset = null) {
202 202
                             // preset example, when using imageproxy, https://github.com/willnorris/imageproxy#examples
203 203
                             if (getenv('IMAGEPROXY_SIGNATURE_KEY')) {
204 204
                                 $key = getenv('IMAGEPROXY_SIGNATURE_KEY');
205
-                                $preset .= ',s' . strtr(base64_encode(hash_hmac('sha256', $imageSource, $key, 1)), '/+', '_-');
205
+                                $preset .= ',s'.strtr(base64_encode(hash_hmac('sha256', $imageSource, $key, 1)), '/+', '_-');
206 206
                             }
207
-                            return Yii::$app->settings->get('imgBaseUrl', 'app.frontend') .
208
-                                $preset .
209
-                                Yii::$app->settings->get('imgHostPrefix', 'app.frontend') .
210
-                                $imageSource .
207
+                            return Yii::$app->settings->get('imgBaseUrl', 'app.frontend').
208
+                                $preset.
209
+                                Yii::$app->settings->get('imgHostPrefix', 'app.frontend').
210
+                                $imageSource.
211 211
                                 Yii::$app->settings->get('imgHostSuffix', 'app.frontend');
212 212
                         },
213 213
                     ],
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
     'modules' => [
222 222
         'audit' => [
223 223
             'class' => \bedezign\yii2\audit\Audit::class,
224
-            'accessRoles' => ['audit-module'],
224
+            'accessRoles' => [ 'audit-module' ],
225 225
             'layout' => '@backend/views/layouts/box',
226 226
             'panels' => [
227 227
                 'audit/request',
@@ -229,9 +229,9 @@  discard block
 block discarded – undo
229 229
                 'audit/trail',
230 230
                 'audit/javascript', # enable app.assets.registerJSLoggingAsset via settings
231 231
                 // These provide special functionality and get loaded to activate it
232
-                'audit/error',      // Links the extra error reporting functions (`exception()` and `errorMessage()`)
233
-                'audit/extra',      // Links the data functions (`data()`)
234
-                'audit/curl',       // Links the curl tracking function (`curlBegin()`, `curlEnd()` and `curlExec()`)
232
+                'audit/error', // Links the extra error reporting functions (`exception()` and `errorMessage()`)
233
+                'audit/extra', // Links the data functions (`data()`)
234
+                'audit/curl', // Links the curl tracking function (`curlBegin()`, `curlEnd()` and `curlExec()`)
235 235
                 //'audit/db',
236 236
                 //'audit/log',
237 237
                 //'audit/profiling',
@@ -308,15 +308,15 @@  discard block
 block discarded – undo
308 308
             'class' => \lajax\translatemanager\Module::class,
309 309
             'root' => '@app/views',
310 310
             'layout' => '@backend/views/layouts/box',
311
-            'allowedIPs' => ['*'],
312
-            'roles' => ['translate-module'],
311
+            'allowedIPs' => [ '*' ],
312
+            'roles' => [ 'translate-module' ],
313 313
         ],
314 314
         'user' => [
315 315
             'class' => \dektrium\user\Module::class,
316 316
             'layout' => '@app/views/layouts/container',
317 317
             'defaultRoute' => 'admin',
318 318
             'adminPermission' => 'user-module',
319
-            'admins' => ['admin'], // TODO: see https://github.com/dektrium/yii2-user/issues/1016
319
+            'admins' => [ 'admin' ], // TODO: see https://github.com/dektrium/yii2-user/issues/1016
320 320
             'enableFlashMessages' => false,
321 321
             'enableRegistration' => getenv('APP_USER_ENABLE_REGISTRATION'),
322 322
         ],
Please login to merge, or discard this patch.