Completed
Pull Request — master (#1828)
by Silvan
06:10
created
core/components/Mail.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
                 $this->_mailer->isSMTP();
145 145
                 $this->_mailer->SMTPSecure = $this->smtpSecure;
146 146
                 $this->_mailer->Host = $this->host;
147
-                $this->_mailer->SMTPAuth= $this->smtpAuth;
147
+                $this->_mailer->SMTPAuth = $this->smtpAuth;
148 148
                 $this->_mailer->Username = $this->username;
149 149
                 $this->_mailer->Password = $this->password;
150 150
                 $this->_mailer->Port = $this->port;
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
482 482
                         return true;
483 483
                     } else {
484 484
                         $data = [$this->host, $this->port, $this->smtpSecure, $this->username];
485
-                        throw new Exception('Authentication failed ('.implode(',', $data).'): '.$smtp->getLastReply() . PHP_EOL . print_r($smtp->getError(), true));
485
+                        throw new Exception('Authentication failed ('.implode(',', $data).'): '.$smtp->getLastReply().PHP_EOL.print_r($smtp->getError(), true));
486 486
                     }
487 487
                 } else {
488 488
                     throw new Exception('HELO failed: '.$smtp->getLastReply());
Please login to merge, or discard this patch.
core/web/WebsiteLink.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
     public function setHref($href)
54 54
     {
55 55
         if (StringHelper::startsWith($href, '//')) {
56
-            $this->_href = Url::base(true) . str_replace('//', '/', $href);
56
+            $this->_href = Url::base(true).str_replace('//', '/', $href);
57 57
         } else {
58 58
             $this->_href = Url::ensureHttp($href);
59 59
         }
Please login to merge, or discard this patch.
core/web/EmailLink.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
      */
50 50
     public function getHref()
51 51
     {
52
-        return empty($this->getEmail()) ?: 'mailto:' . $this->getEmail();
52
+        return empty($this->getEmail()) ?: 'mailto:'.$this->getEmail();
53 53
     }
54 54
 
55 55
     /**
Please login to merge, or discard this patch.
core/web/JsonLd.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -138,8 +138,8 @@
 block discarded – undo
138 138
     protected static function registerView()
139 139
     {
140 140
         if (self::$_view === null) {
141
-            Yii::$app->view->on(View::EVENT_BEGIN_BODY, function ($event) {
142
-                echo '<script type="application/ld+json">' . Json::encode($event->sender->params) . '</script>';
141
+            Yii::$app->view->on(View::EVENT_BEGIN_BODY, function($event) {
142
+                echo '<script type="application/ld+json">'.Json::encode($event->sender->params).'</script>';
143 143
             });
144 144
                     
145 145
             self::$_view = true;
Please login to merge, or discard this patch.
core/web/Svg.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -73,27 +73,27 @@
 block discarded – undo
73 73
     public function run()
74 74
     {
75 75
         // Cache generated code
76
-        return $this->getOrSetHasCache(['svg', $this->folder, $this->file, $this->cssClass], function () {
76
+        return $this->getOrSetHasCache(['svg', $this->folder, $this->file, $this->cssClass], function() {
77 77
 
78 78
             // Check if file ends with .svg, if not add the extension
79
-            $svgFile = StringHelper::endsWith($this->file, '.svg') ? $this->file : $this->file . '.svg';
79
+            $svgFile = StringHelper::endsWith($this->file, '.svg') ? $this->file : $this->file.'.svg';
80 80
 
81 81
             // Build the full svg file path
82
-            $svgPath = $this->folder . DIRECTORY_SEPARATOR . $svgFile;
82
+            $svgPath = $this->folder.DIRECTORY_SEPARATOR.$svgFile;
83 83
 
84 84
             // Get the svg contents
85 85
             $content = FileHelper::getFileContent($svgPath);
86 86
 
87 87
             // If a cssClass string is given, add it to the <svg> tag
88 88
             if ($this->cssClass && is_string($this->cssClass)) {
89
-                $content = preg_replace('/<svg/', '<svg class="' . $this->cssClass . '"', $content);
89
+                $content = preg_replace('/<svg/', '<svg class="'.$this->cssClass.'"', $content);
90 90
             }
91 91
 
92 92
             if ($content) {
93 93
                 return $content;
94 94
             }
95 95
 
96
-            throw new Exception('Unable to access SVG File: ' . $svgPath);
96
+            throw new Exception('Unable to access SVG File: '.$svgPath);
97 97
         });
98 98
     }
99 99
 }
Please login to merge, or discard this patch.
dev/BaseDevCommand.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
      */
30 30
     public function actionConfigInfo()
31 31
     {
32
-        $this->outputInfo("dev config file: " . Yii::getAlias($this->configFile));
32
+        $this->outputInfo("dev config file: ".Yii::getAlias($this->configFile));
33 33
         
34 34
         $config = $this->readConfig();
35 35
         
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
         $save = FileHelper::writeFile($this->configFile, Json::encode($content));
92 92
         
93 93
         if (!$save) {
94
-            return $this->outputError("Unable to find config file " . $this->configFile. ". Please create and provide Permissions.");
94
+            return $this->outputError("Unable to find config file ".$this->configFile.". Please create and provide Permissions.");
95 95
         }
96 96
         
97 97
         return $value;
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
     /**
27 27
      * Display config data and location.
28 28
      *
29
-     * @return boolean|void
29
+     * @return integer|null
30 30
      */
31 31
     public function actionConfigInfo()
32 32
     {
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
      * Save a value in the config for a given key.
78 78
      *
79 79
      * @param string $key
80
-     * @param mixed $value
80
+     * @param string|boolean $value
81 81
      * @return mixed
82 82
      */
83 83
     protected function saveConfig($key, $value)
Please login to merge, or discard this patch.
dev/RepoController.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -203,7 +203,7 @@
 block discarded – undo
203 203
      * @param string $repo
204 204
      * @param string $isFork
205 205
      * @param string $exists
206
-     * @return array
206
+     * @return string[]
207 207
      */
208 208
     private function summaryItem($repo, $isFork, $exists)
209 209
     {
Please login to merge, or discard this 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/base/Module.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -241,6 +241,9 @@
 block discarded – undo
241 241
         return $files;
242 242
     }
243 243
     
244
+    /**
245
+     * @param string $prefix
246
+     */
244 247
     private function fileToName($prefix, $file)
245 248
     {
246 249
         $value = ltrim(str_replace([$prefix, 'Controller.php'], '', $file), DIRECTORY_SEPARATOR);
Please login to merge, or discard this 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/EventInterface.php 1 patch
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -160,6 +160,7 @@  discard block
 block discarded – undo
160 160
 
161 161
     /**
162 162
      * @param int $maximumAttendeeCapacity
163
+     * @return void
163 164
      */
164 165
     public function setMaximumAttendeeCapacity($maximumAttendeeCapacity);
165 166
 
@@ -247,6 +248,7 @@  discard block
 block discarded – undo
247 248
 
248 249
     /**
249 250
      * @param Event $subEvent
251
+     * @return void
250 252
      */
251 253
     public function setSubEvent(Event $subEvent);
252 254
 
Please login to merge, or discard this patch.