@@ -32,7 +32,7 @@ |
||
32 | 32 | $order = 1; |
33 | 33 | foreach ($ids as $id) { |
34 | 34 | $instance = $this->model->find($id); |
35 | - if (! empty($instance)) { |
|
35 | + if (!empty($instance)) { |
|
36 | 36 | $instance->{$this->model->orderFieldName()} = $order; |
37 | 37 | $instance->save(); |
38 | 38 | $order++; |
@@ -18,8 +18,8 @@ |
||
18 | 18 | public function handle($request, Closure $next) |
19 | 19 | { |
20 | 20 | |
21 | - if($request->session()->has('language')){ |
|
22 | - $local = $request->session()->get('language',config('app.locale')); |
|
21 | + if ($request->session()->has('language')) { |
|
22 | + $local = $request->session()->get('language', config('app.locale')); |
|
23 | 23 | app()->setLocale($local); |
24 | 24 | } |
25 | 25 |
@@ -29,7 +29,7 @@ |
||
29 | 29 | |
30 | 30 | }); |
31 | 31 | |
32 | -$router->group(array('middleware' => ['auth','language']), function() use($router) |
|
32 | +$router->group(array('middleware' => ['auth', 'language']), function() use($router) |
|
33 | 33 | { |
34 | 34 | $router->group(array('middleware' => 'permission', 'prefix' => config('expendable.admin_base_uri')), function() use($router) |
35 | 35 | { |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | $id_element = $this->model->hasBeenTranslated($this->model->getTable(), $id, $iso); |
79 | 79 | if (!empty($id_element)) { |
80 | - return redirect()->to(action($this->getControllerNameForAction() . '@getEdit', $id_element)); |
|
80 | + return redirect()->to(action($this->getControllerNameForAction().'@getEdit', $id_element)); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | $model = (!empty($id) || $id === "0") ? $this->model->withoutTranslation()->findOrFail($id) : $this->model; |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | return $result; |
134 | 134 | } |
135 | 135 | |
136 | - return redirect()->to(action($this->getControllerNameForAction() . '@getIndex')); |
|
136 | + return redirect()->to(action($this->getControllerNameForAction().'@getIndex')); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | // ------------------------------------------------------------------------------------------------ |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | return $result; |
168 | 168 | } |
169 | 169 | |
170 | - return redirect()->to(action($this->getControllerNameForAction() . '@getIndex')); |
|
170 | + return redirect()->to(action($this->getControllerNameForAction().'@getIndex')); |
|
171 | 171 | |
172 | 172 | } |
173 | 173 | |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | $form_content = view('form-builder::form.components.formgenerator.info', [ |
231 | 231 | 'form' => $form, |
232 | 232 | 'id' => $id, |
233 | - 'route' => $this->getControllerNameForAction() . '@', |
|
233 | + 'route' => $this->getControllerNameForAction().'@', |
|
234 | 234 | ]); |
235 | 235 | |
236 | 236 | $this->layoutManager->add([ |
@@ -250,6 +250,6 @@ discard block |
||
250 | 250 | |
251 | 251 | $action = explode('@', \Route::currentRouteAction()); |
252 | 252 | |
253 | - return '\\' . $action[0]; |
|
253 | + return '\\'.$action[0]; |
|
254 | 254 | } |
255 | 255 | } |
256 | 256 | \ No newline at end of file |
@@ -13,7 +13,7 @@ |
||
13 | 13 | */ |
14 | 14 | protected function registerRouter() |
15 | 15 | { |
16 | - $this->app->singleton('router',function ($app) { |
|
16 | + $this->app->singleton('router', function($app) { |
|
17 | 17 | return new Router($app['events'], $app); |
18 | 18 | }); |
19 | 19 | } |
@@ -30,22 +30,22 @@ discard block |
||
30 | 30 | public function boot() |
31 | 31 | { |
32 | 32 | |
33 | - $this->loadViewsFrom(__DIR__ . '/../../views', 'expendable'); |
|
34 | - $this->loadTranslationsFrom(__DIR__ . '/../../lang', 'expendable'); |
|
35 | - $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations/'); |
|
33 | + $this->loadViewsFrom(__DIR__.'/../../views', 'expendable'); |
|
34 | + $this->loadTranslationsFrom(__DIR__.'/../../lang', 'expendable'); |
|
35 | + $this->loadMigrationsFrom(__DIR__.'/../../database/migrations/'); |
|
36 | 36 | |
37 | 37 | |
38 | 38 | $this->publishes([ |
39 | - __DIR__ . '/../../config/config.php' => config_path('expendable.php'), |
|
40 | - __DIR__ . '/../../database/seeds/' => base_path('/database/seeds'), |
|
39 | + __DIR__.'/../../config/config.php' => config_path('expendable.php'), |
|
40 | + __DIR__.'/../../database/seeds/' => base_path('/database/seeds'), |
|
41 | 41 | ]); |
42 | 42 | |
43 | 43 | |
44 | 44 | $this->publishes([ |
45 | - __DIR__ . '/../../views' => base_path('resources/views/vendor/expendable'), |
|
45 | + __DIR__.'/../../views' => base_path('resources/views/vendor/expendable'), |
|
46 | 46 | ], 'views'); |
47 | 47 | $this->mergeConfigFrom( |
48 | - __DIR__ . '/../../config/config.php', 'expendable' |
|
48 | + __DIR__.'/../../config/config.php', 'expendable' |
|
49 | 49 | ); |
50 | 50 | |
51 | 51 | $autoLoaderListener = new \Distilleries\Expendable\Register\ListenerAutoLoader(config('expendable.listener')); |
@@ -128,13 +128,13 @@ discard block |
||
128 | 128 | protected function registerCommands() |
129 | 129 | { |
130 | 130 | $file = app('files'); |
131 | - $files = $file->allFiles(__DIR__ . '/Console/'); |
|
131 | + $files = $file->allFiles(__DIR__.'/Console/'); |
|
132 | 132 | |
133 | 133 | foreach ($files as $file) |
134 | 134 | { |
135 | 135 | if (strpos($file->getPathName(), 'Lib') === false) |
136 | 136 | { |
137 | - $this->commands('Distilleries\Expendable\Console\\' . preg_replace('/\.php/i', '', $file->getFilename())); |
|
137 | + $this->commands('Distilleries\Expendable\Console\\'.preg_replace('/\.php/i', '', $file->getFilename())); |
|
138 | 138 | } |
139 | 139 | } |
140 | 140 | } |
@@ -77,7 +77,7 @@ |
||
77 | 77 | protected function getUpdateRules() |
78 | 78 | { |
79 | 79 | $key = \Request::get($this->model->getKeyName()); |
80 | - static::$rules_update['email'] = 'required|email|unique:users,email,' . $key; |
|
80 | + static::$rules_update['email'] = 'required|email|unique:users,email,'.$key; |
|
81 | 81 | |
82 | 82 | return parent::getUpdateRules(); |
83 | 83 | } |
@@ -44,7 +44,7 @@ |
||
44 | 44 | protected function getUpdateRules() |
45 | 45 | { |
46 | 46 | $key = \Request::get($this->model->getKeyName()); |
47 | - static::$rules['iso'] = 'required|unique:languages,iso,' . $key; |
|
47 | + static::$rules['iso'] = 'required|unique:languages,iso,'.$key; |
|
48 | 48 | |
49 | 49 | return parent::getUpdateRules(); |
50 | 50 | } |
@@ -10,15 +10,15 @@ |
||
10 | 10 | // ------------------------------------------------------------------------------------------------ |
11 | 11 | public function addTranslationAction($template = 'expendable::admin.form.components.datatable.translations', $route = '') |
12 | 12 | { |
13 | - $this->add('translation', function ($model) use ($template, $route) { |
|
13 | + $this->add('translation', function($model) use ($template, $route) { |
|
14 | 14 | |
15 | 15 | $languages = Language::withoutCurrentLanguage()->get(); |
16 | - $translations = Translation::byElement($model)->pluck('id_element','iso')->toArray(); |
|
16 | + $translations = Translation::byElement($model)->pluck('id_element', 'iso')->toArray(); |
|
17 | 17 | return view($template, array( |
18 | 18 | 'languages' => $languages, |
19 | 19 | 'translations' => $translations, |
20 | 20 | 'data' => $model->toArray(), |
21 | - 'route' => !empty($route) ? $route . '@' : $this->getControllerNameForAction() . '@' |
|
21 | + 'route' => !empty($route) ? $route.'@' : $this->getControllerNameForAction().'@' |
|
22 | 22 | ))->render(); |
23 | 23 | }); |
24 | 24 |