Completed
Push — master ( 28be9d...cc0dae )
by Raphael
02:46
created
src/Scaffolder/Compilers/View/IndexViewCompiler.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -26,8 +26,7 @@  discard block
 block discarded – undo
26 26
         if (File::exists(base_path('scaffolder-config/cache/view_index_' . $hash . self::CACHE_EXT)))
27 27
         {
28 28
             return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash));
29
-        }
30
-        else
29
+        } else
31 30
         {
32 31
             $this->stub = $stub;
33 32
 
@@ -58,8 +57,7 @@  discard block
 block discarded – undo
58 57
         if ($fileToCompile->cached)
59 58
         {
60 59
             File::copy(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $path);
61
-        }
62
-        else
60
+        } else
63 61
         {
64 62
             File::put(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $compiled);
65 63
             File::copy(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $path);
@@ -89,8 +87,7 @@  discard block
 block discarded – undo
89 87
                 {
90 88
                     $fields .= sprintf("{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name);
91 89
                     $firstIteration = false;
92
-                }
93
-                else
90
+                } else
94 91
                 {
95 92
                     $fields .= sprintf("\t\t\t\t{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name);
96 93
                 }
@@ -124,8 +121,7 @@  discard block
 block discarded – undo
124 121
                     $fields .= sprintf("<th>%s</th>" . PHP_EOL, ucfirst($field->name));
125 122
                     $firstIteration = false;
126 123
 
127
-                }
128
-                else
124
+                } else
129 125
                 {
130 126
                     $fields .= sprintf("\t\t\t<th>%s</th>" . PHP_EOL, ucfirst($field->name));
131 127
                 }
Please login to merge, or discard this patch.
src/Scaffolder/Compilers/Support/InputTypeResolverTrait.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,7 @@
 block discarded – undo
16 16
         if ($fieldData->type->ui == 'text')
17 17
         {
18 18
             return '{!! Form::text(\'%s\', (isset($model)) ? $model->' . $fieldData->name . ' : null) !!}';
19
-        }
20
-        elseif ($fieldData->type->ui == 'textarea')
19
+        } elseif ($fieldData->type->ui == 'textarea')
21 20
         {
22 21
             return '{!! Form::textarea(\'%s\', (isset($model)) ? $model->' . $fieldData->name . ' : null) !!}';
23 22
         }
Please login to merge, or discard this patch.
src/Scaffolder/Compilers/Support/PathParser.php 1 patch
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -18,33 +18,26 @@
 block discarded – undo
18 18
             if (head($path) == 'app')
19 19
             {
20 20
                 $path = app_path(last($path));
21
-            }
22
-            elseif (head($path) == 'base')
21
+            } elseif (head($path) == 'base')
23 22
             {
24 23
                 $path = base_path(last($path));
25
-            }
26
-            elseif (head($path) == 'config')
24
+            } elseif (head($path) == 'config')
27 25
             {
28 26
                 $path = config_path(last($path));
29
-            }
30
-            elseif (head($path) == 'database')
27
+            } elseif (head($path) == 'database')
31 28
             {
32 29
                 $path = database_path(last($path));
33
-            }
34
-            elseif (head($path) == 'public')
30
+            } elseif (head($path) == 'public')
35 31
             {
36 32
                 $path = public_path(last($path));
37
-            }
38
-            elseif (head($path) == 'storage')
33
+            } elseif (head($path) == 'storage')
39 34
             {
40 35
                 $path = storage_path(last($path));
41
-            }
42
-            else
36
+            } else
43 37
             {
44 38
                 $path = head($path);
45 39
             }
46
-        }
47
-        else
40
+        } else
48 41
         {
49 42
             $path = head($path);
50 43
         }
Please login to merge, or discard this patch.
routes/generator.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,8 +27,11 @@  discard block
 block discarded – undo
27 27
 
28 28
     array_walk_recursive($models, function (&$item)
29 29
     {
30
-        if ($item == 'true') $item = true;
31
-        elseif ($item == 'false') $item = false;
30
+        if ($item == 'true') {
31
+            $item = true;
32
+        } elseif ($item == 'false') {
33
+            $item = false;
34
+        }
32 35
     });
33 36
 
34 37
     // Generate app.json
@@ -51,8 +54,11 @@  discard block
 block discarded – undo
51 54
 
52 55
     array_walk_recursive($models, function (&$item)
53 56
     {
54
-        if ($item == 'true') $item = true;
55
-        elseif ($item == 'false') $item = false;
57
+        if ($item == 'true') {
58
+            $item = true;
59
+        } elseif ($item == 'false') {
60
+            $item = false;
61
+        }
56 62
     });
57 63
 
58 64
     // Generate app.json
Please login to merge, or discard this patch.
src/Scaffolder/Support/Validator.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -77,8 +77,7 @@  discard block
 block discarded – undo
77 77
 						if($blnSearch) {
78 78
 							$attribute = null ;
79 79
 							$attributeValue = null ;
80
-						}
81
-						else {
80
+						} else {
82 81
 							$attribute = "required" ;
83 82
 							$attributeValue = null ;
84 83
 						}
@@ -97,8 +96,9 @@  discard block
 block discarded – undo
97 96
 						break;
98 97
 				}
99 98
 
100
-				if($attribute)
101
-					$validationsConverted[$attribute] = $attributeValue ;
99
+				if($attribute) {
100
+									$validationsConverted[$attribute] = $attributeValue ;
101
+				}
102 102
 
103 103
 			}
104 104
 			
