Completed
Pull Request — master (#1919)
by Sohel Ahmed
03:34
created
dev/TranslationController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
         $messageFiles = glob("$repoPath/src/**/messages/$language/$filename.php") ?: glob("$repoPath/src/messages/$language/$filename.php");
42 42
 
43 43
         $this->outputInfo('Following files will be affected:');
44
-        $this->output(implode("\n", $messageFiles) . "\n");
44
+        $this->output(implode("\n", $messageFiles)."\n");
45 45
 
46 46
         $key = $this->prompt('Insert translation key:');
47 47
         $text = $this->prompt('Insert translation text:');
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
         if (!$this->dry) {
61 61
             if (exec("[ -d $repoPath/.git ] && command -v git")) {
62
-                $diffCommand = "git --git-dir=$repoPath/.git --work-tree=$repoPath diff -- " . str_replace($repoPath . '/', '', implode(" ", $messageFiles));
62
+                $diffCommand = "git --git-dir=$repoPath/.git --work-tree=$repoPath diff -- ".str_replace($repoPath.'/', '', implode(" ", $messageFiles));
63 63
                 exec($diffCommand, $diff);
64 64
                 $this->output(implode("\n", $diff));
65 65
             }
Please login to merge, or discard this patch.
core/web/Controller.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -33,14 +33,14 @@
 block discarded – undo
33 33
     {
34 34
         if ($this->module instanceof Module) {
35 35
             if ($this->module->useAppViewPath) {
36
-                return '@app/views/' . $this->module->id . '/' . $this->id;
36
+                return '@app/views/'.$this->module->id.'/'.$this->id;
37 37
             } elseif (is_array($this->module->viewMap)) {
38
-                $currentAction = $this->id . '/' . ($this->action ? $this->action->id : $this->defaultAction);
38
+                $currentAction = $this->id.'/'.($this->action ? $this->action->id : $this->defaultAction);
39 39
                 foreach ($this->module->viewMap as $action => $viewPath) {
40 40
 
41 41
                     // Special case for map all views of controller
42 42
                     if ($action === '*') {
43
-                        return $viewPath . '/' . $this->id;
43
+                        return $viewPath.'/'.$this->id;
44 44
                     } elseif (fnmatch($action, $currentAction)) {
45 45
                         return $viewPath;
46 46
                     }
Please login to merge, or discard this patch.
core/web/Svg.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -100,25 +100,25 @@  discard block
 block discarded – undo
100 100
     public function run()
101 101
     {
102 102
         // Cache generated code
103
-        return $this->getOrSetHasCache(['svg', $this->folder, $this->file, $this->cssClass], function () {
103
+        return $this->getOrSetHasCache(['svg', $this->folder, $this->file, $this->cssClass], function() {
104 104
 
105 105
             // Check if file ends with .svg, if not add the extension
106
-            $svgFile = StringHelper::endsWith($this->file, '.svg') ? $this->file : $this->file . '.svg';
106
+            $svgFile = StringHelper::endsWith($this->file, '.svg') ? $this->file : $this->file.'.svg';
107 107
 
108 108
             if ($this->symbolMode) {
109
-                $svgPath = Yii::$app->view->publicHtml . '/' . $svgFile;
109
+                $svgPath = Yii::$app->view->publicHtml.'/'.$svgFile;
110 110
 
111
-                return '<svg class="symbol symbol--' . $this->symbolName . '' . ($this->cssClass ? ' ' . $this->cssClass : '') . '"><use class="symbol__use" xlink:href="' . $svgPath . '#' . $this->symbolName . '" /></svg>';
111
+                return '<svg class="symbol symbol--'.$this->symbolName.''.($this->cssClass ? ' '.$this->cssClass : '').'"><use class="symbol__use" xlink:href="'.$svgPath.'#'.$this->symbolName.'" /></svg>';
112 112
             } else {
113 113
                 // Build the full svg file path
114
-                $svgPath = $this->folder . DIRECTORY_SEPARATOR . $svgFile;
114
+                $svgPath = $this->folder.DIRECTORY_SEPARATOR.$svgFile;
115 115
 
116 116
                 // Get the svg contents
117 117
                 $content = FileHelper::getFileContent($svgPath);
118 118
 
119 119
                 // If a cssClass string is given, add it to the <svg> tag
120 120
                 if ($this->cssClass && is_string($this->cssClass)) {
121
-                    $content = preg_replace('/<svg/', '<svg class="' . $this->cssClass . '"', $content);
121
+                    $content = preg_replace('/<svg/', '<svg class="'.$this->cssClass.'"', $content);
122 122
                 }
123 123
 
124 124
                 if ($content) {
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
                 }
127 127
             }
128 128
 
129
-            throw new Exception('Unable to access SVG File: ' . $svgPath);
129
+            throw new Exception('Unable to access SVG File: '.$svgPath);
130 130
         });
131 131
     }
132 132
 }
Please login to merge, or discard this patch.
core/web/Element.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -255,6 +255,6 @@
 block discarded – undo
255 255
     {
256 256
         $view = new View();
257 257
         $view->autoRegisterCsrf = false;
258
-        return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . FileHelper::ensureExtension($file, 'php'), $args);
258
+        return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.FileHelper::ensureExtension($file, 'php'), $args);
259 259
     }
260 260
 }
Please login to merge, or discard this patch.
core/lazyload/LazyLoad.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -150,10 +150,10 @@  discard block
 block discarded – undo
150 150
      */
151 151
     public function run()
152 152
     {
153
-        $class = ($this->placeholderSrc ? 'lazyimage-wrapper' : 'lazy-image') . ' ' . $this->extraClass;
153
+        $class = ($this->placeholderSrc ? 'lazyimage-wrapper' : 'lazy-image').' '.$this->extraClass;
154 154
 
155 155
         if ($this->placeholderSrc && $this->placeholderAsBase64) {
156
-            $this->placeholderSrc = 'data:image/jpg;base64,' . base64_encode(file_get_contents($this->placeholderSrc));
156
+            $this->placeholderSrc = 'data:image/jpg;base64,'.base64_encode(file_get_contents($this->placeholderSrc));
157 157
         }
158 158
 
159 159
         if ($this->attributesOnly && !$this->placeholderSrc) {
@@ -161,15 +161,15 @@  discard block
 block discarded – undo
161 161
         }
162 162
 
163 163
         if ($this->placeholderSrc) {
164
-            $tag = '<div class="' . $class . '">';
164
+            $tag = '<div class="'.$class.'">';
165 165
             $tag .= Html::tag('img', '', ['class' => 'lazy-image lazyimage', 'data-src' => $this->src]);
166 166
             $tag .= Html::tag('img', '', ['class' => 'lazyimage-placeholder-image', 'src' => $this->placeholderSrc]);
167
-            $tag .= '<noscript><img class="lazyimage-image" src="' . $this->src . '" /></noscript>';
167
+            $tag .= '<noscript><img class="lazyimage-image" src="'.$this->src.'" /></noscript>';
168 168
             $tag .= '</div>';
169 169
         } else {
170 170
             $tag = Html::tag('img', '', ['class' => $class, 'data-src' => $this->src, 'data-width' => $this->width, 'data-height' => $this->height]);
171 171
             if ($this->width && $this->height) {
172
-                $tag .= '<div class="lazy-placeholder ' . $class .'"><div style="display: block; height: 0px; padding-bottom: ' . ($this->height / $this->width) * 100 . '%;"></div><div class="loader"></div></div>';
172
+                $tag .= '<div class="lazy-placeholder '.$class.'"><div style="display: block; height: 0px; padding-bottom: '.($this->height / $this->width) * 100.'%;"></div><div class="loader"></div></div>';
173 173
             }
174 174
             $tag .= '<noscript><img class="'.$class.'" src="'.$this->src.'" /></noscript>';
175 175
         }
Please login to merge, or discard this patch.
core/web/jsonld/EventTrait.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
     /**
170 170
      * The time admission will commence.
171 171
      *
172
-     * @param DateTime $doorTime
172
+     * @param DateTimeValue $doorTime
173 173
      * @return static
174 174
      */
175 175
     public function setDoorTime(DateTimeValue $doorTime)
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
     /**
192 192
      * The duration of the item (movie, audio recording, event, etc.) in ISO 8601 date format.
193 193
      *
194
-     * @param Duration $duration
194
+     * @param DurationValue $duration
195 195
      * @return static
196 196
      */
197 197
     public function setDuration(DurationValue $duration)
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
     /**
214 214
      * The end date and time of the item (in ISO 8601 date format).
215 215
      *
216
-     * @param Date|DateTime $endDate
216
+     * @param DateTimeValue $endDate
217 217
      * @return static
218 218
      */
219 219
     public function setEndDate(DateTimeValue $endDate)
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
      * Please use one of the language codes from the IETF BCP 47 standard. See also availableLanguage.
262 262
      * Supersedes language.
263 263
      *
264
-     * @param Language|Text $inLanguage
264
+     * @param LanguageValue $inLanguage
265 265
      * @return static
266 266
      */
267 267
     public function setInLanguage(LanguageValue $inLanguage)
Please login to merge, or discard this patch.
core/base/ModuleReflection.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
         
217 217
         return [
218 218
             'module' => $this->module->id,
219
-            'route' => $this->module->id . '/' . $request['route'],
219
+            'route' => $this->module->id.'/'.$request['route'],
220 220
             'params' => $request['originalArgs'],
221 221
         ];
222 222
     }
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
             throw new NotFoundHttpException(sprintf("Unable to create controller '%s' for module '%s'.", $requestRoute['route'], $this->module->id));
238 238
         }
239 239
         
240
-        Yii::debug('LUYA module run module "'.$this->module->id.'" route ' . $requestRoute['route'], __METHOD__);
240
+        Yii::debug('LUYA module run module "'.$this->module->id.'" route '.$requestRoute['route'], __METHOD__);
241 241
         
242 242
         $this->controller = $controller[0];
243 243
         $originalController = Yii::$app->controller;
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
          *
249 249
          * @see https://github.com/luyadev/luya/issues/1730
250 250
          */
251
-        $this->controller->on(Controller::EVENT_BEFORE_ACTION, function ($event) {
251
+        $this->controller->on(Controller::EVENT_BEFORE_ACTION, function($event) {
252 252
             Yii::$app->controller = $this->controller;
253 253
         });
254 254
         /**
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
          *
257 257
          * @see https://github.com/luyadev/luya/issues/1768
258 258
          */
259
-        $this->controller->on(Controller::EVENT_AFTER_ACTION, function ($event) use ($originalController) {
259
+        $this->controller->on(Controller::EVENT_AFTER_ACTION, function($event) use ($originalController) {
260 260
             Yii::$app->controller = $originalController;
261 261
         });
262 262
         
Please login to merge, or discard this patch.
core/web/EmailLink.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
     /**
50 50
      * Getter method for the e-mail.
51 51
      *
52
-     * @return string|boolean Returns the e-mail from the setter method, if mail is not valid false is returned.
52
+     * @return string|false Returns the e-mail from the setter method, if mail is not valid false is returned.
53 53
      */
54 54
     public function getEmail()
55 55
     {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
      */
62 62
     public function getHref()
63 63
     {
64
-        return empty($this->getEmail()) ? null : 'mailto:' . $this->getEmail();
64
+        return empty($this->getEmail()) ? null : 'mailto:'.$this->getEmail();
65 65
     }
66 66
 
67 67
     /**
Please login to merge, or discard this patch.
core/helpers/ObjectHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
         }
46 46
         
47 47
         if ($throwException) {
48
-            throw new Exception("The given object must be an instance of: " . implode(",", $haystack));
48
+            throw new Exception("The given object must be an instance of: ".implode(",", $haystack));
49 49
         }
50 50
         
51 51
         return false;
Please login to merge, or discard this patch.