| @@ -35,12 +35,12 @@ | ||
| 35 | 35 | */ | 
| 36 | 36 | public function register() | 
| 37 | 37 |      { | 
| 38 | -        $this->app->singleton('scaffolder.command.generate', function ($app) | |
| 38 | +        $this->app->singleton('scaffolder.command.generate', function($app) | |
| 39 | 39 |          { | 
| 40 | 40 | return new GeneratorCommand($app['scaffolder.theme.views'], $app['scaffolder.theme.layouts']); | 
| 41 | 41 | }); | 
| 42 | 42 | |
| 43 | -        $this->app->singleton('scaffolder.command.cache.clear', function () | |
| 43 | +        $this->app->singleton('scaffolder.command.cache.clear', function() | |
| 44 | 44 |          { | 
| 45 | 45 | return new ClearCacheCommand(); | 
| 46 | 46 | }); | 
| @@ -26,8 +26,7 @@ discard block | ||
| 26 | 26 |          if (File::exists(base_path('scaffolder-config/cache/model_' . $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/model_' . $fileToCompile->hash . self::CACHE_EXT), $path); | 
| 61 | - } | |
| 62 | - else | |
| 60 | + } else | |
| 63 | 61 |          { | 
| 64 | 62 |              File::put(base_path('scaffolder-config/cache/model_' . $fileToCompile->hash . self::CACHE_EXT), $compiled); | 
| 65 | 63 |              File::copy(base_path('scaffolder-config/cache/model_' . $fileToCompile->hash . self::CACHE_EXT), $path); | 
| @@ -100,8 +98,7 @@ discard block | ||
| 100 | 98 |              { | 
| 101 | 99 |                  $fields .= sprintf("'%s'," . PHP_EOL, $field->name); | 
| 102 | 100 | $firstIteration = false; | 
| 103 | - } | |
| 104 | - else | |
| 101 | + } else | |
| 105 | 102 |              { | 
| 106 | 103 |                  $fields .= sprintf("\t\t'%s'," . PHP_EOL, $field->name); | 
| 107 | 104 | } | 
| @@ -37,8 +37,7 @@ discard block | ||
| 37 | 37 |          if (File::exists(base_path('scaffolder-config/cache/migration_' . $hash . self::CACHE_EXT))) | 
| 38 | 38 |          { | 
| 39 | 39 | return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash)); | 
| 40 | - } | |
| 41 | - else | |
| 40 | + } else | |
| 42 | 41 |          { | 
| 43 | 42 | $this->stub = $stub; | 
| 44 | 43 | |
| @@ -67,8 +66,7 @@ discard block | ||
| 67 | 66 | if ($fileToCompile->cached) | 
| 68 | 67 |          { | 
| 69 | 68 |              File::copy(base_path('scaffolder-config/cache/migration_' . $fileToCompile->hash . self::CACHE_EXT), $path); | 
| 70 | - } | |
| 71 | - else | |
| 69 | + } else | |
| 72 | 70 |          { | 
| 73 | 71 |              File::put(base_path('scaffolder-config/cache/migration_' . $fileToCompile->hash . self::CACHE_EXT), $compiled); | 
| 74 | 72 |              File::copy(base_path('scaffolder-config/cache/migration_' . $fileToCompile->hash . self::CACHE_EXT), $path); | 
| @@ -129,8 +127,7 @@ discard block | ||
| 129 | 127 | if (count($modifierAndValue) == 2) | 
| 130 | 128 |                      { | 
| 131 | 129 |                          $parsedModifiers .= '->' . $modifierAndValue[0] . '(' . $modifierAndValue[1] . ')'; | 
| 132 | - } | |
| 133 | - else | |
| 130 | + } else | |
| 134 | 131 |                      { | 
| 135 | 132 | $parsedModifiers .= '->' . $modifierAndValue[0] . '()'; | 
| 136 | 133 | } | 
| @@ -141,8 +138,7 @@ discard block | ||
| 141 | 138 | if ($field->index != 'none') | 
| 142 | 139 |              { | 
| 143 | 140 |                  $fields .= sprintf("\t\t\t\$table->%s('%s')%s->%s();" . PHP_EOL, $field->type->db, $field->name, $parsedModifiers, $field->index); | 
| 144 | - } | |
| 145 | - else | |
| 141 | + } else | |
| 146 | 142 |              { | 
| 147 | 143 |                  $fields .= sprintf("\t\t\t\$table->%s('%s')%s;" . PHP_EOL, $field->type->db, $field->name, $parsedModifiers); | 
| 148 | 144 | } | 
| @@ -26,8 +26,7 @@ discard block | ||
| 26 | 26 |          if (File::exists(base_path('scaffolder-config/cache/controller_' . $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 | |
| @@ -57,8 +56,7 @@ discard block | ||
| 57 | 56 | if ($fileToCompile->cached) | 
| 58 | 57 |          { | 
| 59 | 58 |              File::copy(base_path('scaffolder-config/cache/controller_' . $fileToCompile->hash . self::CACHE_EXT), $path); | 
| 60 | - } | |
| 61 | - else | |
| 59 | + } else | |
| 62 | 60 |          { | 
| 63 | 61 |              File::put(base_path('scaffolder-config/cache/controller_' . $fileToCompile->hash . self::CACHE_EXT), $compiled); | 
| 64 | 62 |              File::copy(base_path('scaffolder-config/cache/controller_' . $fileToCompile->hash . self::CACHE_EXT), $path); | 
| @@ -85,8 +83,7 @@ discard block | ||
| 85 | 83 |              { | 
| 86 | 84 |                  $fields .= sprintf("'%s' => '%s'," . PHP_EOL, $field->name, $field->validations); | 
| 87 | 85 | $firstIteration = false; | 
| 88 | - } | |
| 89 | - else | |
| 86 | + } else | |
| 90 | 87 |              { | 
| 91 | 88 |                  $fields .= sprintf("\t\t\t'%s' => '%s'," . PHP_EOL, $field->name, $field->validations); | 
| 92 | 89 | } | 
| @@ -29,8 +29,7 @@ discard block | ||
| 29 | 29 |          if (File::exists(base_path('scaffolder-config/cache/view_create_' . $hash . self::CACHE_EXT))) | 
| 30 | 30 |          { | 
| 31 | 31 | return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash)); | 
| 32 | - } | |
| 33 | - else | |
| 32 | + } else | |
| 34 | 33 |          { | 
| 35 | 34 | $this->stub = $stub; | 
| 36 | 35 | |
| @@ -60,8 +59,7 @@ discard block | ||
| 60 | 59 | if ($fileToCompile->cached) | 
| 61 | 60 |          { | 
| 62 | 61 |              File::copy(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $path); | 
| 63 | - } | |
| 64 | - else | |
| 62 | + } else | |
| 65 | 63 |          { | 
| 66 | 64 |              File::put(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $compiled); | 
| 67 | 65 |              File::copy(base_path('scaffolder-config/cache/view_create_' . $fileToCompile->hash . self::CACHE_EXT), $path); | 
| @@ -88,8 +86,7 @@ discard block | ||
| 88 | 86 |              { | 
| 89 | 87 | $fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name); | 
| 90 | 88 | $firstIteration = false; | 
| 91 | - } | |
| 92 | - else | |
| 89 | + } else | |
| 93 | 90 |              { | 
| 94 | 91 |                  $fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name); | 
| 95 | 92 | } | 
| @@ -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 | } | 
| @@ -29,8 +29,7 @@ discard block | ||
| 29 | 29 |          if (File::exists(base_path('scaffolder-config/cache/view_edit_' . $hash . self::CACHE_EXT))) | 
| 30 | 30 |          { | 
| 31 | 31 | return $this->store($modelName, $scaffolderConfig, '', new FileToCompile(true, $hash)); | 
| 32 | - } | |
| 33 | - else | |
| 32 | + } else | |
| 34 | 33 |          { | 
| 35 | 34 | $this->stub = $stub; | 
| 36 | 35 | |
| @@ -61,8 +60,7 @@ discard block | ||
| 61 | 60 | if ($fileToCompile->cached) | 
| 62 | 61 |          { | 
| 63 | 62 |              File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path); | 
| 64 | - } | |
| 65 | - else | |
| 63 | + } else | |
| 66 | 64 |          { | 
| 67 | 65 |              File::put(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $compiled); | 
| 68 | 66 |              File::copy(base_path('scaffolder-config/cache/view_edit_' . $fileToCompile->hash . self::CACHE_EXT), $path); | 
| @@ -89,8 +87,7 @@ discard block | ||
| 89 | 87 |              { | 
| 90 | 88 | $fields .= sprintf(self::getInputFor($field) . PHP_EOL, $field->name); | 
| 91 | 89 | $firstIteration = false; | 
| 92 | - } | |
| 93 | - else | |
| 90 | + } else | |
| 94 | 91 |              { | 
| 95 | 92 |                  $fields .= sprintf("\t" . self::getInputFor($field) . PHP_EOL, $field->name); | 
| 96 | 93 | } | 
| @@ -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 | } | 
| @@ -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 | } |