@@ -4,5 +4,5 @@ |
||
4 | 4 | 'defaultPageSize' => 10, |
5 | 5 | 'adminEmail' => '[email protected]', |
6 | 6 | 'googleApiKey' => 'AIzaSyCoC4gFaWQxlv5MG_OHTJOUmJLA-ib8c78', |
7 | - 'captcha' => require __DIR__ . '/captcha.php' |
|
7 | + 'captcha' => require __DIR__.'/captcha.php' |
|
8 | 8 | ]; |
@@ -3,13 +3,13 @@ discard block |
||
3 | 3 | use Itstructure\AdminModule\Module as AdminModule; |
4 | 4 | use Itstructure\MFUploader\Module as MFUModule; |
5 | 5 | |
6 | -$params = require __DIR__ . '/params.php'; |
|
7 | -$db = require __DIR__ . '/db.php'; |
|
6 | +$params = require __DIR__.'/params.php'; |
|
7 | +$db = require __DIR__.'/db.php'; |
|
8 | 8 | |
9 | 9 | $config = [ |
10 | 10 | 'id' => 'yii2-template-multilanguage-console', |
11 | 11 | 'basePath' => dirname(__DIR__), |
12 | - 'bootstrap' => ['log'], |
|
12 | + 'bootstrap' => [ 'log' ], |
|
13 | 13 | 'controllerNamespace' => 'app\commands', |
14 | 14 | 'aliases' => [ |
15 | 15 | '@bower' => '@vendor/bower-asset', |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | 'targets' => [ |
32 | 32 | [ |
33 | 33 | 'class' => 'yii\log\FileTarget', |
34 | - 'levels' => ['error', 'warning'], |
|
34 | + 'levels' => [ 'error', 'warning' ], |
|
35 | 35 | ], |
36 | 36 | ], |
37 | 37 | ], |
@@ -63,8 +63,8 @@ discard block |
||
63 | 63 | |
64 | 64 | if (YII_ENV_DEV) { |
65 | 65 | // configuration adjustments for 'dev' environment |
66 | - $config['bootstrap'][] = 'gii'; |
|
67 | - $config['modules']['gii'] = [ |
|
66 | + $config[ 'bootstrap' ][ ] = 'gii'; |
|
67 | + $config[ 'modules' ][ 'gii' ] = [ |
|
68 | 68 | 'class' => 'yii\gii\Module', |
69 | 69 | ]; |
70 | 70 | } |
@@ -9,5 +9,5 @@ |
||
9 | 9 | //'mainMenuConfig' => require __DIR__ . '/main-menu.php', |
10 | 10 | 'companyName' => 'Yii2 template', |
11 | 11 | 'shotCompanyName' => 'YTM', |
12 | - 'extraAssets' => require __DIR__ . '/extra-assets.php', |
|
12 | + 'extraAssets' => require __DIR__.'/extra-assets.php', |
|
13 | 13 | ]; |
@@ -52,10 +52,10 @@ discard block |
||
52 | 52 | 'home' => HomeController::class, |
53 | 53 | 'sitemap' => SitemapController::class |
54 | 54 | ], |
55 | - 'accessRoles' => ['admin', 'manager'], |
|
55 | + 'accessRoles' => [ 'admin', 'manager' ], |
|
56 | 56 | 'components' => [ |
57 | - 'view' => require __DIR__ . '/view-component.php', |
|
58 | - 'multilanguage-validate-component' => require __DIR__ .'/multilanguage-validate-component.php', |
|
57 | + 'view' => require __DIR__.'/view-component.php', |
|
58 | + 'multilanguage-validate-component' => require __DIR__.'/multilanguage-validate-component.php', |
|
59 | 59 | ], |
60 | 60 | 'isMultilanguage' => true, |
61 | 61 | ], |
@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | 'permissions' => PermissionController::class, |
68 | 68 | 'profiles' => ProfileController::class |
69 | 69 | ], |
70 | - 'accessRoles' => ['admin', 'manager'], |
|
70 | + 'accessRoles' => [ 'admin', 'manager' ], |
|
71 | 71 | 'components' => [ |
72 | - 'view' => require __DIR__ . '/view-component.php', |
|
72 | + 'view' => require __DIR__.'/view-component.php', |
|
73 | 73 | ], |
74 | 74 | ], |
75 | 75 | 'mfuploader' => [ |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | 'upload/local-upload' => LocalUploadController::class, |
80 | 80 | 'managers' => ManagerController::class, |
81 | 81 | ], |
82 | - 'accessRoles' => ['admin', 'manager'], |
|
82 | + 'accessRoles' => [ 'admin', 'manager' ], |
|
83 | 83 | 'components' => [ |
84 | 84 | 'local-upload-component' => [ |
85 | 85 | 'class' => LocalUploadComponent::class, |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | use Itstructure\AdminModule\Module as AdminModule; |
4 | 4 | use Itstructure\RbacModule\Module as RbacModule; |
5 | 5 | |
6 | -$shortLanguage = $this->view->params['shortLanguage']; |
|
6 | +$shortLanguage = $this->view->params[ 'shortLanguage' ]; |
|
7 | 7 | $controllerId = Yii::$app->controller->id; |
8 | 8 | |
9 | 9 | return [ |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | 'active' => $controllerId == 'profiles' ? true : false |
51 | 51 | ], |
52 | 52 | ], |
53 | - 'active' => in_array($controllerId, ['roles', 'permissions', 'profiles']) ? true : false |
|
53 | + 'active' => in_array($controllerId, [ 'roles', 'permissions', 'profiles' ]) ? true : false |
|
54 | 54 | ], |
55 | 55 | 'positions' => [ |
56 | 56 | 'title' => Yii::t('positions', 'Positions'), |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | 'active' => $controllerId == 'qualities' ? true : false |
101 | 101 | ], |
102 | 102 | ], |
103 | - 'active' => in_array($controllerId, ['about', 'technologies', 'qualities']) ? true : false |
|
103 | + 'active' => in_array($controllerId, [ 'about', 'technologies', 'qualities' ]) ? true : false |
|
104 | 104 | ], |
105 | 105 | 'contacts' => [ |
106 | 106 | 'title' => Yii::t('contacts', 'Contacts'), |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | 'active' => $controllerId == 'social' ? true : false |
121 | 121 | ], |
122 | 122 | ], |
123 | - 'active' => in_array($controllerId, ['contacts', 'social']) ? true : false |
|
123 | + 'active' => in_array($controllerId, [ 'contacts', 'social' ]) ? true : false |
|
124 | 124 | ], |
125 | 125 | 'home' => [ |
126 | 126 | 'title' => Yii::t('home', 'Home page'), |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | -$db = require __DIR__ . '/db.php'; |
|
2 | +$db = require __DIR__.'/db.php'; |
|
3 | 3 | // test database! Important not to run tests on production or development databases |
4 | -$db['dsn'] = 'mysql:host=localhost;dbname=yii2_basic_tests'; |
|
4 | +$db[ 'dsn' ] = 'mysql:host=localhost;dbname=yii2_basic_tests'; |
|
5 | 5 | |
6 | 6 | return $db; |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | -$params = require __DIR__ . '/params.php'; |
|
3 | -$db = require __DIR__ . '/test_db.php'; |
|
2 | +$params = require __DIR__.'/params.php'; |
|
3 | +$db = require __DIR__.'/test_db.php'; |
|
4 | 4 | |
5 | 5 | /** |
6 | 6 | * Application configuration shared by all test types |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | 'useFileTransport' => true, |
20 | 20 | ], |
21 | 21 | 'assetManager' => [ |
22 | - 'basePath' => __DIR__ . '/../web/assets', |
|
22 | + 'basePath' => __DIR__.'/../web/assets', |
|
23 | 23 | ], |
24 | 24 | 'urlManager' => [ |
25 | 25 | 'showScriptName' => true, |
@@ -1,14 +1,14 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -$params = require __DIR__ . '/params.php'; |
|
4 | -$db = require __DIR__ . '/db.php'; |
|
3 | +$params = require __DIR__.'/params.php'; |
|
4 | +$db = require __DIR__.'/db.php'; |
|
5 | 5 | |
6 | 6 | $config = [ |
7 | 7 | 'id' => 'yii2_template_multilanguage', |
8 | 8 | 'version' => '1.0.0', |
9 | 9 | 'basePath' => dirname(__DIR__), |
10 | 10 | 'homeUrl' => YII_DEBUG ? 'http://yii2-template-multilanguage' : 'http://yii2-template-multilanguage', |
11 | - 'bootstrap' => ['log'], |
|
11 | + 'bootstrap' => [ 'log' ], |
|
12 | 12 | 'language' => 'en-US', |
13 | 13 | 'aliases' => [ |
14 | 14 | '@bower' => '@vendor/bower-asset', |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | 'targets' => [ |
51 | 51 | [ |
52 | 52 | 'class' => 'yii\log\FileTarget', |
53 | - 'levels' => ['error', 'warning'], |
|
53 | + 'levels' => [ 'error', 'warning' ], |
|
54 | 54 | ], |
55 | 55 | ], |
56 | 56 | ], |
@@ -207,18 +207,18 @@ discard block |
||
207 | 207 | |
208 | 208 | if (YII_ENV_DEV) { |
209 | 209 | // configuration adjustments for 'dev' environment |
210 | - $config['bootstrap'][] = 'debug'; |
|
211 | - $config['modules']['debug'] = [ |
|
210 | + $config[ 'bootstrap' ][ ] = 'debug'; |
|
211 | + $config[ 'modules' ][ 'debug' ] = [ |
|
212 | 212 | 'class' => 'yii\debug\Module', |
213 | 213 | // uncomment the following to add your IP if you are not connecting from localhost. |
214 | - 'allowedIPs' => ['127.0.0.1', '::1', '*'], |
|
214 | + 'allowedIPs' => [ '127.0.0.1', '::1', '*' ], |
|
215 | 215 | ]; |
216 | 216 | |
217 | - $config['bootstrap'][] = 'gii'; |
|
218 | - $config['modules']['gii'] = [ |
|
217 | + $config[ 'bootstrap' ][ ] = 'gii'; |
|
218 | + $config[ 'modules' ][ 'gii' ] = [ |
|
219 | 219 | 'class' => 'yii\gii\Module', |
220 | 220 | // uncomment the following to add your IP if you are not connecting from localhost. |
221 | - 'allowedIPs' => ['127.0.0.1', '::1', '*'], |
|
221 | + 'allowedIPs' => [ '127.0.0.1', '::1', '*' ], |
|
222 | 222 | ]; |
223 | 223 | } |
224 | 224 |
@@ -52,7 +52,7 @@ |
||
52 | 52 | int $statusCode = 200): array { |
53 | 53 | |
54 | 54 | if (null === $data) { |
55 | - $data = (object)[]; |
|
55 | + $data = (object)[ ]; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | \Yii::$app->response->statusCode = $statusCode; |