@@ -5,6 +5,6 @@ |
||
5 | 5 | |
6 | 6 | <div class="site-index"> |
7 | 7 | |
8 | - <?= \dmstr\modules\prototype\widgets\TwigWidget::widget(['registerMenuItems' => true]) ?> |
|
8 | + <?= \dmstr\modules\prototype\widgets\TwigWidget::widget([ 'registerMenuItems' => true ]) ?> |
|
9 | 9 | |
10 | 10 | </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> |
@@ -24,8 +24,8 @@ discard block |
||
24 | 24 | <p style="line-height: 1.6em"> |
25 | 25 | Application Version <span class="label label-info"><?= getenv('APP_NAME') ?>-<?= APP_VERSION ?></span> |
26 | 26 | <br> |
27 | - Virtual Host <span class="label label-default"><?= isset($_SERVER['HTTP_HOST']) ? |
|
28 | - $_SERVER['HTTP_HOST'] : '' ?></span> |
|
27 | + Virtual Host <span class="label label-default"><?= isset($_SERVER[ 'HTTP_HOST' ]) ? |
|
28 | + $_SERVER[ 'HTTP_HOST' ] : '' ?></span> |
|
29 | 29 | <br/> |
30 | 30 | Hostname <span class="label label-default"><?= getenv('HOSTNAME') ?: 'local' ?></span> |
31 | 31 | </p> |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | <hr/> |
39 | 39 | |
40 | 40 | <div class="pull-right"> |
41 | - <?= Html::a(FA::icon(FA::_COG), ['/backend'], ['class' => 'btn btn-default btn-xs']) ?> |
|
41 | + <?= Html::a(FA::icon(FA::_COG), [ '/backend' ], [ 'class' => 'btn btn-default btn-xs' ]) ?> |
|
42 | 42 | </div> |
43 | 43 | <div class="clearfix"></div> |
44 | 44 |
@@ -47,7 +47,7 @@ |
||
47 | 47 | 'class' => 'yii\log\FileTarget', |
48 | 48 | 'logFile' => '@runtime/logs/console.log', |
49 | 49 | //'levels' => ['info', 'trace'], |
50 | - 'logVars' => [], |
|
50 | + 'logVars' => [ ], |
|
51 | 51 | 'enabled' => YII_DEBUG && !YII_ENV_TEST, |
52 | 52 | ], |
53 | 53 | ], |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | Yii::setAlias('@webroot', '@root/web'); |
27 | 27 | |
28 | 28 | // Use a closure to not pollute the global namespace |
29 | -return call_user_func(function () { |
|
29 | +return call_user_func(function() { |
|
30 | 30 | |
31 | 31 | /*function checkFile(){ |
32 | 32 | if (file_exists($file)) { |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | "{$configDir}/".APP_TYPE.'.php' => true, |
41 | 41 | "{$configDir}/common-".YII_ENV.'.php' => false, |
42 | 42 | "{$configDir}/".APP_TYPE.'-'.YII_ENV.'.php' => false, |
43 | - "{$configDir}/".APP_TYPE.'-'.((YII_DEBUG)?'debug':'release').'.php' => false, |
|
43 | + "{$configDir}/".APP_TYPE.'-'.((YII_DEBUG) ? 'debug' : 'release').'.php' => false, |
|
44 | 44 | ]; |
45 | 45 | |
46 | 46 | if (!empty(getenv('APP_CONFIG_FILE'))) { |
@@ -48,12 +48,12 @@ discard block |
||
48 | 48 | // Merge additional configurations |
49 | 49 | foreach ($additionalConfigFiles as $alias) { |
50 | 50 | $file = Yii::getAlias($alias); |
51 | - $configFiles[$file] = true; |
|
51 | + $configFiles[ $file ] = true; |
|
52 | 52 | } |
53 | 53 | } |
54 | 54 | |
55 | 55 | // Merge configurations |
56 | - $config = []; |
|
56 | + $config = [ ]; |
|
57 | 57 | //var_dump($configFiles);exit; |
58 | 58 | Yii::trace($configFiles, __METHOD__); |
59 | 59 | foreach ($configFiles as $file => $isRequired) { |
@@ -6,7 +6,7 @@ |
||
6 | 6 | require($rootPath.'/src/config/env.php'); |
7 | 7 | |
8 | 8 | // Define framework & application constants |
9 | -defined('YII_DEBUG') or define('YII_DEBUG', (boolean)getenv('YII_DEBUG')); |
|
9 | +defined('YII_DEBUG') or define('YII_DEBUG', (boolean) getenv('YII_DEBUG')); |
|
10 | 10 | defined('YII_ENV') or define('YII_ENV', getenv('YII_ENV')); |
11 | 11 | defined('APP_TYPE') or define('APP_TYPE', 'web'); |
12 | 12 |
@@ -20,8 +20,8 @@ |
||
20 | 20 | $dotenv->load(); |
21 | 21 | |
22 | 22 | // Basic checks & validation |
23 | -$dotenv->required('YII_DEBUG', ['', '0', '1', 'true', true]); |
|
24 | -$dotenv->required('YII_ENV', ['dev', 'prod', 'test']); |
|
23 | +$dotenv->required('YII_DEBUG', [ '', '0', '1', 'true', true ]); |
|
24 | +$dotenv->required('YII_ENV', [ 'dev', 'prod', 'test' ]); |
|
25 | 25 | $dotenv->required([ |
26 | 26 | 'YII_TRACE_LEVEL', |
27 | 27 | 'APP_NAME', |
@@ -16,7 +16,7 @@ |
||
16 | 16 | 'view' => [ |
17 | 17 | 'renderers' => [ |
18 | 18 | 'twig' => [ |
19 | - 'extensions' => (getenv('TWIG_DEBUG_MODE')) ? [new Twig_Extension_Debug()] : null, |
|
19 | + 'extensions' => (getenv('TWIG_DEBUG_MODE')) ? [ new Twig_Extension_Debug() ] : null, |
|
20 | 20 | 'options' => [ |
21 | 21 | 'debug' => (getenv('TWIG_DEBUG_MODE')) ? true : false, |
22 | 22 | ], |
@@ -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 | ] |