Completed
Push — master ( 29708c...c10412 )
by Elias
13:55
created
src/views/layouts/_modal.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
                 </tr>
30 30
                 <tr>
31 31
                     <th>Virtual Host</th>
32
-                    <td><code><?= isset($_SERVER['HTTP_HOST']) ?
33
-                                $_SERVER['HTTP_HOST'] : 'n/a' ?></code></td>
32
+                    <td><code><?= isset($_SERVER[ 'HTTP_HOST' ]) ?
33
+                                $_SERVER[ 'HTTP_HOST' ] : 'n/a' ?></code></td>
34 34
                 </tr>
35 35
                 <tr>
36 36
                     <th>Hostname</th>
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
             </div>
47 47
 
48 48
             <div class="pull-right">
49
-                <?= Html::a(FA::icon(FA::_COG), ['/backend'], ['class' => 'btn btn-default btn-xs']) ?>
49
+                <?= Html::a(FA::icon(FA::_COG), [ '/backend' ], [ 'class' => 'btn btn-default btn-xs' ]) ?>
50 50
             </div>
51 51
             <div class="clearfix"></div>
52 52
 
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/views/site/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,5 +4,5 @@
 block discarded – undo
4 4
 
5 5
 ?>
6 6
 <div class="site-index">
7
-    <?= TwigWidget::widget(['registerMenuItems' => true]) ?>
7
+    <?= TwigWidget::widget([ 'registerMenuItems' => true ]) ?>
8 8
 </div>
Please login to merge, or discard this patch.
src/views/layouts/main.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
 /* @var $this \yii\web\View */
25 25
 /* @var $content string */
26 26
 
27
-$this->title .= ' - ' . getenv('APP_TITLE');
28
-$this->title = (getenv('APP_PAGES_TITLE_PREFIX') ?? '') . $this->title;
27
+$this->title .= ' - '.getenv('APP_TITLE');
28
+$this->title = (getenv('APP_PAGES_TITLE_PREFIX') ?? '').$this->title;
29 29
 
30 30
 SettingsAsset::register($this);
31 31
 
@@ -33,18 +33,18 @@  discard block
 block discarded – undo
33 33
     Event::on(
34 34
         View::class,
35 35
         View::EVENT_AFTER_RENDER,
36
-        function ($e) {
36
+        function($e) {
37 37
             // disable unbundled asset
38
-            $e->sender->assetBundles['yii\\bootstrap\\BootstrapAsset'] = null;
38
+            $e->sender->assetBundles[ 'yii\\bootstrap\\BootstrapAsset' ] = null;
39 39
             // disable bundled asset
40
-            $e->sender->assetBundles['bootstrap'] = null;
40
+            $e->sender->assetBundles[ 'bootstrap' ] = null;
41 41
         }
42 42
     );
43 43
 }
44 44
 
45 45
 // Favicon
46 46
 if ($favicon = \Yii::$app->settings->get('faviconPng', 'app.assets')) {
47
-    $this->registerLinkTag(['rel' => 'shortcut icon', 'type' => 'image/png', 'href' => $favicon]);
47
+    $this->registerLinkTag([ 'rel' => 'shortcut icon', 'type' => 'image/png', 'href' => $favicon ]);
48 48
 }
49 49
 
50 50
 ?>
@@ -65,12 +65,12 @@  discard block
 block discarded – undo
65 65
 
66 66
 <?php $this->beginBody() ?>
67 67
 
68
-<?= TwigWidget::widget(['key' => '_beginBody', 'renderEmpty' => false]) ?>
68
+<?= TwigWidget::widget([ 'key' => '_beginBody', 'renderEmpty' => false ]) ?>
69 69
 
70 70
 <!-- Navbar -->
71 71
 <?php
72 72
 if (Yii::$app->settings->get('enableTwigNavbar', 'app.layout', false)) {
73
-    echo TwigWidget::widget(['key' => '_navbar']);
73
+    echo TwigWidget::widget([ 'key' => '_navbar' ]);
74 74
 } else {
75 75
     echo $this->render('_navbar');
76 76
 }
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 ?>
79 79
 
80 80
 <!-- Content -->
81
-<?= TwigWidget::widget(['key' => '_beforeContent', 'renderEmpty' => false]) ?>
81
+<?= TwigWidget::widget([ 'key' => '_beforeContent', 'renderEmpty' => false ]) ?>
82 82
 
83 83
 <div class="wrap">
84 84
 
@@ -86,12 +86,12 @@  discard block
 block discarded – undo
86 86
 
87 87
 </div>
88 88
 
89
-<?= TwigWidget::widget(['key' => '_afterContent', 'renderEmpty' => false]) ?>
89
+<?= TwigWidget::widget([ 'key' => '_afterContent', 'renderEmpty' => false ]) ?>
90 90
 
91 91
 