Please login to merge, or discard this patch.
src/Scaffolder/Support/CamelCase.php 1 patch
Braces   +31 added lines, -21 removed lines patch added patch discarded remove patch
@@ -17,16 +17,19 @@  discard block
 block discarded – undo
17 17
 	}
18 18
     
19 19
 	public static function underscoreFromCamelCase($strName) {
20
-		if (strlen($strName) == 0) return '';
20
+		if (strlen($strName) == 0) {
21
+		    return '';
22
+		}
21 23
 
22 24
 		$strToReturn = self::FirstCharacter($strName);
23 25
 
24 26
 		for ($intIndex = 1; $intIndex < strlen($strName); $intIndex++) {
25 27
 			$strChar = substr($strName, $intIndex, 1);
26
-			if (strtoupper($strChar) == $strChar)
27
-				$strToReturn .= '_' . $strChar;
28
-			else
29
-				$strToReturn .= $strChar;
28
+			if (strtoupper($strChar) == $strChar) {
29
+							$strToReturn .= '_' . $strChar;
30
+			} else {
31
+							$strToReturn .= $strChar;
32
+			}
30 33
 		}
31 34
 		
32 35
 		return strtolower($strToReturn);
@@ -39,10 +42,11 @@  discard block
 block discarded – undo
39 42
 	 * @return string the first character, or null
40 43
 	 */
41 44
 	public final static function firstCharacter($strString) {
42
-		if (strlen($strString) > 0)
43
-			return substr($strString, 0 , 1);
44
-		else
45
-			return null;
45
+		if (strlen($strString) > 0) {
46
+					return substr($strString, 0 , 1);
47
+		} else {
48
+					return null;
49
+		}
46 50
 	}    
47 51
 
48 52
 
@@ -54,18 +58,24 @@  discard block
 block discarded – undo
54 58
 			}
55 59
 
56 60
 			$intLength = strlen($strName);
57
-			if (substr($strName, $intLength - 1) == "y")
58
-				return substr($strName, 0, $intLength - 1) . "ies";
59
-			if (substr($strName, $intLength - 1) == "s")
60
-				return $strName . "es";
61
-			if (substr($strName, $intLength - 1) == "x")
62
-				return $strName . "es";
63
-			if (substr($strName, $intLength - 1) == "z")
64
-				return $strName . "zes";
65
-			if (substr($strName, $intLength - 2) == "sh")
66
-				return $strName . "es";
67
-			if (substr($strName, $intLength - 2) == "ch")
68
-				return $strName . "es";
61
+			if (substr($strName, $intLength - 1) == "y") {
62
+							return substr($strName, 0, $intLength - 1) . "ies";
63
+			}
64
+			if (substr($strName, $intLength - 1) == "s") {
65
+							return $strName . "es";
66
+			}
67
+			if (substr($strName, $intLength - 1) == "x") {
68
+							return $strName . "es";
69
+			}
70
+			if (substr($strName, $intLength - 1) == "z") {
71
+							return $strName . "zes";
72
+			}
73
+			if (substr($strName, $intLength - 2) == "sh") {
74
+							return $strName . "es";
75
+			}
76
+			if (substr($strName, $intLength - 2) == "ch") {
77
+							return $strName . "es";
78
+			}
69 79
 
70 80
 			return $strName . "s";
71 81
 		}
Please login to merge, or discard this patch.
src/Scaffolder/Support/Arrays.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,14 +5,14 @@
 block discarded – undo
5 5
 class Arrays
6 6
 {
7 7
 	public static function moveElement($array, $toMove, $targetIndex) {
8
-		if (count($array) == 1)
9
-			return $array;
8
+		if (count($array) == 1) {
9
+					return $array;
10
+		}
10 11
 		if (is_int($toMove)) {
11 12
 			$tmp = array_splice($array, $toMove, 1);
12 13
 			array_splice($array, $targetIndex, 0, $tmp);
13 14
 			$output = $array;
14
-		}
15
-		elseif (is_string($toMove)) {
15
+		} elseif (is_string($toMove)) {
16 16
 			$indexToMove = array_search($toMove, array_keys($array));
17 17
 			$itemToMove = $array[$toMove];
18 18
 			array_splice($array, $indexToMove, 1);
Please login to merge, or discard this patch.
src/Scaffolder/Commands/ServeCommand.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,13 +34,15 @@
 block discarded – undo
34 34
 
35 35
 		$overwrite = false;
36 36
 
37
-		if($this->option('overwrite'))
38
-			$overwrite = true;
37
+		if($this->option('overwrite')) {
38
+					$overwrite = true;
39
+		}
39 40
 
40 41
 		$generate = false;
41 42
 
42
-		if($this->option('generate'))
43
-			$generate = true;
43
+		if($this->option('generate')) {
44
+					$generate = true;
45
+		}
44 46
 
45 47
 
46 48
 		switch ($this->argument('app')) {
Please login to merge, or discard this patch.
src/Scaffolder/Commands/GeneratorCommand.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -289,8 +289,9 @@
 block discarded – undo
289 289
 			//array_push($listChooseColumnsCompilerOutput, $listChooseColumnsCompiler->compile());
290 290
 
291 291
 			$compiledIndexes .= $indexModuleCompiler->replaceResource($modelData);
292
-			if ($intKey < count($modelsData))
293
-				$compiledIndexes .= ",";
292
+			if ($intKey < count($modelsData)) {
293
+							$compiledIndexes .= ",";
294
+			}
294 295
 
295 296
 			$intKey++;
296 297
 			// Advance progress
Please login to merge, or discard this patch.