@@ -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 |
@@ -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 |
@@ -18,7 +18,7 @@ |
||
18 | 18 | array_splice($array, $indexToMove, 1); |
19 | 19 | $i = 0; |
20 | 20 | $output = Array(); |
21 | - foreach($array as $key => $item) { |
|
21 | + foreach ($array as $key => $item) { |
|
22 | 22 | if ($i == $targetIndex) { |
23 | 23 | $output[$toMove] = $itemToMove; |
24 | 24 | } |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | use Illuminate\Console\Command; |
6 | 6 | use Illuminate\Support\Facades\File; |
7 | 7 | |
8 | -use stdClass ; |
|
8 | +use stdClass; |
|
9 | 9 | |
10 | 10 | // Support classes |
11 | 11 | use Scaffolder\Support\Directory; |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | $handle = popen($gulpCommand, 'r'); |
37 | 37 | |
38 | - while(!feof($handle)) |
|
38 | + while (!feof($handle)) |
|
39 | 39 | { |
40 | 40 | // send the current file part to the browser |
41 | 41 | $this->info(fread($handle, 1024)); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | } |
57 | 57 | |
58 | - private function cleanPublicFolder(){ |
|
58 | + private function cleanPublicFolder() { |
|
59 | 59 | $this->info('Cleaning public directory'); |
60 | 60 | |
61 | 61 | File::deleteDirectory(sprintf("%s/app", base_path('public'))); |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | use Illuminate\Console\Command; |
6 | 6 | use Illuminate\Support\Facades\File; |
7 | 7 | |
8 | -use stdClass ; |
|
8 | +use stdClass; |
|
9 | 9 | |
10 | 10 | // Support classes |
11 | 11 | use Scaffolder\Support\Directory; |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | protected $description = 'Serve code for development purpose'; |
23 | 23 | |
24 | 24 | // app config var |
25 | - private $scaffolderConfig ; |
|
25 | + private $scaffolderConfig; |
|
26 | 26 | |
27 | 27 | /** |
28 | 28 | * Execute the Command. |
@@ -34,12 +34,12 @@ discard block |
||
34 | 34 | |
35 | 35 | $overwrite = false; |
36 | 36 | |
37 | - if($this->option('overwrite')) |
|
37 | + if ($this->option('overwrite')) |
|
38 | 38 | $overwrite = true; |
39 | 39 | |
40 | 40 | $generate = false; |
41 | 41 | |
42 | - if($this->option('generate')) |
|
42 | + if ($this->option('generate')) |
|
43 | 43 | $generate = true; |
44 | 44 | |
45 | 45 | |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | case 'webapp': |
48 | 48 | |
49 | 49 | // gera código somente se houver a opcao |
50 | - if($generate) { |
|
50 | + if ($generate) { |
|
51 | 51 | // Gera codigo da api |
52 | 52 | $this->call('scaffolder:generate', array('app' => 'api', '-c' => 'clear-all')); |
53 | 53 | |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | private function launchBackgroundProcess($call) { |
91 | 91 | |
92 | 92 | // Windows |
93 | - if($this->is_windows()){ |
|
93 | + if ($this->is_windows()) { |
|
94 | 94 | pclose(popen('start /b '.$call, 'r')); |
95 | 95 | } |
96 | 96 | |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | * Tells if we are running on Windows Platform |
109 | 109 | * @author raccettura |
110 | 110 | */ |
111 | - private function is_windows(){ |
|
112 | - if(PHP_OS == 'WINNT' || PHP_OS == 'WIN32'){ |
|
111 | + private function is_windows() { |
|
112 | + if (PHP_OS == 'WINNT' || PHP_OS == 'WIN32') { |
|
113 | 113 | return true; |
114 | 114 | } |
115 | 115 | return false; |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | public function copyApiFiles($overwrite) { |
120 | 120 | |
121 | 121 | $command = sprintf('cp -r %s "%s/." "%s"', |
122 | - (!$overwrite ? ' -u' : null) , |
|
122 | + (!$overwrite ? ' -u' : null), |
|
123 | 123 | PathParser::parse($this->scaffolderConfig->generators->api->paths->base), |
124 | 124 | base_path()); |
125 | 125 | |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | |
136 | 136 | // copying page files |
137 | 137 | $command = sprintf('cp -r %s "%s/." "%s/"', |
138 | - (!$overwrite ? ' -u' : null) , |
|
138 | + (!$overwrite ? ' -u' : null), |
|
139 | 139 | PathParser::parse($this->scaffolderConfig->generators->angularjs->paths->index), |
140 | 140 | PathParser::parse($this->scaffolderConfig->generators->angularjs->paths->resources)); |
141 | 141 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * |
151 | 151 | * @return void |
152 | 152 | */ |
153 | - private function getScaffolderConfig(){ |
|
153 | + private function getScaffolderConfig() { |
|
154 | 154 | // Get app config |
155 | 155 | $this->scaffolderConfig = Json::decodeFile(base_path('scaffolder-config/app.json')); |
156 | 156 |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | use Scaffolder\Themes\IScaffolderThemeViews; |
44 | 44 | use Scaffolder\Compilers\Support\PathParser; |
45 | 45 | |
46 | -use stdClass ; |
|
46 | +use stdClass; |
|
47 | 47 | |
48 | 48 | class GeneratorCommand extends Command |
49 | 49 | { |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | { |
58 | 58 | parent::__construct(); |
59 | 59 | |
60 | - $this->stubsDirectory = __DIR__ . '/../../../stubs/'; |
|
60 | + $this->stubsDirectory = __DIR__.'/../../../stubs/'; |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | public function handle() |
68 | 68 | { |
69 | 69 | // check if is to clear cache |
70 | - if($this->option('clear-all')){ |
|
70 | + if ($this->option('clear-all')) { |
|
71 | 71 | $this->call('scaffolder:clear'); |
72 | 72 | } |
73 | 73 | |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * API Generation command for API files. |
112 | 112 | * @return void |
113 | 113 | */ |
114 | - private function handleApi(){ |
|
114 | + private function handleApi() { |
|
115 | 115 | // Get all the models |
116 | 116 | $modelsData = $this->getAllModelsData(); |
117 | 117 | |
@@ -194,19 +194,19 @@ discard block |
||
194 | 194 | $this->comment('- - Controllers'); |
195 | 195 | foreach ($controllerCompilerOutput as $controllerFile) |
196 | 196 | { |
197 | - $this->info('- - - ' . $controllerFile); |
|
197 | + $this->info('- - - '.$controllerFile); |
|
198 | 198 | } |
199 | 199 | |
200 | 200 | $this->comment('- - Migrations'); |
201 | 201 | foreach ($migrationCompilerOutput as $migrationFile) |
202 | 202 | { |
203 | - $this->info('- - - ' . $migrationFile); |
|
203 | + $this->info('- - - '.$migrationFile); |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | $this->comment('- - Models'); |
207 | 207 | foreach ($modelCompilerOutput as $modelFile) |
208 | 208 | { |
209 | - $this->info('- - - ' . $modelFile); |
|
209 | + $this->info('- - - '.$modelFile); |
|
210 | 210 | } |
211 | 211 | } |
212 | 212 | |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | * Code Generation command for AngularJs Material design files. |
215 | 215 | * @return void |
216 | 216 | */ |
217 | - private function handleAngularJs(){ |
|
217 | + private function handleAngularJs() { |
|
218 | 218 | // Get all the models |
219 | 219 | $modelsData = $this->getAllModelsData(); |
220 | 220 | |
@@ -314,24 +314,24 @@ discard block |
||
314 | 314 | |
315 | 315 | $this->comment('- - Index Api'); |
316 | 316 | |
317 | - $this->info('- - - ' . $fileApi); |
|
317 | + $this->info('- - - '.$fileApi); |
|
318 | 318 | |
319 | 319 | $this->comment('- - Resources'); |
320 | 320 | foreach ($resourceCompilerOutput as $file) |
321 | 321 | { |
322 | - $this->info('- - - ' . $file); |
|
322 | + $this->info('- - - '.$file); |
|
323 | 323 | } |
324 | 324 | |
325 | 325 | $this->comment('- - Modules'); |
326 | 326 | foreach ($moduleCompilerOutput as $file) |
327 | 327 | { |
328 | - $this->info('- - - ' . $file); |
|
328 | + $this->info('- - - '.$file); |
|
329 | 329 | } |
330 | 330 | |
331 | 331 | $this->comment('- - Translate'); |
332 | 332 | foreach ($translateCompilerOutput as $file) |
333 | 333 | { |
334 | - $this->info('- - - ' . $file); |
|
334 | + $this->info('- - - '.$file); |
|
335 | 335 | } |
336 | 336 | |
337 | 337 | $this->comment('- - Register'); |
@@ -339,19 +339,19 @@ discard block |
||
339 | 339 | $this->comment('- - - Modules'); |
340 | 340 | foreach ($registerModuleCompilerOutput as $file) |
341 | 341 | { |
342 | - $this->info('- - - - ' . $file); |
|
342 | + $this->info('- - - - '.$file); |
|
343 | 343 | } |
344 | 344 | |
345 | 345 | $this->comment('- - - Controllers'); |
346 | 346 | foreach ($registerControllerCompilerOutput as $file) |
347 | 347 | { |
348 | - $this->info('- - - - ' . $file); |
|
348 | + $this->info('- - - - '.$file); |
|
349 | 349 | } |
350 | 350 | |
351 | 351 | $this->comment('- - - Templates'); |
352 | 352 | foreach ($registerTemplateCompilerOutput as $file) |
353 | 353 | { |
354 | - $this->info('- - - - ' . $file); |
|
354 | + $this->info('- - - - '.$file); |
|
355 | 355 | } |
356 | 356 | |
357 | 357 | $this->comment('- - List'); |
@@ -359,20 +359,20 @@ discard block |
||
359 | 359 | $this->comment('- - - Modules'); |
360 | 360 | foreach ($listModuleCompilerOutput as $file) |
361 | 361 | { |
362 | - $this->info('- - - - ' . $file); |
|
362 | + $this->info('- - - - '.$file); |
|
363 | 363 | } |
364 | 364 | |
365 | 365 | |
366 | 366 | $this->comment('- - - Controllers'); |
367 | 367 | foreach ($listControllerCompilerOutput as $file) |
368 | 368 | { |
369 | - $this->info('- - - - ' . $file); |
|
369 | + $this->info('- - - - '.$file); |
|
370 | 370 | } |
371 | 371 | |
372 | 372 | $this->comment('- - - Templates'); |
373 | 373 | foreach ($listTemplateCompilerOutput as $file) |
374 | 374 | { |
375 | - $this->info('- - - - ' . $file); |
|
375 | + $this->info('- - - - '.$file); |
|
376 | 376 | } |
377 | 377 | /* |
378 | 378 | $this->comment('- - - Detail Dialog'); |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | * Generates Blade templates |
396 | 396 | * @return void |
397 | 397 | */ |
398 | - private function handleBlade(){ |
|
398 | + private function handleBlade() { |
|
399 | 399 | // Get all the models |
400 | 400 | $modelsData = $this->getAllModelsData(); |
401 | 401 | |
@@ -440,7 +440,7 @@ discard block |
||
440 | 440 | $modelName = $modelData->modelName; |
441 | 441 | |
442 | 442 | // Create views directory |
443 | - Directory::createIfNotExists(base_path('resources/views/' . strtolower($modelName))); |
|
443 | + Directory::createIfNotExists(base_path('resources/views/'.strtolower($modelName))); |
|
444 | 444 | |
445 | 445 | //set hash |
446 | 446 | $modelHash = $modelData->modelHash; |
@@ -464,17 +464,17 @@ discard block |
||
464 | 464 | array_push($viewCompilerOutput, $pageLayoutViewCompiler->compile(File::get($this->themeLayouts->getPagePath()), null, null, $scaffolderConfig, null, ['links' => $sidenavLinks])); |
465 | 465 | |
466 | 466 | // Store create layout |
467 | - $createLayout = PathParser::parse($scaffolderConfig->generator->paths->views). 'layouts/create.blade.php' ; |
|
467 | + $createLayout = PathParser::parse($scaffolderConfig->generator->paths->views).'layouts/create.blade.php'; |
|
468 | 468 | File::copy($this->themeLayouts->getCreatePath(), $createLayout); |
469 | 469 | array_push($viewCompilerOutput, $createLayout); |
470 | 470 | |
471 | 471 | // Store edit layout |
472 | - $editLayout = PathParser::parse($scaffolderConfig->generator->paths->views). 'layouts/edit.blade.php' ; |
|
472 | + $editLayout = PathParser::parse($scaffolderConfig->generator->paths->views).'layouts/edit.blade.php'; |
|
473 | 473 | File::copy($this->themeLayouts->getCreatePath(), $editLayout); |
474 | 474 | array_push($viewCompilerOutput, $editLayout); |
475 | 475 | |
476 | 476 | // Store dashboard |
477 | - $dashboardLayout = PathParser::parse($scaffolderConfig->generator->paths->views). 'layouts/dashboard.blade.php' ; |
|
477 | + $dashboardLayout = PathParser::parse($scaffolderConfig->generator->paths->views).'layouts/dashboard.blade.php'; |
|
478 | 478 | File::copy($this->themeLayouts->getCreatePath(), $dashboardLayout); |
479 | 479 | array_push($viewCompilerOutput, $dashboardLayout); |
480 | 480 | |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | $this->comment('- - Views'); |
488 | 488 | foreach ($viewCompilerOutput as $viewFile) |
489 | 489 | { |
490 | - $this->info('- - - ' . $viewFile); |
|
490 | + $this->info('- - - '.$viewFile); |
|
491 | 491 | } |
492 | 492 | |
493 | 493 | } |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | * Generates Blade templates |
499 | 499 | * @return void |
500 | 500 | */ |
501 | - private function handleLaravel(){ |
|
501 | + private function handleLaravel() { |
|
502 | 502 | // generate API |
503 | 503 | $this->handleApi(); |
504 | 504 | |
@@ -512,13 +512,13 @@ discard block |
||
512 | 512 | * |
513 | 513 | * @return void |
514 | 514 | */ |
515 | - private function getScaffolderConfig(){ |
|
515 | + private function getScaffolderConfig() { |
|
516 | 516 | // Get app config |
517 | 517 | $scaffolderConfig = Json::decodeFile(base_path('scaffolder-config/app.json')); |
518 | 518 | |
519 | 519 | $scaffolderConfig->generator = $scaffolderConfig->generators->{$this->argument('app')}; |
520 | 520 | |
521 | - return $scaffolderConfig ; |
|
521 | + return $scaffolderConfig; |
|
522 | 522 | } |
523 | 523 | |
524 | 524 | /** |
@@ -526,7 +526,7 @@ discard block |
||
526 | 526 | * |
527 | 527 | * @return object |
528 | 528 | */ |
529 | - private function getAllModelsData(){ |
|
529 | + private function getAllModelsData() { |
|
530 | 530 | |
531 | 531 | $modelFiles = File::allFiles(base_path('scaffolder-config/models/')); |
532 | 532 | |
@@ -543,67 +543,67 @@ discard block |
||
543 | 543 | |
544 | 544 | |
545 | 545 | // Get model name |
546 | - $modelName = CamelCase::convertToCamelCase(($modelFile->getBasename('.' . $modelFile->getExtension()))); |
|
546 | + $modelName = CamelCase::convertToCamelCase(($modelFile->getBasename('.'.$modelFile->getExtension()))); |
|
547 | 547 | |
548 | 548 | // Get model hash |
549 | 549 | $modelHash = md5_file($modelFile->getRealPath()); |
550 | 550 | |
551 | 551 | // Set model name |
552 | - $modelData->modelName = $modelName ; |
|
552 | + $modelData->modelName = $modelName; |
|
553 | 553 | |
554 | 554 | // Set model name |
555 | - $modelData->modelHash = $modelHash ; |
|
555 | + $modelData->modelHash = $modelHash; |
|
556 | 556 | |
557 | 557 | // get primary field or create |
558 | 558 | $primaryField = $this->getPrimaryKeyField($modelData); |
559 | 559 | |
560 | 560 | // put primary key at first position |
561 | - if(isset($primaryField->declared) && !$primaryField->declared){ |
|
562 | - $modelData->fields = array_pad($modelData->fields, -(count($modelData->fields)+1), $primaryField); |
|
561 | + if (isset($primaryField->declared) && !$primaryField->declared) { |
|
562 | + $modelData->fields = array_pad($modelData->fields, -(count($modelData->fields) + 1), $primaryField); |
|
563 | 563 | } |
564 | 564 | |
565 | 565 | // set timestamps |
566 | - if($modelData->timeStamps){ |
|
566 | + if ($modelData->timeStamps) { |
|
567 | 567 | $createdAtField = new stdClass; |
568 | - $createdAtField->name = "created_at" ; |
|
569 | - $createdAtField->index = "none" ; |
|
570 | - $createdAtField->declared = false ; |
|
571 | - $createdAtField->type = new stdClass ; |
|
572 | - $createdAtField->type->ui = 'timestamp' ; |
|
573 | - $createdAtField->type->db = 'datetime' ; |
|
568 | + $createdAtField->name = "created_at"; |
|
569 | + $createdAtField->index = "none"; |
|
570 | + $createdAtField->declared = false; |
|
571 | + $createdAtField->type = new stdClass; |
|
572 | + $createdAtField->type->ui = 'timestamp'; |
|
573 | + $createdAtField->type->db = 'datetime'; |
|
574 | 574 | $createdAtField->foreignKey = []; |
575 | - $createdAtField->validations = "required" ; |
|
575 | + $createdAtField->validations = "required"; |
|
576 | 576 | $updatedAtField = clone($createdAtField); |
577 | - $updatedAtField->name = "updated_at" ; |
|
577 | + $updatedAtField->name = "updated_at"; |
|
578 | 578 | |
579 | 579 | array_push($modelData->fields, $createdAtField); |
580 | 580 | array_push($modelData->fields, $updatedAtField); |
581 | 581 | } |
582 | 582 | |
583 | - $modelsData[$modelData->tableName] = $modelData ; |
|
583 | + $modelsData[$modelData->tableName] = $modelData; |
|
584 | 584 | |
585 | 585 | // put all migrations pre-requisites in top of generation hieraquical |
586 | - if(count($modelData->migrationPreRequisites) == 0){ |
|
586 | + if (count($modelData->migrationPreRequisites) == 0) { |
|
587 | 587 | $modelsData = Arrays::moveElement($modelsData, $modelData->tableName, 0); |
588 | 588 | } |
589 | 589 | |
590 | 590 | } |
591 | 591 | |
592 | 592 | // let put all pre-requisites in order |
593 | - $actualTablePosition = 0 ; |
|
593 | + $actualTablePosition = 0; |
|
594 | 594 | foreach ($modelsData as $key => $modelData) |
595 | 595 | { |
596 | 596 | // set migration order |
597 | - $modelData->migrationOrder = isset($modelData->migrationOrder) ? $modelData->migrationOrder : $actualTablePosition ; |
|
597 | + $modelData->migrationOrder = isset($modelData->migrationOrder) ? $modelData->migrationOrder : $actualTablePosition; |
|
598 | 598 | |
599 | 599 | $positions = array_keys($modelsData); |
600 | 600 | |
601 | - foreach($modelData->migrationPreRequisites as $preRequiste){ |
|
601 | + foreach ($modelData->migrationPreRequisites as $preRequiste) { |
|
602 | 602 | $preRequisitePosition = array_search($preRequiste, $positions); |
603 | 603 | // change positions |
604 | - if( $preRequisitePosition > $actualTablePosition){ |
|
605 | - $modelData->migrationOrder = $preRequisitePosition ; |
|
606 | - $modelsData[$preRequiste]->migrationOrder = $actualTablePosition ; |
|
604 | + if ($preRequisitePosition > $actualTablePosition) { |
|
605 | + $modelData->migrationOrder = $preRequisitePosition; |
|
606 | + $modelsData[$preRequiste]->migrationOrder = $actualTablePosition; |
|
607 | 607 | $modelsData = Arrays::moveElement($modelsData, $preRequiste, $actualTablePosition); |
608 | 608 | |
609 | 609 | } |
@@ -611,31 +611,31 @@ discard block |
||
611 | 611 | |
612 | 612 | |
613 | 613 | // search for other fields relationships |
614 | - foreach($modelData->fields as $field){ |
|
614 | + foreach ($modelData->fields as $field) { |
|
615 | 615 | |
616 | 616 | |
617 | - if(isset($field->foreignKey->relationship)){ |
|
617 | + if (isset($field->foreignKey->relationship)) { |
|
618 | 618 | switch ($field->foreignKey->relationship) { |
619 | 619 | case 'belongsTo': |
620 | 620 | // hasOne or hasMay are the inverse relationship for belongsTo |
621 | - $relationship = new stdClass ; |
|
622 | - $relationship->type = $field->foreignKey->reverse ; |
|
623 | - $relationship->foreignKey = $field->name ; |
|
624 | - $relationship->localKey = $field->foreignKey->field ; |
|
625 | - $relationship->modelName = $modelData->modelName ; |
|
621 | + $relationship = new stdClass; |
|
622 | + $relationship->type = $field->foreignKey->reverse; |
|
623 | + $relationship->foreignKey = $field->name; |
|
624 | + $relationship->localKey = $field->foreignKey->field; |
|
625 | + $relationship->modelName = $modelData->modelName; |
|
626 | 626 | array_push($modelsData[$field->foreignKey->table]->reverseRelationships, $relationship); |
627 | 627 | break; |
628 | 628 | case 'belongsToMany': |
629 | 629 | // belongsToMany is the inverse relationship for belongsTo |
630 | - $relationship = new stdClass ; |
|
631 | - $relationship->type = $field->foreignKey->reverse ; |
|
632 | - $relationship->foreignKey = $field->name ; |
|
630 | + $relationship = new stdClass; |
|
631 | + $relationship->type = $field->foreignKey->reverse; |
|
632 | + $relationship->foreignKey = $field->name; |
|
633 | 633 | $relationship->relatedTable = isset($field->relatedTable) ? $field->relatedTable : ''; |
634 | 634 | $relationship->relatedField = isset($field->relatedField) ? $field->relatedField : ''; |
635 | 635 | $relationship->ui = $field->type->ui; |
636 | - $relationship->localKey = $field->foreignKey->field ; |
|
637 | - $relationship->modelName = $modelData->modelName ; |
|
638 | - $relationship->tableName = $modelData->tableName ; |
|
636 | + $relationship->localKey = $field->foreignKey->field; |
|
637 | + $relationship->modelName = $modelData->modelName; |
|
638 | + $relationship->tableName = $modelData->tableName; |
|
639 | 639 | array_push($modelsData[$field->foreignKey->table]->reverseRelationships, $relationship); |
640 | 640 | break; |
641 | 641 | default: |
@@ -648,36 +648,36 @@ discard block |
||
648 | 648 | } |
649 | 649 | |
650 | 650 | |
651 | - $actualTablePosition++ ; |
|
651 | + $actualTablePosition++; |
|
652 | 652 | } |
653 | 653 | |
654 | 654 | // $this->info(print_r($modelsData, 1)); |
655 | 655 | |
656 | - return $modelsData ; |
|
656 | + return $modelsData; |
|
657 | 657 | |
658 | 658 | } |
659 | 659 | |
660 | - protected function getPrimaryKeyField($modelData){ |
|
660 | + protected function getPrimaryKeyField($modelData) { |
|
661 | 661 | $primaryKey = new stdClass; |
662 | - $primaryKey->name = "id" ; |
|
663 | - $primaryKey->index = "primary" ; |
|
664 | - $primaryKey->declared = false ; |
|
665 | - $primaryKey->type = new stdClass ; |
|
666 | - $primaryKey->type->ui = 'label' ; |
|
667 | - $primaryKey->type->db = 'integer' ; |
|
662 | + $primaryKey->name = "id"; |
|
663 | + $primaryKey->index = "primary"; |
|
664 | + $primaryKey->declared = false; |
|
665 | + $primaryKey->type = new stdClass; |
|
666 | + $primaryKey->type->ui = 'label'; |
|
667 | + $primaryKey->type->db = 'integer'; |
|
668 | 668 | $primaryKey->foreignKey = []; |
669 | - $primaryKey->validations = "required" ; |
|
669 | + $primaryKey->validations = "required"; |
|
670 | 670 | |
671 | 671 | foreach ($modelData->fields as $field) |
672 | 672 | { |
673 | 673 | if ($field->index == 'primary') |
674 | 674 | { |
675 | - $primaryKey = $field ; |
|
675 | + $primaryKey = $field; |
|
676 | 676 | break; |
677 | 677 | } |
678 | 678 | } |
679 | 679 | |
680 | - return $primaryKey ; |
|
680 | + return $primaryKey; |
|
681 | 681 | } |
682 | 682 | |
683 | 683 | } |
684 | 684 | \ No newline at end of file |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | */ |
45 | 45 | protected function store($modelName, $scaffolderConfig, $compiled, FileToCompile $fileToCompile) |
46 | 46 | { |
47 | - $path = PathParser::parse($scaffolderConfig->generator->paths->views) . 'layouts/page.blade.php'; |
|
47 | + $path = PathParser::parse($scaffolderConfig->generator->paths->views).'layouts/page.blade.php'; |
|
48 | 48 | |
49 | 49 | File::put($path, $compiled); |
50 | 50 | |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | <a href='/%s' class='waves-effect'> |
99 | 99 | %ss |
100 | 100 | </a> |
101 | - </li>", $scaffolderConfig->generator->routing->prefix . '/' . strtolower($link), $link); |
|
101 | + </li>", $scaffolderConfig->generator->routing->prefix.'/'.strtolower($link), $link); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | $this->stub = str_replace('{{links}}', $navLinks, $this->stub); |