@@ -1,7 +1,6 @@ |
||
1 | 1 | <?php namespace Wn\Generators\Commands; |
2 | 2 | |
3 | 3 | |
4 | -use InvalidArgumentException; |
|
5 | 4 | use Illuminate\Support\Str; |
6 | 5 | |
7 | 6 | class ResourceCommand extends BaseCommand { |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | ]); |
63 | 63 | |
64 | 64 | // generating REST actions trait if doesn't exist |
65 | - if(! $this->fs->exists('./app/Http/Controllers/RESTActions.php')){ |
|
65 | + if (!$this->fs->exists('./app/Http/Controllers/RESTActions.php')) { |
|
66 | 66 | $this->call('wn:controller:rest-actions'); |
67 | 67 | } |
68 | 68 | // generating the controller and routes |
@@ -94,10 +94,10 @@ discard block |
||
94 | 94 | protected function parseFields() |
95 | 95 | { |
96 | 96 | $fields = $this->argument('fields'); |
97 | - if($this->option('parsed')){ |
|
97 | + if ($this->option('parsed')) { |
|
98 | 98 | $this->fields = $fields; |
99 | 99 | } else { |
100 | - if(! $fields){ |
|
100 | + if (!$fields) { |
|
101 | 101 | $this->fields = []; |
102 | 102 | } else { |
103 | 103 | $this->fields = $this->getArgumentParser('fields') |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | |
122 | 122 | protected function fieldsHavingTag($tag) |
123 | 123 | { |
124 | - return array_map(function($field){ |
|
124 | + return array_map(function($field) { |
|
125 | 125 | return $field['name']; |
126 | 126 | }, array_filter($this->fields, function($field) use($tag){ |
127 | 127 | return in_array($tag, $field['tags']); |
@@ -130,19 +130,19 @@ discard block |
||
130 | 130 | |
131 | 131 | protected function rules() |
132 | 132 | { |
133 | - return array_map(function($field){ |
|
133 | + return array_map(function($field) { |
|
134 | 134 | return [ |
135 | 135 | 'name' => $field['name'], |
136 | 136 | 'rule' => $field['rules'] |
137 | 137 | ]; |
138 | - }, array_filter($this->fields, function($field){ |
|
138 | + }, array_filter($this->fields, function($field) { |
|
139 | 139 | return !empty($field['rules']); |
140 | 140 | })); |
141 | 141 | } |
142 | 142 | |
143 | 143 | protected function schema() |
144 | 144 | { |
145 | - return array_map(function($field){ |
|
145 | + return array_map(function($field) { |
|
146 | 146 | return array_merge([[ |
147 | 147 | 'name' => $field['name'], |
148 | 148 | 'args' => [] |
@@ -153,14 +153,14 @@ discard block |
||
153 | 153 | protected function foreignKeys() |
154 | 154 | { |
155 | 155 | $belongsTo = $this->option('belongs-to'); |
156 | - if(! $belongsTo) { |
|
156 | + if (!$belongsTo) { |
|
157 | 157 | return []; |
158 | 158 | } |
159 | 159 | $relations = $this->getArgumentParser('relations')->parse($belongsTo); |
160 | - return array_map(function($relation){ |
|
160 | + return array_map(function($relation) { |
|
161 | 161 | $name = $relation['model'] ? $relation['model'] : $relation['name']; |
162 | 162 | $index = strrpos($name, "\\"); |
163 | - if($index) { |
|
163 | + if ($index) { |
|
164 | 164 | $name = substr($name, $index + 1); |
165 | 165 | } |
166 | 166 | return Str::snake(Str::singular($name)) . '_id'; |
@@ -181,12 +181,12 @@ discard block |
||
181 | 181 | |
182 | 182 | protected function factoryFields() |
183 | 183 | { |
184 | - return array_map(function($field){ |
|
184 | + return array_map(function($field) { |
|
185 | 185 | return [ |
186 | 186 | 'name' => $field['name'], |
187 | 187 | 'type' => $field['factory'] |
188 | 188 | ]; |
189 | - }, array_filter($this->fields, function($field){ |
|
189 | + }, array_filter($this->fields, function($field) { |
|
190 | 190 | return isset($field['factory']) && $field['factory']; |
191 | 191 | })); |
192 | 192 | } |
@@ -1,6 +1,5 @@ |
||
1 | 1 | <?php namespace Wn\Generators\Commands; |
2 | 2 | |
3 | -use InvalidArgumentException; |
|
4 | 3 | use Symfony\Component\Yaml\Yaml; |
5 | 4 | use Illuminate\Support\Str; |
6 | 5 |
@@ -25,10 +25,10 @@ discard block |
||
25 | 25 | $content = Yaml::parse($content); |
26 | 26 | |
27 | 27 | $modelIndex = 0; |
28 | - foreach ($content as $model => $i){ |
|
28 | + foreach ($content as $model => $i) { |
|
29 | 29 | $i = $this->getResourceParams($model, $i); |
30 | - $migrationName = 'Create' . ucwords(Str::plural($i['name'])); |
|
31 | - $migrationFile = date('Y_m_d_His') . '-' . str_pad($modelIndex , 3, 0, STR_PAD_LEFT) . '_' . Str::snake($migrationName) . '_table'; |
|
30 | + $migrationName = 'Create' . ucwords(Str::plural($i['name'])); |
|
31 | + $migrationFile = date('Y_m_d_His') . '-' . str_pad($modelIndex, 3, 0, STR_PAD_LEFT) . '_' . Str::snake($migrationName) . '_table'; |
|
32 | 32 | |
33 | 33 | |
34 | 34 | $options = [ |
@@ -79,34 +79,34 @@ discard block |
||
79 | 79 | { |
80 | 80 | $i['name'] = Str::snake($modelName); |
81 | 81 | |
82 | - foreach(['hasMany', 'hasOne', 'add', 'belongsTo', 'belongsToMany'] as $relation){ |
|
83 | - if(isset($i[$relation])){ |
|
82 | + foreach (['hasMany', 'hasOne', 'add', 'belongsTo', 'belongsToMany'] as $relation) { |
|
83 | + if (isset($i[$relation])) { |
|
84 | 84 | $i[$relation] = $this->convertArray($i[$relation], ' ', ','); |
85 | 85 | } else { |
86 | 86 | $i[$relation] = false; |
87 | 87 | } |
88 | 88 | } |
89 | 89 | |
90 | - if($i['belongsToMany']){ |
|
90 | + if ($i['belongsToMany']) { |
|
91 | 91 | $relations = $this->getArgumentParser('relations')->parse($i['belongsToMany']); |
92 | - foreach ($relations as $relation){ |
|
92 | + foreach ($relations as $relation) { |
|
93 | 93 | $table = ''; |
94 | 94 | |
95 | - if(! $relation['model']){ |
|
95 | + if (!$relation['model']) { |
|
96 | 96 | $table = Str::snake($relation['name']); |
97 | 97 | } else { |
98 | 98 | $names = array_reverse(explode("\\", $relation['model'])); |
99 | 99 | $table = Str::snake($names[0]); |
100 | 100 | } |
101 | 101 | |
102 | - $tables = [ Str::singular($table), $i['name'] ]; |
|
102 | + $tables = [Str::singular($table), $i['name']]; |
|
103 | 103 | sort($tables); |
104 | 104 | $this->pivotTables[] = $tables; |
105 | 105 | } |
106 | 106 | } |
107 | 107 | |
108 | 108 | $fields = []; |
109 | - foreach($i['fields'] as $name => $value) { |
|
109 | + foreach ($i['fields'] as $name => $value) { |
|
110 | 110 | $value['name'] = $name; |
111 | 111 | $fields[] = $this->serializeField($value); |
112 | 112 | } |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | |
128 | 128 | $string = "{$name};{$schema};{$rules};{$tags}"; |
129 | 129 | |
130 | - if(isset($field['factory']) && !empty($field['factory'])){ |
|
130 | + if (isset($field['factory']) && !empty($field['factory'])) { |
|
131 | 131 | $string .= ';' . $field['factory']; |
132 | 132 | } |
133 | 133 | |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | |
137 | 137 | protected function convertArray($list, $old, $new) |
138 | 138 | { |
139 | - return implode($new, array_filter(explode($old, $list), function($item){ |
|
139 | + return implode($new, array_filter(explode($old, $list), function($item) { |
|
140 | 140 | return !empty($item); |
141 | 141 | })); |
142 | 142 | } |
@@ -34,10 +34,10 @@ discard block |
||
34 | 34 | ->get(); |
35 | 35 | |
36 | 36 | $file = $this->option('file'); |
37 | - if(! $file){ |
|
37 | + if (!$file) { |
|
38 | 38 | $file = date('Y_m_d_His_') . $snakeName . '_table'; |
39 | 39 | $this->deleteOldMigration($snakeName); |
40 | - }else{ |
|
40 | + } else { |
|
41 | 41 | $this->deleteOldMigration($file); |
42 | 42 | } |
43 | 43 | |
@@ -46,10 +46,10 @@ discard block |
||
46 | 46 | |
47 | 47 | protected function deleteOldMigration($fileName) |
48 | 48 | { |
49 | - foreach (new \DirectoryIterator("./database/migrations/") as $fileInfo){ |
|
50 | - if($fileInfo->isDot()) continue; |
|
49 | + foreach (new \DirectoryIterator("./database/migrations/") as $fileInfo) { |
|
50 | + if ($fileInfo->isDot()) continue; |
|
51 | 51 | |
52 | - if(strpos($fileInfo->getFilename(), $fileName) !== FALSE){ |
|
52 | + if (strpos($fileInfo->getFilename(), $fileName) !== FALSE) { |
|
53 | 53 | unlink($fileInfo->getPathname()); |
54 | 54 | } |
55 | 55 | } |
@@ -58,12 +58,12 @@ discard block |
||
58 | 58 | protected function getSchema() |
59 | 59 | { |
60 | 60 | $schema = $this->option('schema'); |
61 | - if(! $schema){ |
|
61 | + if (!$schema) { |
|
62 | 62 | return $this->spaces(12) . "// Schema declaration"; |
63 | 63 | } |
64 | 64 | |
65 | 65 | $items = $schema; |
66 | - if( ! $this->option('parsed')){ |
|
66 | + if (!$this->option('parsed')) { |
|
67 | 67 | $items = $this->getArgumentParser('schema')->parse($schema); |
68 | 68 | } |
69 | 69 | |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $name = $parts[0]['name']; |
98 | 98 | $parts[1]['args'] = array_merge(["'{$name}'"], $parts[1]['args']); |
99 | 99 | unset($parts[0]); |
100 | - $parts = array_map(function($part){ |
|
100 | + $parts = array_map(function($part) { |
|
101 | 101 | return '->' . $part['name'] . '(' . implode(', ', $part['args']) . ')'; |
102 | 102 | }, $parts); |
103 | 103 | return " \$table" . implode('', $parts) . ';'; |
@@ -106,12 +106,12 @@ discard block |
||
106 | 106 | protected function getConstraints() |
107 | 107 | { |
108 | 108 | $keys = $this->option('keys'); |
109 | - if(! $keys){ |
|
109 | + if (!$keys) { |
|
110 | 110 | return $this->spaces(12) . "// Constraints declaration"; |
111 | 111 | } |
112 | 112 | |
113 | 113 | $items = $keys; |
114 | - if(! $this->option('parsed')){ |
|
114 | + if (!$this->option('parsed')) { |
|
115 | 115 | $items = $this->getArgumentParser('foreign-keys')->parse($keys); |
116 | 116 | } |
117 | 117 | |
@@ -125,10 +125,10 @@ discard block |
||
125 | 125 | |
126 | 126 | protected function getConstraintDeclaration($key) |
127 | 127 | { |
128 | - if(! $key['column']){ |
|
128 | + if (!$key['column']) { |
|
129 | 129 | $key['column'] = 'id'; |
130 | 130 | } |
131 | - if(! $key['table']){ |
|
131 | + if (!$key['table']) { |
|
132 | 132 | $key['table'] = Illuminate\Support\Str::plural(substr($key['name'], 0, count($key['name']) - 4)); |
133 | 133 | } |
134 | 134 | |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | ]) |
141 | 141 | ->get(); |
142 | 142 | |
143 | - if($key['on_delete']){ |
|
143 | + if ($key['on_delete']) { |
|
144 | 144 | $constraint .= PHP_EOL . $this->getTemplate('migration/on-constraint') |
145 | 145 | ->with([ |
146 | 146 | 'event' => 'Delete', |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | ->get(); |
150 | 150 | } |
151 | 151 | |
152 | - if($key['on_update']){ |
|
152 | + if ($key['on_update']) { |
|
153 | 153 | $constraint .= PHP_EOL . $this->getTemplate('migration/on-constraint') |
154 | 154 | ->with([ |
155 | 155 | 'event' => 'Update', |
@@ -45,12 +45,12 @@ discard block |
||
45 | 45 | protected function getAsArrayFields($arg, $isOption = true) |
46 | 46 | { |
47 | 47 | $arg = ($isOption) ? $this->option($arg) : $this->argument($arg); |
48 | - if(is_string($arg)){ |
|
48 | + if (is_string($arg)) { |
|
49 | 49 | $arg = explode(',', $arg); |
50 | - } else if(! is_array($arg)) { |
|
50 | + } else if (!is_array($arg)) { |
|
51 | 51 | $arg = []; |
52 | 52 | } |
53 | - return implode(', ', array_map(function($item){ |
|
53 | + return implode(', ', array_map(function($item) { |
|
54 | 54 | return '"' . $item . '"'; |
55 | 55 | }, $arg)); |
56 | 56 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $this->getRelationsByType('belongsToMany', 'belongs-to-many', true) |
70 | 70 | ); |
71 | 71 | |
72 | - if(empty($relations)){ |
|
72 | + if (empty($relations)) { |
|
73 | 73 | return " // Relationships"; |
74 | 74 | } |
75 | 75 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | { |
81 | 81 | $relations = []; |
82 | 82 | $option = $this->option($option); |
83 | - if($option){ |
|
83 | + if ($option) { |
|
84 | 84 | |
85 | 85 | $items = $this->getArgumentParser('relations')->parse($option); |
86 | 86 | |
@@ -88,9 +88,9 @@ discard block |
||
88 | 88 | $template = $this->getTemplate($template); |
89 | 89 | foreach ($items as $item) { |
90 | 90 | $item['type'] = $type; |
91 | - if(! $item['model']){ |
|
91 | + if (!$item['model']) { |
|
92 | 92 | $item['model'] = $this->getNamespace() . '\\' . ucwords(Illuminate\Support\Str::singular($item['name'])); |
93 | - } else if(strpos($item['model'], '\\') === false ){ |
|
93 | + } else if (strpos($item['model'], '\\') === false) { |
|
94 | 94 | $item['model'] = $this->getNamespace() . '\\' . $item['model']; |
95 | 95 | } |
96 | 96 | $relations[] = $template->with($item)->get(); |
@@ -102,11 +102,11 @@ discard block |
||
102 | 102 | protected function getRules() |
103 | 103 | { |
104 | 104 | $rules = $this->option('rules'); |
105 | - if(! $rules){ |
|
105 | + if (!$rules) { |
|
106 | 106 | return " // Validation rules"; |
107 | 107 | } |
108 | 108 | $items = $rules; |
109 | - if(! $this->option('parsed')){ |
|
109 | + if (!$this->option('parsed')) { |
|
110 | 110 | $items = $this->getArgumentParser('rules')->parse($rules); |
111 | 111 | } |
112 | 112 | $rules = []; |
@@ -45,7 +45,7 @@ |
||
45 | 45 | } |
46 | 46 | |
47 | 47 | protected function getSeederName($resources) { |
48 | - $resources = array_map(function($resource){ |
|
48 | + $resources = array_map(function($resource) { |
|
49 | 49 | return ucwords(Illuminate\Support\Str::camel($resource)); |
50 | 50 | }, $resources); |
51 | 51 | return implode('', $resources) . 'TableSeeder'; |
@@ -67,7 +67,7 @@ |
||
67 | 67 | protected function getController() |
68 | 68 | { |
69 | 69 | $controller = $this->option('controller'); |
70 | - if(! $controller){ |
|
70 | + if (!$controller) { |
|
71 | 71 | $controller = ucwords(Illuminate\Support\Str::plural(Illuminate\Support\Str::camel($this->argument('resource')))) . 'Controller'; |
72 | 72 | } |
73 | 73 | return $controller; |
@@ -5,33 +5,33 @@ |
||
5 | 5 | |
6 | 6 | class ControllerCommand extends BaseCommand { |
7 | 7 | |
8 | - protected $signature = 'wn:controller |
|
8 | + protected $signature = 'wn:controller |
|
9 | 9 | {model : Name of the model (with namespace if not App)} |
10 | 10 | {--no-routes= : without routes} |
11 | 11 | {--force= : override the existing files} |
12 | 12 | {--laravel : Use Laravel style route definitions} |
13 | 13 | '; |
14 | 14 | |
15 | - protected $description = 'Generates RESTful controller using the RESTActions trait'; |
|
15 | + protected $description = 'Generates RESTful controller using the RESTActions trait'; |
|
16 | 16 | |
17 | 17 | public function handle() |
18 | 18 | { |
19 | - $model = $this->argument('model'); |
|
20 | - $name = ''; |
|
21 | - if(strrpos($model, "\\") === false){ |
|
22 | - $name = $model; |
|
23 | - $model = "App\\" . $model; |
|
24 | - } else { |
|
25 | - $name = explode("\\", $model); |
|
26 | - $name = $name[count($name) - 1]; |
|
27 | - } |
|
19 | + $model = $this->argument('model'); |
|
20 | + $name = ''; |
|
21 | + if(strrpos($model, "\\") === false){ |
|
22 | + $name = $model; |
|
23 | + $model = "App\\" . $model; |
|
24 | + } else { |
|
25 | + $name = explode("\\", $model); |
|
26 | + $name = $name[count($name) - 1]; |
|
27 | + } |
|
28 | 28 | $controller = ucwords(Illuminate\Support\Str::plural($name)) . 'Controller'; |
29 | 29 | $content = $this->getTemplate('controller') |
30 | - ->with([ |
|
31 | - 'name' => $controller, |
|
32 | - 'model' => $model |
|
33 | - ]) |
|
34 | - ->get(); |
|
30 | + ->with([ |
|
31 | + 'name' => $controller, |
|
32 | + 'model' => $model |
|
33 | + ]) |
|
34 | + ->get(); |
|
35 | 35 | |
36 | 36 | $this->save($content, "./app/Http/Controllers/{$controller}.php", "{$controller}"); |
37 | 37 | if(! $this->option('no-routes')){ |