@@ -6,8 +6,8 @@ discard block |
||
6 | 6 | use yii\bootstrap\NavBar; |
7 | 7 | |
8 | 8 | // initialize local variables |
9 | -$menuItems = []; |
|
10 | -$languageItems = []; |
|
9 | +$menuItems = [ ]; |
|
10 | +$languageItems = [ ]; |
|
11 | 11 | |
12 | 12 | // create label for dev and test environment |
13 | 13 | switch (YII_ENV) { |
@@ -21,22 +21,22 @@ discard block |
||
21 | 21 | $debugLabel = YII_DEBUG ? "<span class='label label-danger'>DEBUG</span>" : ''; |
22 | 22 | |
23 | 23 | // add env & debug label to menu |
24 | -$menuItems[] = [ |
|
24 | +$menuItems[ ] = [ |
|
25 | 25 | 'label' => $envLabel.' '.$debugLabel, |
26 | 26 | ]; |
27 | 27 | |
28 | 28 | // prepare languages |
29 | 29 | foreach (\Yii::$app->urlManager->languages as $language) { |
30 | - $languageItems[] = [ |
|
31 | - 'url' => ['/', \Yii::$app->urlManager->languageParam => $language], |
|
30 | + $languageItems[ ] = [ |
|
31 | + 'url' => [ '/', \Yii::$app->urlManager->languageParam => $language ], |
|
32 | 32 | 'label' => $language, |
33 | 33 | ]; |
34 | 34 | } |
35 | 35 | |
36 | 36 | // add language items to menu |
37 | -$menuItems[] = [ |
|
37 | +$menuItems[ ] = [ |
|
38 | 38 | 'label' => '<i class="glyphicon glyphicon-globe"></i> '.\Yii::$app->language, |
39 | - 'options' => ['id' => 'link-languages-menu'], |
|
39 | + 'options' => [ 'id' => 'link-languages-menu' ], |
|
40 | 40 | 'items' => $languageItems, |
41 | 41 | ]; |
42 | 42 | |
@@ -45,30 +45,30 @@ discard block |
||
45 | 45 | if (\Yii::$app->user->isGuest) { |
46 | 46 | // unauthorized users |
47 | 47 | //$menuItems[] = ['label' => 'Signup', 'url' => ['/user/registration/register']]; |
48 | - $menuItems[] = [ |
|
48 | + $menuItems[ ] = [ |
|
49 | 49 | 'label' => 'Login', |
50 | - 'url' => ['/user/security/login'], |
|
51 | - 'linkOptions' => ['id' => 'link-login'], |
|
50 | + 'url' => [ '/user/security/login' ], |
|
51 | + 'linkOptions' => [ 'id' => 'link-login' ], |
|
52 | 52 | ]; |
53 | 53 | } else { |
54 | 54 | // logged in users |
55 | - $menuItems[] = [ |
|
55 | + $menuItems[ ] = [ |
|
56 | 56 | 'label' => '<i class="glyphicon glyphicon-user"></i> '.\Yii::$app->user->identity->username, |
57 | - 'options' => ['id' => 'link-user-menu'], |
|
57 | + 'options' => [ 'id' => 'link-user-menu' ], |
|
58 | 58 | 'items' => [ |
59 | 59 | [ |
60 | 60 | 'label' => '<i class="glyphicon glyphicon-user"></i> Profile', |
61 | - 'url' => ['/user/profile/show', 'id' => \Yii::$app->user->id], |
|
61 | + 'url' => [ '/user/profile/show', 'id' => \Yii::$app->user->id ], |
|
62 | 62 | ], |
63 | 63 | [ |
64 | 64 | 'label' => '<i class="glyphicon glyphicon-cog"></i> Settings', |
65 | - 'url' => ['/user/settings/profile'], |
|
65 | + 'url' => [ '/user/settings/profile' ], |
|
66 | 66 | ], |
67 | 67 | '<li class="divider"></li>', |
68 | 68 | [ |
69 | 69 | 'label' => '<i class="glyphicon glyphicon-log-out"></i> Logout', |
70 | - 'url' => ['/user/security/logout'], |
|
71 | - 'linkOptions' => ['data-method' => 'post', 'id' => 'link-logout'], |
|
70 | + 'url' => [ '/user/security/logout' ], |
|
71 | + 'linkOptions' => [ 'data-method' => 'post', 'id' => 'link-logout' ], |
|
72 | 72 | ], |
73 | 73 | ], |
74 | 74 | ]; |
@@ -78,18 +78,18 @@ discard block |
||
78 | 78 | 'key' => 'frontend.extra.menuItems', |
79 | 79 | 'renderEmpty' => false, |
80 | 80 | ]); |
81 | - $menuItems[] = '<li>'.$extraButtons.'</li>'; |
|
81 | + $menuItems[ ] = '<li>'.$extraButtons.'</li>'; |
|
82 | 82 | |
83 | 83 | // context menu |
84 | - $menuItems[] = [ |
|
84 | + $menuItems[ ] = [ |
|
85 | 85 | 'label' => '<i class="glyphicon glyphicon-pencil"></i>', |
86 | - 'visible' => \Yii::$app->user->can('backend_default_index', ['route' => true]), |
|
87 | - 'items' => \Yii::$app->params['context.menuItems'], |
|
86 | + 'visible' => \Yii::$app->user->can('backend_default_index', [ 'route' => true ]), |
|
87 | + 'items' => \Yii::$app->params[ 'context.menuItems' ], |
|
88 | 88 | ]; |
89 | 89 | |
90 | 90 | $backendMenu = \dmstr\widgets\Menu::widget( |
91 | 91 | [ |
92 | - 'options' => ['class' => 'dropdown-menu'], |
|
92 | + 'options' => [ 'class' => 'dropdown-menu' ], |
|
93 | 93 | 'encodeLabels' => false, |
94 | 94 | 'items' => \dmstr\modules\pages\models\Tree::getMenuItems( |
95 | 95 | 'backend', |
@@ -98,10 +98,10 @@ discard block |
||
98 | 98 | ), |
99 | 99 | ] |
100 | 100 | ); |
101 | - $menuItems[] = [ |
|
101 | + $menuItems[ ] = [ |
|
102 | 102 | 'label' => '<i class="glyphicon glyphicon-dashboard"></i>', |
103 | - 'url' => ['/backend'], |
|
104 | - 'visible' => \Yii::$app->user->can('backend_default_index', ['route' => true]), |
|
103 | + 'url' => [ '/backend' ], |
|
104 | + 'visible' => \Yii::$app->user->can('backend_default_index', [ 'route' => true ]), |
|
105 | 105 | 'items' => $backendMenu, |
106 | 106 | ]; |
107 | 107 | } |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | // render root pages |
122 | 122 | echo Nav::widget( |
123 | 123 | [ |
124 | - 'options' => ['class' => 'navbar-nav'], |
|
124 | + 'options' => [ 'class' => 'navbar-nav' ], |
|
125 | 125 | 'encodeLabels' => false, |
126 | 126 | 'items' => \dmstr\modules\pages\models\Tree::getMenuItems('root'), |
127 | 127 | ] |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | // render additional menu items (languages, user) |
131 | 131 | echo Nav::widget( |
132 | 132 | [ |
133 | - 'options' => ['class' => 'navbar-nav navbar-right'], |
|
133 | + 'options' => [ 'class' => 'navbar-nav navbar-right' ], |
|
134 | 134 | 'encodeLabels' => false, |
135 | 135 | 'items' => $menuItems, |
136 | 136 | ] |
@@ -13,13 +13,13 @@ discard block |
||
13 | 13 | $languages = explode(',', getenv('APP_LANGUAGES')); |
14 | 14 | |
15 | 15 | // prepare asset bundle config |
16 | -$bundles = []; |
|
16 | +$bundles = [ ]; |
|
17 | 17 | if (getenv('APP_ASSET_USE_BUNDLED')) { |
18 | 18 | $bundles = include Yii::getAlias('@web/bundles').'/config.php'; |
19 | 19 | } |
20 | 20 | if (getenv('APP_ASSET_DISABLE_BOOTSTRAP_BUNDLE')) { |
21 | - $bundles['yii\bootstrap\BootstrapAsset'] = [ |
|
22 | - 'css' => [], |
|
21 | + $bundles[ 'yii\bootstrap\BootstrapAsset' ] = [ |
|
22 | + 'css' => [ ], |
|
23 | 23 | ]; |
24 | 24 | } |
25 | 25 | |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | // Basic configuration, used in web and console applications |
41 | 41 | return [ |
42 | 42 | 'id' => 'app', |
43 | - 'language' => $languages[0], |
|
43 | + 'language' => $languages[ 0 ], |
|
44 | 44 | 'basePath' => realpath(__DIR__.'/..'), |
45 | 45 | 'vendorPath' => '@app/../vendor', |
46 | 46 | 'runtimePath' => '@app/../runtime', |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | ], |
55 | 55 | 'params' => [ |
56 | 56 | 'adminEmail' => getenv('APP_ADMIN_EMAIL'), |
57 | - 'context.menuItems' => [], |
|
57 | + 'context.menuItems' => [ ], |
|
58 | 58 | 'yii.migrations' => [ |
59 | 59 | getenv('APP_MIGRATION_LOOKUP'), |
60 | 60 | '@yii/rbac/migrations', |
@@ -72,8 +72,7 @@ discard block |
||
72 | 72 | 'dirMode' => 0775, |
73 | 73 | // Hashing for distributed systems |
74 | 74 | 'hashCallback' => YII_ENV_DEV ? |
75 | - null : |
|
76 | - function ($path) { |
|
75 | + null : function($path) { |
|
77 | 76 | return YII_ENV.'-'.substr(hash('sha256', $path), 0, 8).'-'.APP_VERSION.'-'.\Yii::$app->cache->get('prototype.less.changed_at'); |
78 | 77 | }, |
79 | 78 | // Note: You need to bundle asset with `yii asset` for development/debugging |
@@ -82,7 +81,7 @@ discard block |
||
82 | 81 | ], |
83 | 82 | 'authManager' => [ |
84 | 83 | 'class' => 'dektrium\rbac\components\DbManager', |
85 | - 'defaultRoles' => ['Default'], |
|
84 | + 'defaultRoles' => [ 'Default' ], |
|
86 | 85 | ], |
87 | 86 | 'cache' => [ |
88 | 87 | 'class' => 'yii\redis\Cache', |
@@ -126,8 +125,8 @@ discard block |
||
126 | 125 | [ |
127 | 126 | 'class' => 'codemix\streamlog\Target', |
128 | 127 | 'url' => 'php://stderr', |
129 | - 'levels' => ['error', 'warning'], |
|
130 | - 'logVars' => [], |
|
128 | + 'levels' => [ 'error', 'warning' ], |
|
129 | + 'logVars' => [ ], |
|
131 | 130 | ], |
132 | 131 | ], |
133 | 132 | ], |
@@ -156,9 +155,9 @@ discard block |
||
156 | 155 | 'user' => [ |
157 | 156 | 'class' => 'dmstr\web\User', |
158 | 157 | 'enableAutoLogin' => true, |
159 | - 'loginUrl' => ['/user/security/login'], |
|
158 | + 'loginUrl' => [ '/user/security/login' ], |
|
160 | 159 | 'identityClass' => 'dektrium\user\models\User', |
161 | - 'rootUsers' => ['admin'], |
|
160 | + 'rootUsers' => [ 'admin' ], |
|
162 | 161 | ], |
163 | 162 | 'urlManager' => [ |
164 | 163 | 'class' => 'codemix\localeurls\UrlManager', |
@@ -166,7 +165,7 @@ discard block |
||
166 | 165 | 'showScriptName' => false, |
167 | 166 | 'enableDefaultLanguageUrlCode' => true, |
168 | 167 | 'baseUrl' => '/', |
169 | - 'rules' => [], |
|
168 | + 'rules' => [ ], |
|
170 | 169 | 'ignoreLanguageUrlPatterns' => [ |
171 | 170 | // route pattern => url pattern |
172 | 171 | '#^filefly/api#' => '#^filefly/api#', |
@@ -204,15 +203,15 @@ discard block |
||
204 | 203 | 'audit/trail', |
205 | 204 | 'audit/javascript', # enable app.assets.registerJSLoggingAsset via settings |
206 | 205 | // These provide special functionality and get loaded to activate it |
207 | - 'audit/error', // Links the extra error reporting functions (`exception()` and `errorMessage()`) |
|
208 | - 'audit/extra', // Links the data functions (`data()`) |
|
209 | - 'audit/curl', // Links the curl tracking function (`curlBegin()`, `curlEnd()` and `curlExec()`) |
|
206 | + 'audit/error', // Links the extra error reporting functions (`exception()` and `errorMessage()`) |
|
207 | + 'audit/extra', // Links the data functions (`data()`) |
|
208 | + 'audit/curl', // Links the curl tracking function (`curlBegin()`, `curlEnd()` and `curlExec()`) |
|
210 | 209 | //'audit/db', |
211 | 210 | //'audit/log', |
212 | 211 | //'audit/profiling', |
213 | 212 | ], |
214 | 213 | 'ignoreActions' => [ |
215 | - (getenv('APP_AUDIT_DISABLE_ALL_ACTIONS') ? '*':'_'), |
|
214 | + (getenv('APP_AUDIT_DISABLE_ALL_ACTIONS') ? '*' : '_'), |
|
216 | 215 | 'audit/*', |
217 | 216 | 'help/*', |
218 | 217 | 'gii/*', |
@@ -262,8 +261,8 @@ discard block |
||
262 | 261 | 'class' => 'lajax\translatemanager\Module', |
263 | 262 | 'root' => '@app/views', |
264 | 263 | 'layout' => '@backend/views/layouts/box', |
265 | - 'allowedIPs' => ['*'], |
|
266 | - 'roles' => ['translate-module'], |
|
264 | + 'allowedIPs' => [ '*' ], |
|
265 | + 'roles' => [ 'translate-module' ], |
|
267 | 266 | ], |
268 | 267 | 'user' => [ |
269 | 268 | 'class' => 'dektrium\user\Module', |
@@ -51,14 +51,14 @@ discard block |
||
51 | 51 | // SEO |
52 | 52 | $route = Url::toRoute(Yii::$app->controller->action->uniqueId); |
53 | 53 | if ($keywords = \Yii::$app->settings->get($route, 'app.seo.keywords', null)) { |
54 | - $this->registerMetaTag(['name' => 'keywords', 'content' => $keywords]); |
|
54 | + $this->registerMetaTag([ 'name' => 'keywords', 'content' => $keywords ]); |
|
55 | 55 | } |
56 | 56 | if ($description = \Yii::$app->settings->get($route, 'app.seo.descriptions', null)) { |
57 | - $this->registerMetaTag(['name' => 'description', 'content' => $description]); |
|
57 | + $this->registerMetaTag([ 'name' => 'description', 'content' => $description ]); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | if ($favicon = \Yii::$app->settings->get('faviconPng', 'app.assets', null)) { |
61 | - $this->registerLinkTag(['rel' => 'shortcut icon', 'type'=>'image/png', 'href' => $favicon]); |
|
61 | + $this->registerLinkTag([ 'rel' => 'shortcut icon', 'type'=>'image/png', 'href' => $favicon ]); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | ?> |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | <!-- Navbar --> |
83 | 83 | <?php |
84 | 84 | if (Yii::$app->settings->get('enableTwigNavbar', 'app.layout', false)) { |
85 | - echo \dmstr\modules\prototype\widgets\TwigWidget::widget(['key' => '_navbar']); |
|
85 | + echo \dmstr\modules\prototype\widgets\TwigWidget::widget([ 'key' => '_navbar' ]); |
|
86 | 86 | } else { |
87 | 87 | echo $this->render('_navbar'); |
88 | 88 | } |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | |
107 | 107 | <!-- Footer --> |
108 | 108 | <footer class="footer"> |
109 | - <?= Cell::widget(['id' => '_footer', 'requestParam' => '_global']) ?> |
|
109 | + <?= Cell::widget([ 'id' => '_footer', 'requestParam' => '_global' ]) ?> |
|
110 | 110 | </footer> |
111 | 111 | |
112 | 112 | <!-- Info Modal --> |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | <?= Html::a( |
116 | 116 | '<i class="fa fa-heartbeat"></i>', |
117 | 117 | '#', |
118 | - ['class' => 'text-muted', 'data-toggle' => 'modal', 'data-target' => '#infoModal'] |
|
118 | + [ 'class' => 'text-muted', 'data-toggle' => 'modal', 'data-target' => '#infoModal' ] |
|
119 | 119 | ) ?> |
120 | 120 | </p> |
121 | 121 | </div> |
@@ -5,7 +5,7 @@ |
||
5 | 5 | <?= |
6 | 6 | \yii\widgets\Breadcrumbs::widget( |
7 | 7 | [ |
8 | - 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [], |
|
8 | + 'links' => isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [ ], |
|
9 | 9 | ] |
10 | 10 | ) ?> |
11 | 11 | </div> |