@@ -31,11 +31,11 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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([ |
@@ -11,9 +11,9 @@ discard block |
||
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 |
||
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 |
||
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 | ]; |
@@ -17,10 +17,10 @@ discard block |
||
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(), |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | |
33 | 33 | // set redis connection |
34 | 34 | \Resque::setBackend( |
35 | - getenv('REDIS_PORT_6379_TCP_ADDR') . ':' . |
|
35 | + getenv('REDIS_PORT_6379_TCP_ADDR').':'. |
|
36 | 36 | getenv('REDIS_PORT_6379_TCP_PORT') |
37 | 37 | ); |
38 | 38 | |
@@ -48,8 +48,8 @@ discard block |
||
48 | 48 | return [ |
49 | 49 | 'id' => 'app', |
50 | 50 | 'name' => getenv('APP_TITLE'), |
51 | - 'language' => $languages[0], |
|
52 | - 'basePath' => realpath(__DIR__ . '/..'), |
|
51 | + 'language' => $languages[ 0 ], |
|
52 | + 'basePath' => realpath(__DIR__.'/..'), |
|
53 | 53 | 'vendorPath' => '@app/../vendor', |
54 | 54 | 'runtimePath' => '@app/../runtime', |
55 | 55 | // Bootstrapped modules are loaded in every request |
@@ -65,8 +65,8 @@ discard block |
||
65 | 65 | ], |
66 | 66 | 'params' => [ |
67 | 67 | 'adminEmail' => getenv('APP_ADMIN_EMAIL'), |
68 | - 'context.menuItems' => [], |
|
69 | - 'backend.iframe.name' => 'backend-' . getenv('HOSTNAME'), |
|
68 | + 'context.menuItems' => [ ], |
|
69 | + 'backend.iframe.name' => 'backend-'.getenv('HOSTNAME'), |
|
70 | 70 | ], |
71 | 71 | 'components' => [ |
72 | 72 | 'assetManager' => [ |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | ], |
79 | 79 | 'authManager' => [ |
80 | 80 | 'class' => \dektrium\rbac\components\DbManager::class, |
81 | - 'defaultRoles' => ['Default'], |
|
81 | + 'defaultRoles' => [ 'Default' ], |
|
82 | 82 | ], |
83 | 83 | 'cache' => getenv('APP_NO_CACHE') ? null : [ |
84 | 84 | 'class' => \yii\redis\Cache::class, |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | 'key' => getenv('AMAZON_S3_BUCKET_PUBLIC_KEY'), |
102 | 102 | 'secret' => getenv('AMAZON_S3_BUCKET_SECRET_KEY'), |
103 | 103 | 'bucket' => getenv('AMAZON_S3_BUCKET_NAME'), |
104 | - 'prefix' => getenv('APP_NAME') . '/public', |
|
104 | + 'prefix' => getenv('APP_NAME').'/public', |
|
105 | 105 | 'region' => getenv('AMAZON_S3_BUCKET_REGION'), |
106 | 106 | ], |
107 | 107 | 'fsRuntime' => [ |
@@ -126,8 +126,8 @@ discard block |
||
126 | 126 | 'common' => [ |
127 | 127 | 'class' => \codemix\streamlog\Target::class, |
128 | 128 | 'url' => 'php://stderr', |
129 | - 'levels' => ['error', 'warning'], |
|
130 | - 'logVars' => [], |
|
129 | + 'levels' => [ 'error', 'warning' ], |
|
130 | + 'logVars' => [ ], |
|
131 | 131 | 'replaceNewline' => (APP_TYPE == 'console') ? null : '', |
132 | 132 | ], |
133 | 133 | ], |
@@ -157,9 +157,9 @@ discard block |
||
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,20 +190,20 @@ discard block |
||
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 | - return Yii::$app->settings->get('imgBaseUrl', 'app.frontend') . |
|
204 | - $preset . |
|
205 | - Yii::$app->settings->get('imgHostPrefix', 'app.frontend') . |
|
206 | - $imageSource . |
|
203 | + return Yii::$app->settings->get('imgBaseUrl', 'app.frontend'). |
|
204 | + $preset. |
|
205 | + Yii::$app->settings->get('imgHostPrefix', 'app.frontend'). |
|
206 | + $imageSource. |
|
207 | 207 | Yii::$app->settings->get('imgHostSuffix', 'app.frontend'); |
208 | 208 | }, |
209 | 209 | ], |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | 'modules' => [ |
218 | 218 | 'audit' => [ |
219 | 219 | 'class' => \bedezign\yii2\audit\Audit::class, |
220 | - 'accessRoles' => ['audit-module'], |
|
220 | + 'accessRoles' => [ 'audit-module' ], |
|
221 | 221 | 'layout' => '@backend/views/layouts/box', |
222 | 222 | 'panels' => [ |
223 | 223 | 'audit/request', |
@@ -225,9 +225,9 @@ discard block |
||
225 | 225 | 'audit/trail', |
226 | 226 | 'audit/javascript', # enable app.assets.registerJSLoggingAsset via settings |
227 | 227 | // These provide special functionality and get loaded to activate it |
228 | - 'audit/error', // Links the extra error reporting functions (`exception()` and `errorMessage()`) |
|
229 | - 'audit/extra', // Links the data functions (`data()`) |
|
230 | - 'audit/curl', // Links the curl tracking function (`curlBegin()`, `curlEnd()` and `curlExec()`) |
|
228 | + 'audit/error', // Links the extra error reporting functions (`exception()` and `errorMessage()`) |
|
229 | + 'audit/extra', // Links the data functions (`data()`) |
|
230 | + 'audit/curl', // Links the curl tracking function (`curlBegin()`, `curlEnd()` and `curlExec()`) |
|
231 | 231 | //'audit/db', |
232 | 232 | //'audit/log', |
233 | 233 | //'audit/profiling', |
@@ -295,15 +295,15 @@ discard block |
||
295 | 295 | 'class' => \lajax\translatemanager\Module::class, |
296 | 296 | 'root' => '@app/views', |
297 | 297 | 'layout' => '@backend/views/layouts/box', |
298 | - 'allowedIPs' => ['*'], |
|
299 | - 'roles' => ['translate-module'], |
|
298 | + 'allowedIPs' => [ '*' ], |
|
299 | + 'roles' => [ 'translate-module' ], |
|
300 | 300 | ], |
301 | 301 | 'user' => [ |
302 | 302 | 'class' => \dektrium\user\Module::class, |
303 | 303 | 'layout' => '@app/views/layouts/container', |
304 | 304 | 'defaultRoute' => 'admin', |
305 | 305 | 'adminPermission' => 'user-module', |
306 | - 'admins' => ['admin'], // TODO: see https://github.com/dektrium/yii2-user/issues/1016 |
|
306 | + 'admins' => [ 'admin' ], // TODO: see https://github.com/dektrium/yii2-user/issues/1016 |
|
307 | 307 | 'enableFlashMessages' => false, |
308 | 308 | 'enableRegistration' => getenv('APP_USER_ENABLE_REGISTRATION'), |
309 | 309 | ], |
@@ -11,16 +11,16 @@ discard block |
||
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 |
||
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', |
@@ -19,21 +19,21 @@ discard block |
||
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', |
|
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 | 37 | 'filefly_hashmap', # TODO: fix prefix in module |
38 | 38 | ], |
39 | 39 | ], |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | 'class' => \yii\log\FileTarget::class, |
81 | 81 | 'logFile' => '@runtime/logs/console.log', |
82 | 82 | //'levels' => ['info', 'trace'], |
83 | - 'logVars' => [], |
|
83 | + 'logVars' => [ ], |
|
84 | 84 | 'dirMode' => YII_ENV_DEV ? 0777 : 0775, |
85 | 85 | 'fileMode' => YII_ENV_DEV ? 0666 : null, |
86 | 86 | 'enabled' => YII_DEBUG && !YII_ENV_TEST, |
@@ -13,7 +13,7 @@ |
||
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 | } |