Completed
Push — master ( c465f0...d74b10 )
by Marc
07:38 queued 01:14
created
core/console/Bootstrap.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -36,15 +36,15 @@
 block discarded – undo
36 36
     public function run($app)
37 37
     {
38 38
         foreach ($app->getApplicationModules() as $id => $module) {
39
-            $folder = $module->basePath . DIRECTORY_SEPARATOR . 'commands';
39
+            $folder = $module->basePath.DIRECTORY_SEPARATOR.'commands';
40 40
             if (file_exists($folder) && is_dir($folder)) {
41 41
                 foreach (FileHelper::findFiles($folder) as $file) {
42 42
                     
43
-                    $module->controllerNamespace = $module->namespace . '\commands';
43
+                    $module->controllerNamespace = $module->namespace.'\commands';
44 44
                     
45
-                    $className = '\\'.$module->getNamespace().'\\commands\\' . pathinfo($file, PATHINFO_FILENAME);
45
+                    $className = '\\'.$module->getNamespace().'\\commands\\'.pathinfo($file, PATHINFO_FILENAME);
46 46
 
47
-                    $command = str_replace('-controller', '', $module->id . '/' . Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME)));
47
+                    $command = str_replace('-controller', '', $module->id.'/'.Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME)));
48 48
                     
49 49
                     Yii::$app->controllerMap[$command] = ['class' => $className];
50 50
                 }
Please login to merge, or discard this patch.
core/base/Module.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -278,6 +278,6 @@
 block discarded – undo
278 278
      */
279 279
     public function getControllerPath()
280 280
     {
281
-        return Yii::getAlias('@' . str_replace('\\', '/', $this->controllerNamespace), false);
281
+        return Yii::getAlias('@'.str_replace('\\', '/', $this->controllerNamespace), false);
282 282
     }
283 283
 }
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\base;
4 4
 
5 5
 use yii;
6
-
7 6
 use luya\helpers\FileHelper;
8 7
 use yii\helpers\Inflector;
9 8
 use luya\console\interfaces\ImportControllerInterface;
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
@@ -164,18 +164,18 @@
 block discarded – undo
164 164
         }
165 165
         
166 166
         foreach ($this->getLog() as $section => $value) {
167
-            $this->outputInfo(PHP_EOL . $section . ":");
167
+            $this->outputInfo(PHP_EOL.$section.":");
168 168
             foreach ($value as $k => $v) {
169 169
                 if (is_array($v)) {
170 170
                     foreach ($v as $kk => $kv) {
171 171
                         if (is_array($kv)) {
172
-                            $this->output(" - {$kk}: " . print_r($kv, true));
172
+                            $this->output(" - {$kk}: ".print_r($kv, true));
173 173
                         } else {
174 174
                             $this->output(" - {$kk}: {$kv}");
175 175
                         }
176 176
                     }
177 177
                 } else {
178
-                    $this->output(" - " . $v);
178
+                    $this->output(" - ".$v);
179 179
                 }
180 180
             }
181 181
         }
Please login to merge, or discard this patch.
core/base/ModuleReflection.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
         
206 206
         return [
207 207
             'module' => $this->module->id,
208
-            'route' => $this->module->id . '/' . $request['route'],
208
+            'route' => $this->module->id.'/'.$request['route'],
209 209
             'params' => $request['args'],
210 210
         ];
211 211
     }
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
             throw new NotFoundHttpException(sprintf("Unable to create controller '%s' for module '%s'.", $requestRoute['route'], $this->module->id));
227 227
         }
228 228
         
229
-        Yii::info('LUYA module run module "'.$this->module->id.'" route ' . $requestRoute['route'], __METHOD__);
229
+        Yii::info('LUYA module run module "'.$this->module->id.'" route '.$requestRoute['route'], __METHOD__);
230 230
         
231 231
         $this->controller = $controller[0];
232 232
         
