Completed
Pull Request — master (#923)
by Martin
02:55
created
core/base/Boot.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
     /**
101 101
      * Run the application based on the Sapi Name.
102 102
      *
103
-     * @return luya\web\Application|luya\cli\Application Application objected based on the sapi name.
103
+     * @return null|integer Application objected based on the sapi name.
104 104
      */
105 105
     public function run()
106 106
     {
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
     /**
134 134
      * Run Web-Application based on the provided config file.
135 135
      * 
136
-     * @return string|void Returns the Yii Application run() method if mock is disabled. Otherwise returns void
136
+     * @return integer|null Returns the Yii Application run() method if mock is disabled. Otherwise returns void
137 137
      */
138 138
     public function applicationWeb()
139 139
     {
Please login to merge, or discard this patch.
core/console/commands/MigrateController.php 2 patches
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -42,6 +42,11 @@
 block discarded – undo
42 42
         }
43 43
     }
44 44
 
45
+    /**
46
+     * @param string|boolean $module
47
+     *
48
+     * @return string
49
+     */
45 50
     private function getModuleMigrationDirectorie($module)
46 51
     {
47 52
         if (!array_key_exists($module, $this->moduleMigrationDirectories)) {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
     protected function createMigration($class)
55 55
     {
56
-        $orig = $this->migrationPath . DIRECTORY_SEPARATOR . $class . '.php';
56
+        $orig = $this->migrationPath.DIRECTORY_SEPARATOR.$class.'.php';
57 57
         
58 58
         if (file_exists($orig)) {
59 59
             require_once $file;
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
         
72 72
         $module = $this->prompt("Could not find migration class. Please enter the module name who belongs to '$class.':");
73 73
         $dir = $this->getModuleMigrationDirectorie($module);
74
-        $file = $dir . DIRECTORY_SEPARATOR . $class . '.php';
74
+        $file = $dir.DIRECTORY_SEPARATOR.$class.'.php';
75 75
         if (file_exists($file)) {
76 76
             require_once $file;
77 77
             return new $class();
Please login to merge, or discard this patch.
core/helpers/Url.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
      *
38 38
      * @param string $route
39 39
      * @param array  $params
40
-     * @param boolean $sheme Whether to return static url or not
40
+     * @param boolean $scheme Whether to return static url or not
41 41
      * @todo we have to remove this method as it provides no additinal functions to the yii\helpers\url to method
42 42
      */
43 43
     public static function toManager($route, array $params = [], $scheme = false)
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@
 block discarded – undo
104 104
     public static function ensureHttp($url, $https = false)
105 105
     {
106 106
         if (!preg_match("~^(?:f|ht)tps?://~i", $url)) {
107
-            $url = ($https ? "https://" : "http://") . $url;
107
+            $url = ($https ? "https://" : "http://").$url;
108 108
         }
109 109
         
110 110
         return $url;
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
@@ -234,7 +234,7 @@
 block discarded – undo
234 234
     /**
235 235
      * Return a path like string with all composition with trailing slash e.g. us/e.
236 236
      *
237
-     * @return void|string
237
+     * @return string
238 238
      */
239 239
     public function getFull()
240 240
     {
Please login to merge, or discard this patch.
core/web/UrlManager.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
         if ($route === $composition) {
49 49
             $parsedRequest[0] = false;
50 50
         // now see if the composition (+1 as we add add trailing slash at the end) matches the cutted route request part, if so its composition prefix, remove it.
51
-        } elseif (substr($route, 0, $length+1) == $composition.'/') {
51
+        } elseif (substr($route, 0, $length + 1) == $composition.'/') {
52 52
             $parsedRequest[0] = substr($parsedRequest[0], $length);
53 53
         }
54 54
         // fix broken request urls
@@ -211,10 +211,10 @@  discard block
 block discarded – undo
211 211
         $params = (array) $params;
212 212
         $url = $this->internalCreateUrl($params);
213 213
         if (strpos($url, '://') === false) {
214
-            $url = $this->getHostInfo() . $url;
214
+            $url = $this->getHostInfo().$url;
215 215
         }
216 216
         if (is_string($scheme) && ($pos = strpos($url, '://')) !== false) {
217
-            $url = $scheme . substr($url, $pos);
217
+            $url = $scheme.substr($url, $pos);
218 218
         }
219 219
         return $url;
220 220
     }
Please login to merge, or discard this patch.
Doc Comments   +11 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,6 +35,7 @@  discard block
 block discarded – undo
35 35
      * 
36 36
      * {@inheritDoc}
37 37
      * @see \yii\web\UrlManager::parseRequest()
38
+     * @param Request $request
38 39
      */
39 40
     public function parseRequest($request)
40 41
     {
@@ -139,7 +140,7 @@  discard block
 block discarded – undo
139 140
      * Remove the base url from a route
140 141
      * 
141 142
      * @param string $route The route where the baseUrl should be removed from.
142
-     * @return mixed
143
+     * @return string
143 144
      */
144 145
     public function removeBaseUrl($route)
145 146
     {
@@ -187,7 +188,7 @@  discard block
 block discarded – undo
187 188
      * Yii2 createUrl base implementation extends the prepand of the comosition
188 189
      * 
189 190
      * @param string|array $params An array with params or not (e.g. `['module/controller/action', 'param1' => 'value1']`)
190
-     * @param null|object $composition Composition instance to change the route behavior
191
+     * @param Composition $composition Composition instance to change the route behavior
191 192
      * @return string
192 193
      */
193 194
     public function internalCreateUrl($params, $composition = null)
@@ -234,6 +235,11 @@  discard block
 block discarded – undo
234 235
         return $url;
235 236
     }
236 237
     
238
+    /**
239
+     * @param string $route
240
+     *
241
+     * @return string
242
+     */
237 243
     private function findModuleInRoute($route)
238 244
     {
239 245
         $parts = array_values(array_filter(explode('/', $route)));
@@ -247,6 +253,9 @@  discard block
 block discarded – undo
247 253
         return false;
248 254
     }
249 255
     
256
+    /**
257
+     * @param string $url
258
+     */
250 259
     private function urlReplaceModule($url, $navItemId, \luya\web\Composition $composition)
251 260
     {
252 261
         $route = $this->removeBaseUrl($url);
Please login to merge, or discard this patch.
core/web/Twig.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -30,38 +30,38 @@  discard block
 block discarded – undo
30 30
     public function getFunctions()
31 31
     {
32 32
         return [
33
-            'menuFindAll' => function ($container, $parentNavId) {
33
+            'menuFindAll' => function($container, $parentNavId) {
34 34
                 return Yii::$app->menu->findAll(['container' => $container, 'parent_nav_id' => $parentNavId]);
35 35
             },
36
-            'menuFindOne' => function ($id) {
36
+            'menuFindOne' => function($id) {
37 37
                 return Yii::$app->menu->findOne(['id' => $id]);
38 38
             },
39
-            'menuCurrent' => function () {
39
+            'menuCurrent' => function() {
40 40
                 return Yii::$app->menu->current;
41 41
             },
42
-            'menuCurrentLevel' => function ($level) {
42
+            'menuCurrentLevel' => function($level) {
43 43
                 return Yii::$app->menu->getLevelCurrent($level);
44 44
             },
45
-            'menuLevelContainer' => function ($level) {
45
+            'menuLevelContainer' => function($level) {
46 46
                 return Yii::$app->menu->getLevelContainer($level);
47 47
             },
48
-            'asset' => function ($name) {
48
+            'asset' => function($name) {
49 49
                 return Yii::$app->getAssetManager()->getBundle($name);
50 50
             },
51
-            'filterApply' => function ($imageId, $filterIdentifier) {
51
+            'filterApply' => function($imageId, $filterIdentifier) {
52 52
                 return Yii::$app->storage->getImage($imageId)->applyFilter($filterIdentifier);
53 53
             },
54
-            'image' => function ($imageId) {
54
+            'image' => function($imageId) {
55 55
                 return Yii::$app->storage->getImage($imageId);
56 56
             },
57
-            'element' => function () {
57
+            'element' => function() {
58 58
                 $args = func_get_args();
59 59
                 $method = $args[0];
60 60
                 unset($args[0]);
61 61
 
62 62
                 return Yii::$app->element->run($method, $args);
63 63
             },
64
-            't' => function () {
64
+            't' => function() {
65 65
                 $args = func_get_args();
66 66
 
67 67
                 return call_user_func_array(['Yii', 't'], $args);
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
             $twig->addFunction(new Twig_SimpleFunction($name, $lambda));
80 80
         }
81 81
         
82
-        $twig->addFilter(new Twig_SimpleFilter('strftime', function ($timestamp, $format) {
82
+        $twig->addFilter(new Twig_SimpleFilter('strftime', function($timestamp, $format) {
83 83
             if (is_numeric($timestamp)) {
84 84
                 return strftime($format, $timestamp);
85 85
             }
Please login to merge, or discard this patch.
core/console/commands/HealthController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
         
37 37
         @chdir(Yii::getAlias('@app'));
38 38
 
39
-        $this->output('The directory the health commands is applying to: ' . Yii::getAlias('@app'));
39
+        $this->output('The directory the health commands is applying to: '.Yii::getAlias('@app'));
40 40
         
41 41
         foreach ($this->folders as $folder => $writable) {
42 42
             if (!file_exists($folder)) {
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
     /**
37 37
      * Create all required directories an check whether they are writeable or not.
38 38
      * 
39
-     * @return number
39
+     * @return integer
40 40
      */
41 41
     public function actionIndex()
42 42
     {
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     /**
90 90
      * Test Mail-Component (Use --verbose=1 to enable smtp debug output)
91 91
      * 
92
-     * @return bool|null
92
+     * @return integer|null
93 93
      * @throws Exception On smtp failure
94 94
      */
95 95
     public function actionMailer()
Please login to merge, or discard this patch.
core/console/commands/StorageController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -25,21 +25,21 @@
 block discarded – undo
25 25
 
26 26
         if (count($fileList) !== 0) {
27 27
             $success = true;
28
-            if ($this->confirm("Do you want to delete " . count($fileList) . " files which are not referenced in the database any more?")) {
28
+            if ($this->confirm("Do you want to delete ".count($fileList)." files which are not referenced in the database any more?")) {
29 29
                 foreach ($fileList as $file) {
30 30
                     if (is_file($file) && @unlink($file)) {
31
-                        $this->outputSuccess($file . " successful deleted.");
31
+                        $this->outputSuccess($file." successful deleted.");
32 32
                     } elseif (is_file($file)) {
33
-                        $this->outputError($file . " could not be deleted!");
33
+                        $this->outputError($file." could not be deleted!");
34 34
                         $success = false;
35 35
                     } else {
36
-                        $this->outputError($file . " could not be found!");
36
+                        $this->outputError($file." could not be found!");
37 37
                         $success = false;
38 38
                     }
39 39
                 }
40 40
             }
41 41
             if ($success) {
42
-                return $this->outputSuccess(count($fileList) . " files successful deleted.");
42
+                return $this->outputSuccess(count($fileList)." files successful deleted.");
43 43
             }
44 44
             return $this->outputError("Cleanup could not be completed. Please look into error above.");
45 45
         }
Please login to merge, or discard this patch.
core/console/commands/ActiveWindowController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,13 +31,13 @@
 block discarded – undo
31 31
         
32 32
         $module = Yii::$app->getModule($moduleId);
33 33
         
34
-        $folder = $module->basePath . DIRECTORY_SEPARATOR . 'aws';
34
+        $folder = $module->basePath.DIRECTORY_SEPARATOR.'aws';
35 35
         
36
-        $file = $folder . DIRECTORY_SEPARATOR . $className . '.php';
36
+        $file = $folder.DIRECTORY_SEPARATOR.$className.'.php';
37 37
         
38 38
         $content = $this->view->render('@luya/console/commands/views/aw/create.php', [
39 39
             'className' => $className,
40
-            'namespace' => $module->getNamespace() . '\\aws',
40
+            'namespace' => $module->getNamespace().'\\aws',
41 41
             'luya' => $this->getLuyaVersion(),
42 42
             'moduleId' => $moduleId,
43 43
             'alias' => Inflector::humanize(Inflector::camel2words($className)),
Please login to merge, or discard this patch.