Completed
Pull Request — master (#1319)
by Alexander
03:11
created
core/console/commands/ModuleController.php 2 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -17,6 +17,7 @@
 block discarded – undo
17 17
     /**
18 18
      * Humanize the class name
19 19
      *
20
+     * @param string $name
20 21
      * @return string The humanized name.
21 22
      */
22 23
     public function humanizeName($name)
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -106,23 +106,23 @@  discard block
 block discarded – undo
106 106
             }
107 107
         }
108 108
         
109
-        $appModulesFolder = Yii::$app->basePath . DIRECTORY_SEPARATOR . 'modules';
110
-        $moduleFolder = $appModulesFolder . DIRECTORY_SEPARATOR . $moduleName;
109
+        $appModulesFolder = Yii::$app->basePath.DIRECTORY_SEPARATOR.'modules';
110
+        $moduleFolder = $appModulesFolder.DIRECTORY_SEPARATOR.$moduleName;
111 111
         
112 112
         if (file_exists($moduleFolder)) {
113
-            return $this->outputError("The folder " . $moduleFolder . " exists already.");
113
+            return $this->outputError("The folder ".$moduleFolder." exists already.");
114 114
         }
115 115
         
116 116
         $folders = [
117 117
             'basePath' => $moduleFolder,
118
-            'adminPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'admin',
119
-            'adminAwsPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . 'aws',
120
-            'adminMigrationPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . 'migrations',
121
-            'frontendPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend',
122
-            'frontendBlocksPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'blocks',
123
-            'frontendControllersPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'controllers',
124
-            'frontendViewsPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'frontend' . DIRECTORY_SEPARATOR . 'views',
125
-            'modelsPath' => $moduleFolder . DIRECTORY_SEPARATOR . 'models',
118
+            'adminPath' => $moduleFolder.DIRECTORY_SEPARATOR.'admin',
119
+            'adminAwsPath' => $moduleFolder.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR.'aws',
120
+            'adminMigrationPath' => $moduleFolder.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR.'migrations',
121
+            'frontendPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend',
122
+            'frontendBlocksPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend'.DIRECTORY_SEPARATOR.'blocks',
123
+            'frontendControllersPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend'.DIRECTORY_SEPARATOR.'controllers',
124
+            'frontendViewsPath' => $moduleFolder.DIRECTORY_SEPARATOR.'frontend'.DIRECTORY_SEPARATOR.'views',
125
+            'modelsPath' => $moduleFolder.DIRECTORY_SEPARATOR.'models',
126 126
         ];
127 127
 
128 128
         $ns = 'app\\modules\\'.$moduleName;
@@ -132,9 +132,9 @@  discard block
 block discarded – undo
132 132
         }
133 133
         
134 134
         $contents = [
135
-            $moduleFolder. DIRECTORY_SEPARATOR . 'README.md' => $this->renderReadme($folders, $moduleName, $ns),
136
-            $moduleFolder. DIRECTORY_SEPARATOR . 'admin/Module.php' => $this->renderAdmin($folders, $moduleName, $ns),
137
-            $moduleFolder. DIRECTORY_SEPARATOR . 'frontend/Module.php' => $this->renderFrontend($folders, $moduleName, $ns),
135
+            $moduleFolder.DIRECTORY_SEPARATOR.'README.md' => $this->renderReadme($folders, $moduleName, $ns),
136
+            $moduleFolder.DIRECTORY_SEPARATOR.'admin/Module.php' => $this->renderAdmin($folders, $moduleName, $ns),
137
+            $moduleFolder.DIRECTORY_SEPARATOR.'frontend/Module.php' => $this->renderFrontend($folders, $moduleName, $ns),
138 138
         ];
139 139
         
140 140
         foreach ($contents as $fileName => $content) {
Please login to merge, or discard this patch.
core/helpers/StringHelper.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
             return true;
72 72
         }
73 73
         
74
-        return ($value == (string)(float) $value);
74
+        return ($value == (string) (float) $value);
75 75
     }
76 76
     
77 77
     /**
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
      * @param string $search Search string to look for.
106 106
      * @param string $replace Replacement value for the first found occurrence.
107 107
      * @param string $subject The string you want to look up to replace the first element.
108
-     * @return mixed Replaced string
108
+     * @return string Replaced string
109 109
      */
110 110
     public static function replaceFirst($search, $replace, $subject)