Please login to merge, or discard this patch.
core/helpers/ArrayHelper.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     public static function search(array $array, $searchText, $sensitive = false)
97 97
     {
98 98
         $function = ($sensitive) ? 'strpos' : 'stripos';
99
-        return array_filter($array, function ($item) use ($searchText, $function) {
99
+        return array_filter($array, function($item) use ($searchText, $function) {
100 100
             $response = false;
101 101
             foreach ($item as $key => $value) {
102 102
                 if ($response) {
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
     {
139 139
         $columns = array_column($array, $column);
140 140
         $key = array_search($search, $columns);
141
-        return ($key !== false) ?  $array[$key] : false;
141
+        return ($key !== false) ? $array[$key] : false;
142 142
     }
143 143
     
144 144
     /**
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
      */
169 169
     public static function searchColumns(array $array, $column, $search)
170 170
     {
171
-        $keys = array_filter($array, function ($var) use ($column, $search) {
171
+        $keys = array_filter($array, function($var) use ($column, $search) {
172 172
             return strcasecmp($search, $var[$column]) == 0 ? true : false;
173 173
         });
174 174
         
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
         $array = array_combine($range, $range);
209 209
         
210 210
         if ($text) {
211
-            array_walk($array, function (&$item, $key) use ($text) {
211
+            array_walk($array, function(&$item, $key) use ($text) {
212 212
                 if (is_array($text)) {
213 213
                     list($singular, $plural) = $text;
214 214
                     if ($key == 1) {
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
@@ -263,6 +263,6 @@
 block discarded – undo
263 263
     public function render($file, array $args = [])
264 264
     {
265 265
         $view = new View();
266
-        return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . FileHelper::ensureExtension($file, 'php'), $args);
266
+        return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.FileHelper::ensureExtension($file, 'php'), $args);
267 267
     }
268 268
 }
Please login to merge, or discard this patch.
core/web/filters/RobotsFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
     {
68 68
         if (Yii::$app->request->isPost) {
69 69
             if ($this->getElapsedProcessTime() < $this->delay) {
70
-                throw new InvalidCallException("Robots Filter has detected an invalid Request: " . VarDumper::export(Yii::$app->request->post()));
70
+                throw new InvalidCallException("Robots Filter has detected an invalid Request: ".VarDumper::export(Yii::$app->request->post()));
71 71
             }
72 72
         }
73 73
         
Please login to merge, or discard this patch.
core/helpers/ExportHelper.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
     /**
36 36
      *
37 37
      * @param array $contentRows
38
-     * @param unknown $delimiter
38
+     * @param string $delimiter
39 39
      * @param unknown $keys
40 40
      * @param string $generateHeader
41 41
      * @return string
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
      *
97 97
      * @param array $row
98 98
      * @param unknown $delimiter
99
-     * @param unknown $enclose
99
+     * @param string $enclose
100 100
      * @return string
101 101
      */
102 102
     protected static function generateRow(array $row, $delimiter, $enclose)
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
83 83
 
84 84
         $output = null;
85 85
         if ($generateHeader) {
86
-            $output.= self::generateRow($header, $delimiter, '"');
86
+            $output .= self::generateRow($header, $delimiter, '"');
87 87
         }
88 88
         foreach ($rows as $row) {
89
-            $output.= self::generateRow($row, $delimiter, '"');
89
+            $output .= self::generateRow($row, $delimiter, '"');
90 90
         }
91 91
 
92 92
         return $output;
@@ -101,10 +101,10 @@  discard block
 block discarded – undo
101 101
      */
102 102
     protected static function generateRow(array $row, $delimiter, $enclose)
103 103
     {
104
-        array_walk($row, function (&$item) use ($enclose) {
104
+        array_walk($row, function(&$item) use ($enclose) {
105 105
             $item = $enclose.Html::encode($item).$enclose;
106 106
         });
107 107
         
108
-        return implode($delimiter, $row) . PHP_EOL;
108
+        return implode($delimiter, $row).PHP_EOL;
109 109
     }
110 110
 }
Please login to merge, or discard this patch.
core/helpers/FileHelper.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     {
51 51
         $info = pathinfo($file);
52 52
         if (!isset($info['extension']) || empty($info['extension'])) {
53
-            $file = rtrim($file, '.') . '.' . $extension;
53
+            $file = rtrim($file, '.').'.'.$extension;
54 54
         }
55 55
 
56 56
         return $file;
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
             'extension' => (isset($path['extension']) && !empty($path['extension'])) ? $path['extension'] : false,
71 71
             'name' => (isset($path['filename']) && !empty($path['filename'])) ? $path['filename'] : false,
72 72
             'source' => $sourceFile,
73
-            'sourceFilename' => (isset($path['dirname']) && isset($path['filename'])) ? $path['dirname'] . DIRECTORY_SEPARATOR . $path['filename'] : false,
73
+            'sourceFilename' => (isset($path['dirname']) && isset($path['filename'])) ? $path['dirname'].DIRECTORY_SEPARATOR.$path['filename'] : false,
74 74
         ];
75 75
     }
76 76
     
Please login to merge, or discard this patch.
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -72,33 +72,33 @@
 block discarded – undo
72 72
      */
73 73
     public static function classInfo($file)
74 74
     {
75
-    	if (!is_file($file)) {
76
-    		return false;
77
-    	}
75
+        if (!is_file($file)) {
76
+            return false;
77
+        }
78 78
     	
79
-    	$phpCode = file_get_contents($file);
80
-    	$namespace = null;
79
+        $phpCode = file_get_contents($file);
80
+        $namespace = null;
81 81
     	
82
-    	if (preg_match('#^namespace\s+(.+?);$#sm', $phpCode, $m)) {
83
-    		$namespace = $m[1];
84
-    	}
82
+        if (preg_match('#^namespace\s+(.+?);$#sm', $phpCode, $m)) {
83
+            $namespace = $m[1];
84
+        }
85 85
     	
86
-    	$classes = self::classNameByTokens($phpCode);
86
+        $classes = self::classNameByTokens($phpCode);
87 87
     	
88
-    	return ['namespace' => $namespace, 'class' => end($classes)];
88
+        return ['namespace' => $namespace, 'class' => end($classes)];
89 89
     }
90 90
     
91 91
     private static function classNameByTokens($phpCode)
92 92
     {
93
-    	$classes = [];
94
-    	$tokens = token_get_all($phpCode);
95
-    	$count = count($tokens);
96
-    	for ($i = 2; $i < $count; $i++) {
97
-    		if ($tokens[$i - 2][0] == T_CLASS && $tokens[$i - 1][0] == T_WHITESPACE && $tokens[$i][0] == T_STRING) {
98
-    			$classes[] = $tokens[$i][1];
99
-    		}
100
-    	}
101
-    	return $classes;
93
+        $classes = [];
94
+        $tokens = token_get_all($phpCode);
95
+        $count = count($tokens);
96
+        for ($i = 2; $i < $count; $i++) {
97
+            if ($tokens[$i - 2][0] == T_CLASS && $tokens[$i - 1][0] == T_WHITESPACE && $tokens[$i][0] == T_STRING) {
98
+                $classes[] = $tokens[$i][1];
99
+            }
100
+        }
101
+        return $classes;
102 102
     }
103 103
     
104 104
     /**
Please login to merge, or discard this patch.