@@ -50,10 +50,14 @@ |
||
| 50 | 50 | { |
| 51 | 51 | if ($this->hasSpecialSchema()) { |
| 52 | 52 | $schema = $this->processSpecialSchema(); |
| 53 | - }else{ |
|
| 53 | + } else{ |
|
| 54 | 54 | foreach ($this->optionArray as $option) { |
| 55 | - if ($option == self::COLUMN_UNIQUE) $this->hasUnique(); |
|
| 56 | - if (is_numeric($option) && $option <= 2048) $this->hasSize((int)$option); |
|
| 55 | + if ($option == self::COLUMN_UNIQUE) { |
|
| 56 | + $this->hasUnique(); |
|
| 57 | + } |
|
| 58 | + if (is_numeric($option) && $option <= 2048) { |
|
| 59 | + $this->hasSize((int)$option); |
|
| 60 | + } |
|
| 57 | 61 | } |
| 58 | 62 | |
| 59 | 63 | $schema = '$table->' . $this->getType() . "('{$this->column}'"; |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | |
| 6 | 6 | class BaseGenerator |
| 7 | 7 | { |
| 8 | - protected $module; |
|
| 8 | + protected $module; |
|
| 9 | 9 | |
| 10 | 10 | public function __construct(Module $module) |
| 11 | 11 | { |
@@ -31,8 +31,9 @@ |
||
| 31 | 31 | { |
| 32 | 32 | $dir = base_path($path); |
| 33 | 33 | |
| 34 | - if(!is_dir($dir)) |
|
| 35 | - mkdir($dir, 0755, true); |
|
| 34 | + if(!is_dir($dir)) { |
|
| 35 | + mkdir($dir, 0755, true); |
|
| 36 | + } |
|
| 36 | 37 | |
| 37 | 38 | return $dir; |
| 38 | 39 | } |
@@ -1,58 +1,58 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | - 'options' => [ |
|
| 5 | - 'generated_by_default' => ['Migration', 'Controller', 'Model', 'View', 'Seeder'], |
|
| 6 | - 'skip_generators' => [], |
|
| 7 | - 'override' => true |
|
| 8 | - ], |
|
| 9 | - 'modules' => [ |
|
| 4 | + 'options' => [ |
|
| 5 | + 'generated_by_default' => ['Migration', 'Controller', 'Model', 'View', 'Seeder'], |
|
| 6 | + 'skip_generators' => [], |
|
| 7 | + 'override' => true |
|
| 8 | + ], |
|
| 9 | + 'modules' => [ |
|
| 10 | 10 | |
| 11 | - // optional parameters : |
|
| 12 | - // 'multiple'=>[] |
|
| 13 | - // 'images'=>'single' //Images type: single, multiple |
|
| 11 | + // optional parameters : |
|
| 12 | + // 'multiple'=>[] |
|
| 13 | + // 'images'=>'single' //Images type: single, multiple |
|
| 14 | 14 | |
| 15 | - 'categories' => [ |
|
| 16 | - 'data'=> [ |
|
| 17 | - // Separated by ':', numeric value represents size of the field its 192 by default and is optional |
|
| 15 | + 'categories' => [ |
|
| 16 | + 'data'=> [ |
|
| 17 | + // Separated by ':', numeric value represents size of the field its 192 by default and is optional |
|
| 18 | 18 | |
| 19 | - // Regular data types: |
|
| 20 | - // string, int, text, bool, date |
|
| 19 | + // Regular data types: |
|
| 20 | + // string, int, text, bool, date |
|
| 21 | 21 | |
| 22 | - // Data type modifiers |
|
| 23 | - // unique |
|
| 22 | + // Data type modifiers |
|
| 23 | + // unique |
|
| 24 | 24 | |
| 25 | - //Must start with data type nd then followed by size, then by modifiers if required |
|
| 25 | + //Must start with data type nd then followed by size, then by modifiers if required |
|
| 26 | 26 | |
| 27 | - // Special data types: |
|
| 28 | - // parent: requires name of a module, creates a one-to-many relation with the current module |
|
| 29 | - // related: requires name of a module, creates many to many relation with current module |
|
| 27 | + // Special data types: |
|
| 28 | + // parent: requires name of a module, creates a one-to-many relation with the current module |
|
| 29 | + // related: requires name of a module, creates many to many relation with current module |
|
| 30 | 30 | |
| 31 | - 'title' => 'string:128', |
|
| 32 | - 'slug' => 'string:128:unique', |
|
| 33 | - 'short_description' => 'string', |
|
| 34 | - ], |
|
| 35 | - 'images'=>'single' |
|
| 36 | - ], |
|
| 31 | + 'title' => 'string:128', |
|
| 32 | + 'slug' => 'string:128:unique', |
|
| 33 | + 'short_description' => 'string', |
|
| 34 | + ], |
|
| 35 | + 'images'=>'single' |
|
| 36 | + ], |
|
| 37 | 37 | |
| 38 | - 'tags' => [ |
|
| 39 | - 'data'=> [ |
|
| 40 | - 'title' => 'string:128' |
|
| 41 | - ] |
|
| 42 | - ], |
|
| 38 | + 'tags' => [ |
|
| 39 | + 'data'=> [ |
|
| 40 | + 'title' => 'string:128' |
|
| 41 | + ] |
|
| 42 | + ], |
|
| 43 | 43 | |
| 44 | - 'posts' => [ |
|
| 45 | - 'data' => [ |
|
| 46 | - 'author' => 'parent:users', |
|
| 47 | - 'title' => 'string:256', |
|
| 48 | - 'slug' => 'string:128:unique', |
|
| 49 | - 'short_description' => 'string', |
|
| 50 | - 'full_description' => 'text', |
|
| 51 | - 'category' => 'parent:categories', |
|
| 52 | - 'posted_at' => 'datetime', |
|
| 53 | - 'tags' => 'related:tags' |
|
| 54 | - ], |
|
| 55 | - 'images'=>'multiple' |
|
| 56 | - ], |
|
| 57 | - ] |
|
| 44 | + 'posts' => [ |
|
| 45 | + 'data' => [ |
|
| 46 | + 'author' => 'parent:users', |
|
| 47 | + 'title' => 'string:256', |
|
| 48 | + 'slug' => 'string:128:unique', |
|
| 49 | + 'short_description' => 'string', |
|
| 50 | + 'full_description' => 'text', |
|
| 51 | + 'category' => 'parent:categories', |
|
| 52 | + 'posted_at' => 'datetime', |
|
| 53 | + 'tags' => 'related:tags' |
|
| 54 | + ], |
|
| 55 | + 'images'=>'multiple' |
|
| 56 | + ], |
|
| 57 | + ] |
|
| 58 | 58 | ]; |
@@ -47,10 +47,11 @@ |
||
| 47 | 47 | $itemGenerator = new $generator($module); |
| 48 | 48 | $returnedFiles = $itemGenerator->generate(); |
| 49 | 49 | |
| 50 | - if(!is_array($returnedFiles)) |
|
| 51 | - $generatedFiles[] = $returnedFiles; |
|
| 52 | - else |
|
| 53 | - $generatedFiles = array_merge($generatedFiles, $returnedFiles); |
|
| 50 | + if(!is_array($returnedFiles)) { |
|
| 51 | + $generatedFiles[] = $returnedFiles; |
|
| 52 | + } else { |
|
| 53 | + $generatedFiles = array_merge($generatedFiles, $returnedFiles); |
|
| 54 | + } |
|
| 54 | 55 | |
| 55 | 56 | $bar->advance(); |
| 56 | 57 | } |
@@ -84,12 +84,13 @@ discard block |
||
| 84 | 84 | $specialTypes = array_keys($specialTypesToDefinition); |
| 85 | 85 | if(in_array($column,$specialTypes)){ |
| 86 | 86 | $dataDefinition .= $this->getTabs(2) . "'{$column}'" . " => " . '$faker->' . $specialTypesToDefinition[$column]; |
| 87 | - }else{ |
|
| 87 | + } else{ |
|
| 88 | 88 | $dataDefinition .= $this->getTabs(2) . "'{$column}'" . " => " . '$faker->' . $typeToDefinition[$type]; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - if($column != last($columns)) |
|
| 92 | - $dataDefinition .= "," . PHP_EOL; |
|
| 91 | + if($column != last($columns)) { |
|
| 92 | + $dataDefinition .= "," . PHP_EOL; |
|
| 93 | + } |
|
| 93 | 94 | } |
| 94 | 95 | } |
| 95 | 96 | return $dataDefinition; |
@@ -107,8 +108,9 @@ discard block |
||
| 107 | 108 | '{{parentModel}}' => ucfirst(camel_case(str_singular($parent))) |
| 108 | 109 | ]); |
| 109 | 110 | |
| 110 | - if($column != last($columns)) |
|
| 111 | - $foreignData .= "," . PHP_EOL; |
|
| 111 | + if($column != last($columns)) { |
|
| 112 | + $foreignData .= "," . PHP_EOL; |
|
| 113 | + } |
|
| 112 | 114 | } |
| 113 | 115 | } |
| 114 | 116 | |
@@ -55,10 +55,11 @@ |
||
| 55 | 55 | |
| 56 | 56 | public function getForeignColumns($type = 'all') |
| 57 | 57 | { |
| 58 | - if(is_array($type)) |
|
| 59 | - $types = $type; |
|
| 60 | - else |
|
| 61 | - $types = ($type == "all") ? ['parent', 'related'] : [$type]; |
|
| 58 | + if(is_array($type)) { |
|
| 59 | + $types = $type; |
|
| 60 | + } else { |
|
| 61 | + $types = ($type == "all") ? ['parent', 'related'] : [$type]; |
|
| 62 | + } |
|
| 62 | 63 | |
| 63 | 64 | $data = []; |
| 64 | 65 | foreach ($this->data as $column => $optionString) { |