111 111
     {
Please login to merge, or discard this patch.
core/web/Composition.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -398,7 +398,7 @@
 block discarded – undo
398 398
      *
399 399
      * @see ArrayAccess::offsetGet()
400 400
      * @param string $offset The key to get from the array.
401
-     * @return mixed The value for the offset key from the array.
401
+     * @return string|boolean The value for the offset key from the array.
402 402
      */
403 403
     public function offsetGet($offset)
404 404
     {
Please login to merge, or discard this patch.
core/web/UrlManager.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -187,7 +187,7 @@
 block discarded – undo
187 187
      * Remove the base url from a route
188 188
      *
189 189
      * @param string $route The route where the baseUrl should be removed from.
190
-     * @return mixed
190
+     * @return string
191 191
      */
192 192
     public function removeBaseUrl($route)
193 193
     {
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
         $length = strlen($composition);
95 95
         $route = $parsedRequest[0];
96 96
         
97
-        if (substr($route, 0, $length+1) == $composition.'/') {
97
+        if (substr($route, 0, $length + 1) == $composition.'/') {
98 98
             $parsedRequest[0] = substr($parsedRequest[0], $length);
99 99
         }
100 100
         
@@ -302,10 +302,10 @@  discard block
 block discarded – undo
302 302
         $params = (array) $params;
303 303
         $url = $this->internalCreateUrl($params);
304 304
         if (strpos($url, '://') === false) {
305
-            $url = $this->getHostInfo() . $url;
305
+            $url = $this->getHostInfo().$url;
306 306
         }
307 307
         if (is_string($scheme) && ($pos = strpos($url, '://')) !== false) {
308
-            $url = $scheme . substr($url, $pos);
308
+            $url = $scheme.substr($url, $pos);
309 309
         }
310 310
         return $url;
311 311
     }
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 namespace luya\web;
4 4
 
5 5
 use Yii;
6
-
7 6
 use yii\web\BadRequestHttpException;
8 7
 
9 8
 /**
Please login to merge, or discard this patch.
core/base/Widget.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,6 +39,6 @@
 block discarded – undo
39 39
         // get reflection
40 40
         $class = new ReflectionClass($this);
41 41
         // get path with alias
42
-        return '@app/views/widgets/' . Inflector::camel2id($class->getShortName());
42
+        return '@app/views/widgets/'.Inflector::camel2id($class->getShortName());
43 43
     }
44 44
 }
Please login to merge, or discard this patch.
core/TagParser.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@
 block discarded – undo
123 123
     {
124 124
         if (!is_object($this->tags[$tag])) {
125 125
             $this->tags[$tag] = Yii::createObject($this->tags[$tag]);
126
-            Yii::trace('tag parser object generated for:'. $tag, __CLASS__);
126
+            Yii::trace('tag parser object generated for:'.$tag, __CLASS__);
127 127
         }
128 128
     }
129 129
     
Please login to merge, or discard this patch.
core/console/commands/HealthController.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
         
47 47
         @chdir(Yii::getAlias('@app'));
48 48
 
49
-        $this->output('The directory the health commands is applying to: ' . Yii::getAlias('@app'));
49
+        $this->output('The directory the health commands is applying to: '.Yii::getAlias('@app'));
50 50
         
51 51
         foreach ($this->folders as $folder => $writable) {
52 52
             $mode = ($writable) ? 0777 : 0775;
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
     /**
38 38
      * Create all required directories an check whether they are writeable or not.
39 39
      *
40
-     * @return string The action output.
40
+     * @return integer The action output.
41 41
      */
42 42
     public function actionIndex()
43 43
     {
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
     /**
98 98
      * Test Mail-Component (Use --verbose=1 to enable smtp debug output)
99 99
      *
100
-     * @return boolean Whether successfull or not.
100
+     * @return integer|null Whether successfull or not.
101 101
      * @throws Exception On smtp failure
102 102
      */
103 103
     public function actionMailer()
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,6 @@
 block discarded – undo
4 4
 
5 5
 use Yii;
6 6
 use yii\helpers\FileHelper;
7
-
8 7
 use yii\imagine\Image;
9 8
 
10 9
 /**
Please login to merge, or discard this patch.
core/tag/tags/TelTag.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 parse($value, $sub)
51 51
     {
52
-        return Html::a(empty($sub) ? $value : $sub, 'tel:' . $this->ensureNumber($value));
52
+        return Html::a(empty($sub) ? $value : $sub, 'tel:'.$this->ensureNumber($value));
53 53
     }
54 54
         
55 55
     private function ensureNumber($number)
Please login to merge, or discard this patch.
core/web/filters/ResponseCache.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -157,7 +157,7 @@
 block discarded – undo
157 157
             return $response->send();
158 158
         }
159 159
         
160
-        $response->on(Response::EVENT_AFTER_SEND, function ($event) use ($action) {
160
+        $response->on(Response::EVENT_AFTER_SEND, function($event) use ($action) {
161 161
             $this->callActionCallable($action->id, $event->sender->content);
162 162
         });
163 163
         
Please login to merge, or discard this patch.