92 92
 <!-- Footer -->
93 93
 <footer class="footer">
94
-    <?= Cell::widget(['id' => '_footer', 'requestParam' => '_global']) ?>
94
+    <?= Cell::widget([ 'id' => '_footer', 'requestParam' => '_global' ]) ?>
95 95
 </footer>
96 96
 
97 97
 <!-- User flash messages -->
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
     ],
106 106
 ]) ?>
107 107
 
108
-<?= TwigWidget::widget(['key' => '_endBody', 'renderEmpty' => false]) ?>
108
+<?= TwigWidget::widget([ 'key' => '_endBody', 'renderEmpty' => false ]) ?>
109 109
 
110 110
 <?php if (Yii::$app->user->can('backend_default_index')): ?>
111 111
 
Please login to merge, or discard this patch.
src/views/layouts/plain.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
 /* @var $this \yii\web\View */
25 25
 /* @var $content string */
26 26
 
27
-$this->title .= ' - ' . getenv('APP_TITLE');
28
-$this->title = (getenv('APP_PAGES_TITLE_PREFIX') ?? '') . $this->title;
27
+$this->title .= ' - '.getenv('APP_TITLE');
28
+$this->title = (getenv('APP_PAGES_TITLE_PREFIX') ?? '').$this->title;
29 29
 
30 30
 SettingsAsset::register($this);
31 31
 
@@ -33,18 +33,18 @@  discard block
 block discarded – undo
33 33
     Event::on(
34 34
         View::class,
35 35
         View::EVENT_AFTER_RENDER,
36
-        function ($e) {
36
+        function($e) {
37 37
             // disable unbundled asset
38
-            $e->sender->assetBundles['yii\\bootstrap\\BootstrapAsset'] = null;
38
+            $e->sender->assetBundles[ 'yii\\bootstrap\\BootstrapAsset' ] = null;
39 39
             // disable bundled asset
40
-            $e->sender->assetBundles['bootstrap'] = null;
40
+            $e->sender->assetBundles[ 'bootstrap' ] = null;
41 41
         }
42 42
     );
43 43
 }
44 44
 
45 45
 // Favicon
46 46
 if ($favicon = \Yii::$app->settings->get('faviconPng', 'app.assets')) {
47
-    $this->registerLinkTag(['rel' => 'shortcut icon', 'type' => 'image/png', 'href' => $favicon]);
47
+    $this->registerLinkTag([ 'rel' => 'shortcut icon', 'type' => 'image/png', 'href' => $favicon ]);
48 48
 }
49 49
 
50 50
 ?>
Please login to merge, or discard this patch.
src/views/layouts/_navbar.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -8,25 +8,25 @@  discard block
 block discarded – undo
8 8
 use Yii;
9 9
 
10 10
 // initialize local variables
11
-$menuItems = [];
12
-$languageItems = [];
11
+$menuItems = [ ];
12
+$languageItems = [ ];
13 13
 
14 14
 
15 15
 // prepare languages
