@@ -4,7 +4,7 @@ |
||
4 | 4 | 'login_uri' => 'admin/login', |
5 | 5 | 'logout_action' => 'Distilleries\Expendable\Http\Controllers\Admin\LoginController@getLogout', |
6 | 6 | 'admin_base_uri' => 'admin', |
7 | - 'config_file_assets' => base_path() . '/package.json', |
|
7 | + 'config_file_assets' => base_path().'/package.json', |
|
8 | 8 | 'folder_whitelist' => [ |
9 | 9 | 'moximanager' |
10 | 10 | ], |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | $iso = app()->getLocale(); |
32 | 32 | } |
33 | 33 | |
34 | - $builder->whereExists(function ($query) use ($model, $iso) { |
|
34 | + $builder->whereExists(function($query) use ($model, $iso) { |
|
35 | 35 | $query->select(\DB::raw(1)) |
36 | 36 | ->from($model->getQualifiedTable()) |
37 | - ->whereRaw($model->getTable() . '.' . $model->getKeyName() . ' = ' . $model->getQualifiedIdElementColumn()) |
|
37 | + ->whereRaw($model->getTable().'.'.$model->getKeyName().' = '.$model->getQualifiedIdElementColumn()) |
|
38 | 38 | ->where($model->getQualifiedIsoColumn(), $iso) |
39 | 39 | ->where($model->getQualifiedModelColumn(), $model->getTable()); |
40 | 40 | }); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | */ |
67 | 67 | protected function addWithoutTranslation(Builder $builder) |
68 | 68 | { |
69 | - $builder->macro('withoutTranslation', function (Builder $builder) { |
|
69 | + $builder->macro('withoutTranslation', function(Builder $builder) { |
|
70 | 70 | return $builder->withoutGlobalScope($this); |
71 | 71 | }); |
72 | 72 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | { |
38 | 38 | $translation = new Translation; |
39 | 39 | |
40 | - return $translation->getTable() . '.' . $translation->getIsoColumn(); |
|
40 | + return $translation->getTable().'.'.$translation->getIsoColumn(); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | { |
50 | 50 | $translation = new Translation; |
51 | 51 | |
52 | - return $translation->getTable() . '.' . $translation->getIdElementColumn(); |
|
52 | + return $translation->getTable().'.'.$translation->getIdElementColumn(); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | { |
62 | 62 | $translation = new Translation; |
63 | 63 | |
64 | - return $translation->getTable() . '.' . $translation->getModelColumn(); |
|
64 | + return $translation->getTable().'.'.$translation->getModelColumn(); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | /** |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | { |
74 | 74 | $translation = new Translation; |
75 | 75 | |
76 | - return $translation->getTable() . '.' . $translation->getIdSourceColumn(); |
|
76 | + return $translation->getTable().'.'.$translation->getIdSourceColumn(); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | /** |
@@ -59,12 +59,12 @@ |
||
59 | 59 | if (!$result->isEmpty()) |
60 | 60 | { |
61 | 61 | $exporter = app($data['type']); |
62 | - $file = $exporter->export($result->toArray(), $data['range']['start'] . ' ' . $data['range']['end']); |
|
62 | + $file = $exporter->export($result->toArray(), $data['range']['start'].' '.$data['range']['end']); |
|
63 | 63 | |
64 | 64 | return $file; |
65 | 65 | } |
66 | 66 | |
67 | - return redirect()->to(action('\\' . get_class($this) . '@getExport')); |
|
67 | + return redirect()->to(action('\\'.get_class($this).'@getExport')); |
|
68 | 68 | |
69 | 69 | } |
70 | 70 | } |
71 | 71 | \ No newline at end of file |
@@ -57,7 +57,7 @@ |
||
57 | 57 | return redirect()->back()->with(Message::WARNING, [trans('expendable::errors.file_not_found')]); |
58 | 58 | } |
59 | 59 | |
60 | - $contract = ucfirst(app('files')->extension($file)) . 'ImporterContract'; |
|
60 | + $contract = ucfirst(app('files')->extension($file)).'ImporterContract'; |
|
61 | 61 | $exporter = app($contract); |
62 | 62 | $data = $exporter->getArrayDataFromFile($file); |
63 | 63 |
@@ -57,7 +57,7 @@ |
||
57 | 57 | { |
58 | 58 | return $this->view->make($template, [ |
59 | 59 | 'states' => $this->getTableState(), |
60 | - 'action' => '\\' . $this->class . '@' |
|
60 | + 'action' => '\\'.$this->class.'@' |
|
61 | 61 | ]); |
62 | 62 | } |
63 | 63 |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | { |
47 | 47 | $allModels = [ |
48 | 48 | [ |
49 | - 'path' => app_path() . DIRECTORY_SEPARATOR, |
|
49 | + 'path' => app_path().DIRECTORY_SEPARATOR, |
|
50 | 50 | 'namespace' => '{{app}}', |
51 | 51 | ], |
52 | 52 | [ |
53 | - 'path' => __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR, |
|
53 | + 'path' => __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR, |
|
54 | 54 | 'namespace' => 'Distilleries\\Expendable\\Models\\', |
55 | 55 | ], |
56 | 56 | ]; |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | { |
64 | 64 | $choice = explode('/', $model); |
65 | 65 | $model = preg_replace('/.php/i', '', last($choice)); |
66 | - $choices[$config['namespace'] . $model] = $model; |
|
66 | + $choices[$config['namespace'].$model] = $model; |
|
67 | 67 | } |
68 | 68 | } |
69 | 69 |
@@ -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 | } |