We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -3,11 +3,11 @@ |
||
3 | 3 | <?php |
4 | 4 | // if the column has been cast to Carbon or Date (using attribute casting) |
5 | 5 | // get the value as a date string |
6 | - if (isset($field['value']) && ( $field['value'] instanceof \Carbon\Carbon || $field['value'] instanceof \Jenssegers\Date\Date )) { |
|
7 | - $field['value'] = $field['value']->format( 'Y-m-d H:i:s' ); |
|
6 | + if (isset($field['value']) && ($field['value'] instanceof \Carbon\Carbon || $field['value'] instanceof \Jenssegers\Date\Date)) { |
|
7 | + $field['value'] = $field['value']->format('Y-m-d H:i:s'); |
|
8 | 8 | } |
9 | 9 | |
10 | - $field_language = isset($field['datetime_picker_options']['language'])?$field['datetime_picker_options']['language']:\App::getLocale(); |
|
10 | + $field_language = isset($field['datetime_picker_options']['language']) ? $field['datetime_picker_options']['language'] : \App::getLocale(); |
|
11 | 11 | ?> |
12 | 12 | |
13 | 13 | <div @include('crud::inc.field_wrapper_attributes') > |
@@ -124,7 +124,7 @@ |
||
124 | 124 | |
125 | 125 | /** |
126 | 126 | * Determine if the current CRUD action is a list operation (using standard or ajax DataTables). |
127 | - * @return bool |
|
127 | + * @return boolean|null |
|
128 | 128 | */ |
129 | 129 | public function doingListOperation() |
130 | 130 | { |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | // check if another filter with the same name exists |
36 | - if (! isset($options['name'])) { |
|
36 | + if (!isset($options['name'])) { |
|
37 | 37 | abort(500, 'All your filters need names.'); |
38 | 38 | } |
39 | 39 | if ($this->filters->contains('name', $options['name'])) { |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | |
113 | 113 | public function removeFilter($name) |
114 | 114 | { |
115 | - $this->filters = $this->filters->reject(function ($filter) use ($name) { |
|
115 | + $this->filters = $this->filters->reject(function($filter) use ($name) { |
|
116 | 116 | return $filter->name == $name; |
117 | 117 | }); |
118 | 118 | } |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | $this->type = $options['type']; |
178 | 178 | $this->label = $options['label']; |
179 | 179 | |
180 | - if (! isset($options['placeholder'])) { |
|
180 | + if (!isset($options['placeholder'])) { |
|
181 | 181 | $this->placeholder = ''; |
182 | 182 | } else { |
183 | 183 | $this->placeholder = $options['placeholder']; |
@@ -194,16 +194,16 @@ discard block |
||
194 | 194 | |
195 | 195 | public function checkOptionsIntegrity($options) |
196 | 196 | { |
197 | - if (! isset($options['name'])) { |
|
197 | + if (!isset($options['name'])) { |
|
198 | 198 | abort(500, 'Please make sure all your filters have names.'); |
199 | 199 | } |
200 | - if (! isset($options['type'])) { |
|
200 | + if (!isset($options['type'])) { |
|
201 | 201 | abort(500, 'Please make sure all your filters have types.'); |
202 | 202 | } |
203 | - if (! \View::exists('crud::filters.'.$options['type'])) { |
|
203 | + if (!\View::exists('crud::filters.'.$options['type'])) { |
|
204 | 204 | abort(500, 'No filter view named "'.$options['type'].'.blade.php" was found.'); |
205 | 205 | } |
206 | - if (! isset($options['label'])) { |
|
206 | + if (!isset($options['label'])) { |
|
207 | 207 | abort(500, 'Please make sure all your filters have labels.'); |
208 | 208 | } |
209 | 209 | } |
@@ -27,12 +27,12 @@ discard block |
||
27 | 27 | |
28 | 28 | public function __construct() |
29 | 29 | { |
30 | - if (! $this->crud) { |
|
30 | + if (!$this->crud) { |
|
31 | 31 | $this->crud = new CrudPanel(); |
32 | 32 | |
33 | 33 | // call the setup function inside this closure to also have the request there |
34 | 34 | // this way, developers can use things stored in session (auth variables, etc) |
35 | - $this->middleware(function ($request, $next) { |
|
35 | + $this->middleware(function($request, $next) { |
|
36 | 36 | $this->request = $request; |
37 | 37 | $this->crud->request = $request; |
38 | 38 | $this->setup(); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $this->data['title'] = ucfirst($this->crud->entity_name_plural); |
63 | 63 | |
64 | 64 | // get all entries if AJAX is not enabled |
65 | - if (! $this->data['crud']->ajaxTable()) { |
|
65 | + if (!$this->data['crud']->ajaxTable()) { |
|
66 | 66 | $this->data['entries'] = $this->data['crud']->getEntries(); |
67 | 67 | } |
68 | 68 |
@@ -3,19 +3,17 @@ |
||
3 | 3 | namespace Backpack\CRUD\app\Http\Controllers; |
4 | 4 | |
5 | 5 | use Backpack\CRUD\CrudPanel; |
6 | -use Illuminate\Http\Request; |
|
7 | -use Illuminate\Support\Facades\Form as Form; |
|
6 | +use Backpack\CRUD\app\Http\Controllers\CrudFeatures\AjaxTable; |
|
7 | +use Backpack\CRUD\app\Http\Controllers\CrudFeatures\Reorder; |
|
8 | +use Backpack\CRUD\app\Http\Controllers\CrudFeatures\Views; |
|
8 | 9 | use Illuminate\Foundation\Bus\DispatchesJobs; |
9 | -use Illuminate\Routing\Controller as BaseController; |
|
10 | 10 | use Illuminate\Foundation\Validation\ValidatesRequests; |
11 | -use Backpack\CRUD\app\Http\Controllers\CrudFeatures\Views; |
|
12 | -use Backpack\CRUD\app\Http\Controllers\CrudFeatures\Reorder; |
|
13 | -use Backpack\CRUD\app\Http\Controllers\CrudFeatures\AjaxTable; |
|
11 | +use Illuminate\Http\Request; |
|
12 | +use Illuminate\Routing\Controller as BaseController; |
|
14 | 13 | // CRUD Traits for non-core features |
15 | 14 | use Backpack\CRUD\app\Http\Controllers\CrudFeatures\Revisions; |
16 | -use Backpack\CRUD\app\Http\Requests\CrudRequest as StoreRequest; |
|
17 | -use Backpack\CRUD\app\Http\Requests\CrudRequest as UpdateRequest; |
|
18 | 15 | use Backpack\CRUD\app\Http\Controllers\CrudFeatures\ShowDetailsRow; |
16 | +use Backpack\CRUD\app\Http\Requests\CrudRequest as UpdateRequest; |
|
19 | 17 | |
20 | 18 | class CrudController extends BaseController |
21 | 19 | { |
@@ -1,8 +1,8 @@ |
||
1 | 1 | {{-- single relationships (1-1, 1-n) --}} |
2 | 2 | <td> |
3 | 3 | <?php |
4 | - if ($entry->{$column['entity']}) { |
|
5 | - echo $entry->{$column['entity']}->{$column['attribute']}; |
|
6 | - } |
|
7 | - ?> |
|
4 | + if ($entry->{$column['entity']}) { |
|
5 | + echo $entry->{$column['entity']}->{$column['attribute']}; |
|
6 | + } |
|
7 | + ?> |
|
8 | 8 | </td> |
9 | 9 | \ No newline at end of file |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | public function addColumn($column) |
55 | 55 | { |
56 | 56 | // if a string was passed, not an array, change it to an array |
57 | - if (! is_array($column)) { |
|
57 | + if (!is_array($column)) { |
|
58 | 58 | $column = ['name' => $column]; |
59 | 59 | } |
60 | 60 | |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | */ |
106 | 106 | public function addDefaultLabel($array) |
107 | 107 | { |
108 | - if (! array_key_exists('label', (array) $array) && array_key_exists('name', (array) $array)) { |
|
108 | + if (!array_key_exists('label', (array) $array) && array_key_exists('name', (array) $array)) { |
|
109 | 109 | $array = array_merge(['label' => ucfirst($this->makeLabel($array['name']))], $array); |
110 | 110 | |
111 | 111 | return $array; |
@@ -139,8 +139,8 @@ discard block |
||
139 | 139 | */ |
140 | 140 | public function remove($entity, $fields) |
141 | 141 | { |
142 | - return array_values(array_filter($this->{$entity}, function ($field) use ($fields) { |
|
143 | - return ! in_array($field['name'], (array) $fields); |
|
142 | + return array_values(array_filter($this->{$entity}, function($field) use ($fields) { |
|
143 | + return !in_array($field['name'], (array) $fields); |
|
144 | 144 | })); |
145 | 145 | } |
146 | 146 | |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | { |
192 | 192 | $columns = $this->getColumns(); |
193 | 193 | |
194 | - return collect($columns)->pluck('entity')->reject(function ($value, $key) { |
|
194 | + return collect($columns)->pluck('entity')->reject(function($value, $key) { |
|
195 | 195 | return $value == null; |
196 | 196 | })->toArray(); |
197 | 197 | } |
@@ -24,12 +24,12 @@ discard block |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | // if the label is missing, we should set it |
27 | - if (! isset($complete_field_array['label'])) { |
|
27 | + if (!isset($complete_field_array['label'])) { |
|
28 | 28 | $complete_field_array['label'] = ucfirst($complete_field_array['name']); |
29 | 29 | } |
30 | 30 | |
31 | 31 | // if the field type is missing, we should set it |
32 | - if (! isset($complete_field_array['type'])) { |
|
32 | + if (!isset($complete_field_array['type'])) { |
|
33 | 33 | $complete_field_array['type'] = $this->getFieldTypeFromDbColumnType($complete_field_array['name']); |
34 | 34 | } |
35 | 35 | |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | */ |
140 | 140 | public function removeFields($array_of_names, $form = 'both') |
141 | 141 | { |
142 | - if (! empty($array_of_names)) { |
|
142 | + if (!empty($array_of_names)) { |
|
143 | 143 | foreach ($array_of_names as $name) { |
144 | 144 | $this->removeField($name, $form); |
145 | 145 | } |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | $jsonCastables = ['array', 'object', 'json']; |
201 | 201 | $fieldCasting = $this->model->getCasts()[$field['name']]; |
202 | 202 | |
203 | - if (in_array($fieldCasting, $jsonCastables) && isset($data[$field['name']]) && ! empty($data[$field['name']]) && ! is_array($data[$field['name']])) { |
|
203 | + if (in_array($fieldCasting, $jsonCastables) && isset($data[$field['name']]) && !empty($data[$field['name']]) && !is_array($data[$field['name']])) { |
|
204 | 204 | try { |
205 | 205 | $data[$field['name']] = json_decode($data[$field['name']]); |
206 | 206 | } catch (Exception $e) { |