16 16
 foreach (Yii::$app->urlManager->languages as $language) {
17
-    $languageItems[] = [
18
-        'url' => ['/', Yii::$app->urlManager->languageParam => $language],
17
+    $languageItems[ ] = [
18
+        'url' => [ '/', Yii::$app->urlManager->languageParam => $language ],
19 19
         'label' => $language,
20 20
     ];
21 21
 }
22 22
 
23 23
 // add language items to menu
24
-$menuItems[] = [
24
+$menuItems[ ] = [
25 25
     'label' =>  Yii::t('app', '{icon} {language}', [
26 26
         'icon' => '<i class="glyphicon glyphicon-globe"></i>',
27 27
         'language' => Yii::$app->language
28 28
     ]),
29
-    'options' => ['id' => 'link-languages-menu'],
29
+    'options' => [ 'id' => 'link-languages-menu' ],
30 30
     'items' => $languageItems,
31 31
 ];
32 32
 
@@ -35,39 +35,39 @@  discard block
 block discarded – undo
35 35
     if (Yii::$app->user->isGuest) {
36 36
         // unauthorized users
37 37
         //$menuItems[] = ['label' => 'Signup', 'url' => ['/user/registration/register']];
38
-        $menuItems[] = [
38
+        $menuItems[ ] = [
39 39
             'label' => Yii::t('app', 'Login'),
40
-            'url' => ['/user/security/login'],
41
-            'linkOptions' => ['id' => 'link-login'],
40
+            'url' => [ '/user/security/login' ],
41
+            'linkOptions' => [ 'id' => 'link-login' ],
42 42
         ];
43 43
     } else {
44 44
         // logged in users
45
-        $menuItems[] = [
45
+        $menuItems[ ] = [
46 46
             'label' => Yii::t('app', '{icon} {username}', [
47 47
                 'icon' => '<i class="glyphicon glyphicon-user"></i>',
48 48
                 'username' => Yii::$app->user->identity->username
49 49
             ]),
50
-            'options' => ['id' => 'link-user-menu'],
50
+            'options' => [ 'id' => 'link-user-menu' ],
51 51
             'items' => [
52 52
                 [
53 53
                     'label' => Yii::t('app', '{icon} Profile', [
54 54
                         'icon' => '<i class="glyphicon glyphicon-user"></i>'
55 55
                     ]),
56
-                    'url' => ['/user/profile/show', 'id' => Yii::$app->user->id],
56
+                    'url' => [ '/user/profile/show', 'id' => Yii::$app->user->id ],
57 57
                 ],
58 58
                 [
59 59
                     'label' => Yii::t('app', '{icon} Settings', [
60 60
                         'icon' => '<i class="glyphicon glyphicon-cog"></i>'
61 61
                     ]),
62
-                    'url' => ['/user/settings/profile'],
62
+                    'url' => [ '/user/settings/profile' ],
63 63
                 ],
64 64
                 '<li class="divider"></li>',
65 65
                 [
66 66
                     'label' => Yii::t('app', '{icon} Logout', [
67 67
                         'icon' => '<i class="glyphicon glyphicon-log-out"></i>'
68 68
                     ]),
69
-                    'url' => ['/user/security/logout'],
70
-                    'linkOptions' => ['data-method' => 'post', 'id' => 'link-logout'],
69
+                    'url' => [ '/user/security/logout' ],
70
+                    'linkOptions' => [ 'data-method' => 'post', 'id' => 'link-logout' ],
71 71
                 ],
72 72
             ],
73 73
         ];
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 // render root pages
89 89
 echo Nav::widget(
90 90
     [
91
-        'options' => ['class' => 'navbar-nav'],
91
+        'options' => [ 'class' => 'navbar-nav' ],
92 92
         'encodeLabels' => false,
93 93
         'items' => Tree::getMenuItems('root'),
94 94
     ]
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 // render additional menu items (languages, user)
98 98
 echo Nav::widget(
99 99
     [
100
-        'options' => ['class' => 'navbar-nav navbar-right'],
100
+        'options' => [ 'class' => 'navbar-nav navbar-right' ],
101 101
         'encodeLabels' => false,
102 102
         'items' => $menuItems,
103 103
     ]
Please login to merge, or discard this patch.
src/views/layouts/container-fluid.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 
12 12
     <div class="container-layout">
13 13
         <div class="container-fluid">
14
-            <?= Breadcrumbs::widget(['links' => $this->params['breadcrumbs'] ?? []]) ?>
14
+            <?= Breadcrumbs::widget([ 'links' => $this->params[ 'breadcrumbs' ] ?? [ ] ]) ?>
15 15
         </div>
16 16
 
17 17
         <div class="container-fluid">
Please login to merge, or discard this patch.
src/views/layouts/container.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
     <div class="container-layout">
13 13
         <div class="container">
14 14
             <?=
15
-            Breadcrumbs::widget(['links' => $this->params['breadcrumbs'] ?? []]) ?>
15
+            Breadcrumbs::widget([ 'links' => $this->params[ 'breadcrumbs' ] ?? [ ] ]) ?>
16 16
         </div>
17 17
 
18 18
         <div class="container">
Please login to merge, or discard this patch.
src/commands/AppController.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
32 32
     {
33 33
         switch ($actionID) {
34 34
             case 'config':
35
-                $additionalOptions = ['level'];
35
+                $additionalOptions = [ 'level' ];
36 36
                 break;
37 37
             default:
38
-                $additionalOptions = [];
38
+                $additionalOptions = [ ];
39 39
         }
40 40
         return ArrayHelper::merge(
41 41
             $additionalOptions,
@@ -65,14 +65,14 @@  discard block
 block discarded – undo
65 65
     public function actionConfig($key = null)
66 66
     {
67 67
         // get config from global variable (TODO)
68
-        $data = $GLOBALS['config'];
68
+        $data = $GLOBALS[ 'config' ];
69 69
         if ($key) {
70 70
             $keys = explode('.', $key);
71
-            if (isset($keys[0])) {
72
-                $data = $GLOBALS['config'][$keys[0]];
71
+            if (isset($keys[ 0 ])) {
72
+                $data = $GLOBALS[ 'config' ][ $keys[ 0 ] ];
73 73
             }
74
-            if (isset($keys[1])) {
75
-                $data = $GLOBALS['config'][$keys[0]][$keys[1]];
74
+            if (isset($keys[ 1 ])) {
75
+                $data = $GLOBALS[ 'config' ][ $keys[ 0 ] ][ $keys[ 1 ] ];
76 76
             }
77 77
         }
78 78
         $this->stdout(VarDumper::dumpAsString($data, $this->level));
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
94 94
     public function actionVersion()
95 95
     {
96 96
         $this->stdout('Application Version: ');
97
-        $this->stdout(getenv('APP_NAME') . ' ');
98
-        $this->stdout(APP_VERSION . "\n");
97
+        $this->stdout(getenv('APP_NAME').' ');
98
+        $this->stdout(APP_VERSION."\n");
99 99
     }
100 100
 
101 101
     /**
@@ -108,12 +108,12 @@  discard block
 block discarded – undo
108 108
         $this->stdout("=====================\n");
109 109
         $this->stdout("Initializing application\n");
110 110
 
111
-        $this->interactive = (bool)getenv('APP_INTERACTIVE');
111
+        $this->interactive = (bool) getenv('APP_INTERACTIVE');
112 112
 
113 113
         $this->stdout("\nDatabase\n");
114 114
         $this->stdout("--------\n");
115
-        $this->run('db/create', [getenv('DB_ENV_MYSQL_ROOT_USER'),getenv('DB_ENV_MYSQL_ROOT_PASSWORD')]);
116
-        $this->run('migrate/up', ['interactive' => (bool)getenv('APP_INTERACTIVE')]);
115
+        $this->run('db/create', [ getenv('DB_ENV_MYSQL_ROOT_USER'), getenv('DB_ENV_MYSQL_ROOT_PASSWORD') ]);
116
+        $this->run('migrate/up', [ 'interactive' => (bool) getenv('APP_INTERACTIVE') ]);
117 117
 
118 118
         $this->stdout("\nUser\n");
119 119
         $this->stdout("----\n");
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
                 'default' => getenv('APP_ADMIN_PASSWORD') ?: Yii::$app->security->generateRandomString(8),
124 124
             ]
125 125
         );
126
-        $this->run('user/create', [getenv('APP_ADMIN_EMAIL'), 'admin', $adminPassword]);
126
+        $this->run('user/create', [ getenv('APP_ADMIN_EMAIL'), 'admin', $adminPassword ]);
127 127
 
128 128
         $this->stdout('Initializing modules');
129 129
 
@@ -138,8 +138,8 @@  discard block
 block discarded – undo
138 138
         $this->stdout("\nCleanup\n");
139 139
         $this->stdout("-------\n");
140 140
         $this->run('cache/flush-all');
141
-        $this->run('audit/cleanup', ['age' => 30, 'interactive' => (bool)getenv('APP_INTERACTIVE')]);
142
-        $this->run('app/clear-assets', ['interactive' => (bool)getenv('APP_INTERACTIVE')]);
141
+        $this->run('audit/cleanup', [ 'age' => 30, 'interactive' => (bool) getenv('APP_INTERACTIVE') ]);
142
+        $this->run('app/clear-assets', [ 'interactive' => (bool) getenv('APP_INTERACTIVE') ]);
143 143
     }
144 144
 
145 145
     /**
@@ -153,20 +153,20 @@  discard block
 block discarded – undo
153 153
         $matchRegex = '"^[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]\?[a-z0-9]$"';
154 154
 
155 155
         // create $cmd command
156
-        $cmd = 'cd "' . $assets . '" && ls | grep -e ' . $matchRegex . ' | xargs rm -rf ';
156
+        $cmd = 'cd "'.$assets.'" && ls | grep -e '.$matchRegex.' | xargs rm -rf ';
157 157
 
158 158
         // Set command
159 159
         $command = new Command($cmd);
160 160
 
161 161
         // Prompt user
162
-        $delete = $this->confirm("\nDo you really want to delete web assets?", ['default' => true]);
162
+        $delete = $this->confirm("\nDo you really want to delete web assets?", [ 'default' => true ]);
163 163
 
164 164
         if ($delete) {
165 165
             // Try to execute $command
166 166
             if ($command->execute()) {
167 167
                 $this->stdout("Web assets have been deleted.\n\n");
168 168
             } else {
169
-                $this->stderr("\n" . $command->getError() . "\n");
169
+                $this->stderr("\n".$command->getError()."\n");
170 170
                 $this->stderr($command->getStdErr());
171 171
             }
172 172
         }
@@ -179,8 +179,8 @@  discard block
 block discarded – undo
179 179
         $message = $mailer->compose();
180 180
         $message
181 181
             ->setTo($to)
182
-            ->setSubject('Test-Mail from ' . getenv('APP_NAME'))
183
-            ->setTextBody(getenv('APP_TITLE') . ' | ' . getenv('HOSTNAME'));
182
+            ->setSubject('Test-Mail from '.getenv('APP_NAME'))
183
+            ->setTextBody(getenv('APP_TITLE').' | '.getenv('HOSTNAME'));
184 184
 
185 185
         if ($message->send()) {
186 186
             $this->stdout('Mail sent');
Please login to merge, or discard this patch.