@@ -26,8 +26,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | */ |
25 | 25 | public function compile($stub, $modelName, $modelData, $scaffolderConfig, $hash, $extra = null) |
26 | 26 | { |
27 | - if (File::exists(base_path('scaffolder-config/cache/view_index_' . $hash . self::CACHE_EXT))) |
|
27 | + if (File::exists(base_path('scaffolder-config/cache/view_index_'.$hash.self::CACHE_EXT))) |
|
28 | 28 | { |
29 | 29 | return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash)); |
30 | 30 | } |
@@ -53,22 +53,22 @@ discard block |
||
53 | 53 | */ |
54 | 54 | protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile) |
55 | 55 | { |
56 | - $folder = PathParser::parse($scaffolderConfig->paths->views) . strtolower($modelName) ; |
|
56 | + $folder = PathParser::parse($scaffolderConfig->paths->views).strtolower($modelName); |
|
57 | 57 | |
58 | 58 | // create folder directory |
59 | 59 | Directory::createIfNotExists($folder, 0755, true); |
60 | 60 | |
61 | - $path = $folder . '/index.blade.php'; |
|
61 | + $path = $folder.'/index.blade.php'; |
|
62 | 62 | |
63 | 63 | // Store in cache |
64 | 64 | if ($fileToCompile->cached) |
65 | 65 | { |
66 | - File::copy(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $path); |
|
66 | + File::copy(base_path('scaffolder-config/cache/view_index_'.$fileToCompile->hash.self::CACHE_EXT), $path); |
|
67 | 67 | } |
68 | 68 | else |
69 | 69 | { |
70 | - File::put(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $compiled); |
|
71 | - File::copy(base_path('scaffolder-config/cache/view_index_' . $fileToCompile->hash . self::CACHE_EXT), $path); |
|
70 | + File::put(base_path('scaffolder-config/cache/view_index_'.$fileToCompile->hash.self::CACHE_EXT), $compiled); |
|
71 | + File::copy(base_path('scaffolder-config/cache/view_index_'.$fileToCompile->hash.self::CACHE_EXT), $path); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | return $path; |
@@ -93,12 +93,12 @@ discard block |
||
93 | 93 | { |
94 | 94 | if ($firstIteration) |
95 | 95 | { |
96 | - $fields .= sprintf("{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name); |
|
96 | + $fields .= sprintf("{ data: '%s', name: '%s' },".PHP_EOL, $field->name, $field->name); |
|
97 | 97 | $firstIteration = false; |
98 | 98 | } |
99 | 99 | else |
100 | 100 | { |
101 | - $fields .= sprintf("\t\t\t\t{ data: '%s', name: '%s' }," . PHP_EOL, $field->name, $field->name); |
|
101 | + $fields .= sprintf("\t\t\t\t{ data: '%s', name: '%s' },".PHP_EOL, $field->name, $field->name); |
|
102 | 102 | } |
103 | 103 | } |
104 | 104 | } |
@@ -127,13 +127,13 @@ discard block |
||
127 | 127 | { |
128 | 128 | if ($firstIteration) |
129 | 129 | { |
130 | - $fields .= sprintf("<th>%s</th>" . PHP_EOL, ucfirst($field->name)); |
|
130 | + $fields .= sprintf("<th>%s</th>".PHP_EOL, ucfirst($field->name)); |
|
131 | 131 | $firstIteration = false; |
132 | 132 | |
133 | 133 | } |
134 | 134 | else |
135 | 135 | { |
136 | - $fields .= sprintf("\t\t\t<th>%s</th>" . PHP_EOL, ucfirst($field->name)); |
|
136 | + $fields .= sprintf("\t\t\t<th>%s</th>".PHP_EOL, ucfirst($field->name)); |
|
137 | 137 | } |
138 | 138 | } |
139 | 139 | } |
@@ -16,8 +16,7 @@ |
||
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 | } |
@@ -15,11 +15,11 @@ |
||
15 | 15 | { |
16 | 16 | if ($fieldData->type->ui == 'text') |
17 | 17 | { |
18 | - return '{!! Form::text(\'%s\', (isset($model)) ? $model->' . $fieldData->name . ' : null) !!}'; |
|
18 | + return '{!! Form::text(\'%s\', (isset($model)) ? $model->'.$fieldData->name.' : null) !!}'; |
|
19 | 19 | } |
20 | 20 | elseif ($fieldData->type->ui == 'textarea') |
21 | 21 | { |
22 | - return '{!! Form::textarea(\'%s\', (isset($model)) ? $model->' . $fieldData->name . ' : null) !!}'; |
|
22 | + return '{!! Form::textarea(\'%s\', (isset($model)) ? $model->'.$fieldData->name.' : null) !!}'; |
|
23 | 23 | } |
24 | 24 | } |
25 | 25 | } |
26 | 26 | \ No newline at end of file |
@@ -18,33 +18,26 @@ |
||
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 | } |
@@ -3,14 +3,14 @@ |
||
3 | 3 | use Illuminate\Database\Schema\Blueprint; |
4 | 4 | use Illuminate\Database\Migrations\Migration; |
5 | 5 | |
6 | -class Create{{class_name}}sTable extends Migration |
|
6 | +class Create {{class_name}}sTable extends Migration |
|
7 | 7 | { |
8 | 8 | /** |
9 | 9 | * Run the migrations. |
10 | 10 | */ |
11 | 11 | public function up() |
12 | 12 | { |
13 | - Schema::create('{{table_name}}s', function (Blueprint $table) { |
|
13 | + Schema::create('{{table_name}}s', function(Blueprint $table) { |
|
14 | 14 | |
15 | 15 | {{fields}} |
16 | 16 | }); |
@@ -27,8 +27,11 @@ discard block |
||
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 |
||
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 |
@@ -3,17 +3,17 @@ discard block |
||
3 | 3 | use Illuminate\Http\Request; |
4 | 4 | use Illuminate\Support\Facades\File; |
5 | 5 | |
6 | -Route::get('scaffolder/generator', function () |
|
6 | +Route::get('scaffolder/generator', function() |
|
7 | 7 | { |
8 | 8 | return view('scaffolder::generator'); |
9 | 9 | }); |
10 | 10 | |
11 | -Route::post('scaffolder/add-model', function (Request $request) |
|
11 | +Route::post('scaffolder/add-model', function(Request $request) |
|
12 | 12 | { |
13 | 13 | return view('scaffolder::partials.model', ['modelId' => $request->input('modelId')]); |
14 | 14 | }); |
15 | 15 | |
16 | -Route::post('scaffolder/add-field', function (Request $request) |
|
16 | +Route::post('scaffolder/add-field', function(Request $request) |
|
17 | 17 | { |
18 | 18 | return view('scaffolder::partials.field', [ |
19 | 19 | 'modelId' => $request->input('modelId'), |
@@ -21,11 +21,11 @@ discard block |
||
21 | 21 | ]); |
22 | 22 | }); |
23 | 23 | |
24 | -Route::post('scaffolder/generate', function (Request $request) |
|
24 | +Route::post('scaffolder/generate', function(Request $request) |
|
25 | 25 | { |
26 | 26 | $models = $request->only('models'); |
27 | 27 | |
28 | - array_walk_recursive($models, function (&$item) |
|
28 | + array_walk_recursive($models, function(&$item) |
|
29 | 29 | { |
30 | 30 | if ($item == 'true') $item = true; |
31 | 31 | elseif ($item == 'false') $item = false; |
@@ -40,16 +40,16 @@ discard block |
||
40 | 40 | { |
41 | 41 | $modelName = $model['modelName']; |
42 | 42 | array_shift($model); |
43 | - File::put(base_path('scaffolder-config/models/' . $modelName . '.json'), |
|
43 | + File::put(base_path('scaffolder-config/models/'.$modelName.'.json'), |
|
44 | 44 | json_encode($model, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); |
45 | 45 | } |
46 | 46 | }); |
47 | 47 | |
48 | -Route::post('scaffolder/generate-and-execute', function (Request $request) |
|
48 | +Route::post('scaffolder/generate-and-execute', function(Request $request) |
|
49 | 49 | { |
50 | 50 | $models = $request->only('models'); |
51 | 51 | |
52 | - array_walk_recursive($models, function (&$item) |
|
52 | + array_walk_recursive($models, function(&$item) |
|
53 | 53 | { |
54 | 54 | if ($item == 'true') $item = true; |
55 | 55 | elseif ($item == 'false') $item = false; |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | { |
65 | 65 | $modelName = $model['modelName']; |
66 | 66 | array_shift($model); |
67 | - File::put(base_path('scaffolder-config/models/' . $modelName . '.json'), |
|
67 | + File::put(base_path('scaffolder-config/models/'.$modelName.'.json'), |
|
68 | 68 | json_encode($model, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); |
69 | 69 | } |
70 | 70 |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | { |
18 | 18 | // Scaffolder config |
19 | 19 | $this->publishes([ |
20 | - __DIR__ . '/../../config/' => base_path('scaffolder-config/') |
|
20 | + __DIR__.'/../../config/' => base_path('scaffolder-config/') |
|
21 | 21 | ], 'config'); |
22 | 22 | |
23 | 23 | // Generator views |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | // Generator routes |
27 | 27 | if (!$this->app->routesAreCached()) |
28 | 28 | { |
29 | - require __DIR__ . '/../../routes/generator.php'; |
|
29 | + require __DIR__.'/../../routes/generator.php'; |
|
30 | 30 | } |
31 | 31 | } |
32 | 32 | |
@@ -37,22 +37,22 @@ discard block |
||
37 | 37 | */ |
38 | 38 | public function register() |
39 | 39 | { |
40 | - $this->app->singleton('scaffolder.command.generate', function ($app) |
|
40 | + $this->app->singleton('scaffolder.command.generate', function($app) |
|
41 | 41 | { |
42 | 42 | return new GeneratorCommand(); |
43 | 43 | }); |
44 | 44 | |
45 | - $this->app->singleton('scaffolder.command.cache.clear', function () |
|
45 | + $this->app->singleton('scaffolder.command.cache.clear', function() |
|
46 | 46 | { |
47 | 47 | return new ClearCacheCommand(); |
48 | 48 | }); |
49 | 49 | |
50 | - $this->app->singleton('scaffolder.command.build', function () |
|
50 | + $this->app->singleton('scaffolder.command.build', function() |
|
51 | 51 | { |
52 | 52 | return new BuildCommand(); |
53 | 53 | }); |
54 | 54 | |
55 | - $this->app->singleton('scaffolder.command.serve', function () |
|
55 | + $this->app->singleton('scaffolder.command.serve', function() |
|
56 | 56 | { |
57 | 57 | return new ServeCommand(); |
58 | 58 | }); |
@@ -10,7 +10,7 @@ |
||
10 | 10 | { |
11 | 11 | if (!File::isDirectory($path)) |
12 | 12 | { |
13 | - File::makeDirectory($path, $mode, $recursive , $force ); |
|
13 | + File::makeDirectory($path, $mode, $recursive, $force); |
|
14 | 14 | } |
15 | 15 | } |
16 | 16 |
@@ -62,49 +62,49 @@ |
||
62 | 62 | * @param string $validations |
63 | 63 | * @return array |
64 | 64 | */ |
65 | - public static function convertValidations($validations, $blnSearch = false){ |
|
65 | + public static function convertValidations($validations, $blnSearch = false) { |
|
66 | 66 | $validationsConverted = []; |
67 | 67 | foreach (self::explodeRule($validations) as $validation) { |
68 | 68 | $validation = self::parseStringRule($validation); |
69 | 69 | |
70 | - if(isset($validation[0])){ |
|
70 | + if (isset($validation[0])) { |
|
71 | 71 | |
72 | 72 | $rule = $validation[0]; |
73 | 73 | $values = $validation[1]; |
74 | 74 | |
75 | 75 | switch ($rule) { |
76 | 76 | case 'required': |
77 | - if($blnSearch) { |
|
78 | - $attribute = null ; |
|
79 | - $attributeValue = null ; |
|
77 | + if ($blnSearch) { |
|
78 | + $attribute = null; |
|
79 | + $attributeValue = null; |
|
80 | 80 | } |
81 | 81 | else { |
82 | - $attribute = "required" ; |
|
83 | - $attributeValue = null ; |
|
82 | + $attribute = "required"; |
|
83 | + $attributeValue = null; |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | break; |
87 | 87 | |
88 | 88 | case 'max': |
89 | 89 | case 'min': |
90 | - $attribute = $rule.'length' ; |
|
91 | - $attributeValue = $values[0] ; |
|
90 | + $attribute = $rule.'length'; |
|
91 | + $attributeValue = $values[0]; |
|
92 | 92 | break; |
93 | 93 | |
94 | 94 | default: |
95 | - $attribute = null ; |
|
96 | - $attributeValue = null ; |
|
95 | + $attribute = null; |
|
96 | + $attributeValue = null; |
|
97 | 97 | break; |
98 | 98 | } |
99 | 99 | |
100 | - if($attribute) |
|
101 | - $validationsConverted[$attribute] = $attributeValue ; |
|
100 | + if ($attribute) |
|
101 | + $validationsConverted[$attribute] = $attributeValue; |
|
102 | 102 | |
103 | 103 | } |
104 | 104 | |
105 | 105 | } |
106 | 106 | |
107 | - return $validationsConverted ; |
|
107 | + return $validationsConverted; |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | } |
111 | 111 | \ No newline at end of file |
@@ -77,8 +77,7 @@ discard block |
||
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 |
||
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 |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | for ($intIndex = 1; $intIndex < strlen($strName); $intIndex++) { |
25 | 25 | $strChar = substr($strName, $intIndex, 1); |
26 | 26 | if (strtoupper($strChar) == $strChar) |
27 | - $strToReturn .= '_' . $strChar; |
|
27 | + $strToReturn .= '_'.$strChar; |
|
28 | 28 | else |
29 | 29 | $strToReturn .= $strChar; |
30 | 30 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public final static function firstCharacter($strString) { |
42 | 42 | if (strlen($strString) > 0) |
43 | - return substr($strString, 0 , 1); |
|
43 | + return substr($strString, 0, 1); |
|
44 | 44 | else |
45 | 45 | return null; |
46 | 46 | } |
@@ -50,24 +50,24 @@ discard block |
||
50 | 50 | // Special Rules go Here |
51 | 51 | switch (true) { |
52 | 52 | case (strtolower($strName) == 'play'): |
53 | - return $strName . 's'; |
|
53 | + return $strName.'s'; |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | $intLength = strlen($strName); |
57 | 57 | if (substr($strName, $intLength - 1) == "y") |
58 | - return substr($strName, 0, $intLength - 1) . "ies"; |
|
58 | + return substr($strName, 0, $intLength - 1)."ies"; |
|
59 | 59 | if (substr($strName, $intLength - 1) == "s") |
60 | - return $strName . "es"; |
|
60 | + return $strName."es"; |
|
61 | 61 | if (substr($strName, $intLength - 1) == "x") |
62 | - return $strName . "es"; |
|
62 | + return $strName."es"; |
|
63 | 63 | if (substr($strName, $intLength - 1) == "z") |
64 | - return $strName . "zes"; |
|
64 | + return $strName."zes"; |
|
65 | 65 | if (substr($strName, $intLength - 2) == "sh") |
66 | - return $strName . "es"; |
|
66 | + return $strName."es"; |
|
67 | 67 | if (substr($strName, $intLength - 2) == "ch") |
68 | - return $strName . "es"; |
|
68 | + return $strName."es"; |
|
69 | 69 | |
70 | - return $strName . "s"; |
|
70 | + return $strName."s"; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | } |
74 | 74 | \ No newline at end of file |
@@ -17,16 +17,19 @@ discard block |
||
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 |
||
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 |
||
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 | } |