Completed
Pull Request — master (#1919)
by Sohel Ahmed
03:34
created
core/base/Module.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
             }
230 230
         } catch (InvalidParamException $e) {
231 231
             try {
232
-                $staticPath = static::staticBasePath() . DIRECTORY_SEPARATOR . 'controllers';
232
+                $staticPath = static::staticBasePath().DIRECTORY_SEPARATOR.'controllers';
233 233
                 foreach (FileHelper::findFiles($staticPath) as $file) {
234 234
                     $files[$this->fileToName($staticPath, $file)] = $file;
235 235
                 }
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
      */
258 258
     public function getControllerPath()
259 259
     {
260
-        return Yii::getAlias('@' . str_replace('\\', '/', $this->controllerNamespace), false);
260
+        return Yii::getAlias('@'.str_replace('\\', '/', $this->controllerNamespace), false);
261 261
     }
262 262
 
263 263
     // STATIC METHODS
Please login to merge, or discard this patch.
core/web/jsonld/DurationValue.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
44 44
     protected function timeToIso8601Duration($time)
45 45
     {
46 46
         $units = array(
47
-            "Y" => 365*24*3600,
48
-            "D" =>     24*3600,
47
+            "Y" => 365 * 24 * 3600,
48
+            "D" =>     24 * 3600,
49 49
             "H" =>        3600,
50 50
             "M" =>          60,
51 51
             "S" =>           1,
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
                     $str .= "T";
64 64
                     $istime = true;
65 65
                 }
66
-                $str .= strval($unit) . $unitName;
66
+                $str .= strval($unit).$unitName;
67 67
             }
68 68
         }
69 69
         
Please login to merge, or discard this patch.
core/helpers/Url.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      */
35 35
     public static function trailing($url, $slash = '/')
36 36
     {
37
-        return rtrim($url, $slash) . $slash;
37
+        return rtrim($url, $slash).$slash;
38 38
     }
39 39
 
40 40
     /**
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
     public static function ensureHttp($url, $https = false)
88 88
     {
89 89
         if (!preg_match("~^(?:f|ht)tps?://~i", $url)) {
90
-            $url = ($https ? "https://" : "http://") . $url;
90
+            $url = ($https ? "https://" : "http://").$url;
91 91
         }
92 92
         
93 93
         return $url;
Please login to merge, or discard this patch.
dev/RepoController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
         // generate summary overview
101 101
         foreach ($this->repos as $repo) {
102 102
             $newRepoHome = $this->getFilesystemRepoPath($repo);
103
-            if (file_exists($newRepoHome . DIRECTORY_SEPARATOR . '.git')) {
103
+            if (file_exists($newRepoHome.DIRECTORY_SEPARATOR.'.git')) {
104 104
                 $summary[] = $this->summaryItem($repo, false, true);
105 105
             } elseif ($this->forkExists($username, $repo)) {
106 106
                 $summary[] = $this->summaryItem($repo, true, false);
@@ -196,13 +196,13 @@  discard block
 block discarded – undo
196 196
         
197 197
         $this->saveConfig(self::CONFIG_VAR_CUSTOMCLONES, $clones);
198 198
         
199
-        $composerReader = new ComposerReader($repoFileSystemPath . DIRECTORY_SEPARATOR . 'composer.json');
199
+        $composerReader = new ComposerReader($repoFileSystemPath.DIRECTORY_SEPARATOR.'composer.json');
200 200
         
201 201
         if ($composerReader->canRead()) {
202 202
             $section = new AutoloadSection($composerReader);
203 203
             $autoloaders = [];
204 204
             foreach ($section as $autoload) {
205
-                $newSrc = $repoFileSystemPath . DIRECTORY_SEPARATOR . $autoload->source;
205
+                $newSrc = $repoFileSystemPath.DIRECTORY_SEPARATOR.$autoload->source;
206 206
                 $autoloaders[] = ['autoload' => $autoload, 'src' => $newSrc];
207 207
             }
208 208
             
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
      */
249 249
     protected function getProjectComposerReader()
250 250
     {
251
-        return new ComposerReader(getcwd() . DIRECTORY_SEPARATOR . 'composer.json');
251
+        return new ComposerReader(getcwd().DIRECTORY_SEPARATOR.'composer.json');
252 252
     }
253 253
     
254 254
     private $_gitWrapper;
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
      */
286 286
     private function getFilesystemRepoPath($repo)
287 287
     {
288
-        return 'repos' . DIRECTORY_SEPARATOR . $repo;
288
+        return 'repos'.DIRECTORY_SEPARATOR.$repo;
289 289
     }
290 290
     
291 291
     /**
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
             $wrapper->git('pull', $repoFileSystemPath);
351 351
             $this->outputInfo("{$repo}: pull ✔");
352 352
         } catch (\Exception $err) {
353
-            $this->outputError("{$repo}: error while updating ({$repoFileSystemPath}) with message: " . $err->getMessage());
353
+            $this->outputError("{$repo}: error while updating ({$repoFileSystemPath}) with message: ".$err->getMessage());
354 354
         }
355 355
     }
356 356
     
Please login to merge, or discard this patch.
core/traits/ApplicationTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
         
125 125
         // generate from `de` the locale `de_DE` or from `en` `en_EN` only if $lang is 2 chars.
126 126
         if (strlen($lang) == 2) {
127
-            return strtolower($lang) . '_' . strtoupper($lang);
127
+            return strtolower($lang).'_'.strtoupper($lang);
128 128
         }
129 129
         
130 130
         return $lang;
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
     public function getWebroot()
187 187
     {
188 188
         if ($this->_webroot === null) {
189
-            $this->_webroot = realpath(realpath($this->basePath) . DIRECTORY_SEPARATOR . $this->webrootDirectory);
189
+            $this->_webroot = realpath(realpath($this->basePath).DIRECTORY_SEPARATOR.$this->webrootDirectory);
190 190
         }
191 191
         
192 192
         return $this->_webroot;
Please login to merge, or discard this patch.
core/web/filters/JsonCruftFilter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
      */
59 59
     public function prependCruft($content)
60 60
     {
61
-        return $this->cruft . trim($content);
61
+        return $this->cruft.trim($content);
62 62
     }
63 63
     
64 64
     /**
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     {
69 69
         if (Yii::$app->response->format == Response::FORMAT_JSON) {
70 70
             Yii::$app->response->headers->set(self::CRUFT_HEADER_NAME, $this->getCruftLength());
71
-            Yii::$app->response->on(Response::EVENT_AFTER_PREPARE, function ($event) {
71
+            Yii::$app->response->on(Response::EVENT_AFTER_PREPARE, function($event) {
72 72
                 $event->sender->content = $this->prependCruft($event->sender->content);
73 73
             });
74 74
         }
Please login to merge, or discard this patch.
core/console/commands/ImportController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 
176 176
         foreach ($queue as $pos => $object) {
177 177
             $this->verbosePrint("Run importer object '{$object->className()}' on position '{$pos}'.", __METHOD__);
178
-            $this->verbosePrint('Module context id: ' . $object->module->id);
178
+            $this->verbosePrint('Module context id: '.$object->module->id);
179 179
             $object->run();
180 180
         }
181 181
 
@@ -185,10 +185,10 @@  discard block
 block discarded – undo
185 185
             Yii::$app->db->createCommand()->update('admin_user', ['force_reload' => 1])->execute();
186 186
         }
187 187
         
188
-        $this->output('LUYA import command (based on LUYA ' . Boot::VERSION . ')');
188
+        $this->output('LUYA import command (based on LUYA '.Boot::VERSION.')');
189 189
         
190 190
         foreach ($this->getLog() as $section => $value) {
191
-            $this->outputInfo(PHP_EOL . $section . ":");
191
+            $this->outputInfo(PHP_EOL.$section.":");
192 192
             $this->logValueToTable($value);
193 193
         }
194 194
         
Please login to merge, or discard this patch.
core/helpers/ExportHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
     {
140 140
         $output = null;
141 141
         foreach ($input as $row) {
142
-            $output.= self::generateRow($row, $delimiter, '"');
142
+            $output .= self::generateRow($row, $delimiter, '"');
143 143
         }
144 144
 
145 145
         return $output;
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
      */
157 157
     protected static function generateRow(array $row, $delimiter, $enclose)
158 158
     {
159
-        array_walk($row, function (&$item) use ($enclose) {
159
+        array_walk($row, function(&$item) use ($enclose) {
160 160
             if (is_bool($item)) {
161 161
                 $item = (int) $item;
162 162
             } elseif (is_null($item)) {
@@ -167,6 +167,6 @@  discard block
 block discarded – undo
167 167
             $item = $enclose.Html::encode($item).$enclose;
168 168
         });
169 169
 
170
-        return implode($delimiter, $row) . PHP_EOL;
170
+        return implode($delimiter, $row).PHP_EOL;
171 171
     }
172 172
 }
Please login to merge, or discard this patch.
core/web/TelephoneLink.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
         if (!empty($this->getTelephone())) {
79 79
             // Remove all chars expect digits and "+"
80 80
             $number = preg_replace('#[^\d+]#', '', $this->getTelephone());
81
-            $href = 'tel:' . $number;
81
+            $href = 'tel:'.$number;
82 82
         }
83 83
 
84 84
         return $href;
Please login to merge, or discard this patch.