We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -10,8 +10,6 @@ |
||
10 | 10 | * plus the '_token' and 'redirect_after_save' variables. |
11 | 11 | * |
12 | 12 | * @param array $requestInput The request input. |
13 | - * @param string $form The CRUD form. Can be 'create' or 'update' . Default is 'create'. |
|
14 | - * @param int|bool $id The CRUD entry id in the case of the 'update' form. |
|
15 | 13 | * |
16 | 14 | * @see \Illuminate\Http\Request::all() For an example on how to get the request input. |
17 | 15 | * |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $fakeFieldKey = isset($field['store_in']) ? $field['store_in'] : 'extras'; |
30 | 30 | $this->addCompactedField($requestInput, $field['name'], $fakeFieldKey); |
31 | 31 | |
32 | - if (! in_array($fakeFieldKey, $compactedFakeFields)) { |
|
32 | + if (!in_array($fakeFieldKey, $compactedFakeFields)) { |
|
33 | 33 | $compactedFakeFields[] = $fakeFieldKey; |
34 | 34 | } |
35 | 35 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | // json_encode all fake_value columns if applicable in the database, so they can be properly stored and interpreted |
39 | 39 | foreach ($compactedFakeFields as $value) { |
40 | - if (! (property_exists($this->model, 'translatable') && in_array($value, $this->model->getTranslatableAttributes(), true)) && $this->model->shouldEncodeFake($value)) { |
|
40 | + if (!(property_exists($this->model, 'translatable') && in_array($value, $this->model->getTranslatableAttributes(), true)) && $this->model->shouldEncodeFake($value)) { |
|
41 | 41 | $requestInput[$value] = json_encode($requestInput[$value]); |
42 | 42 | } |
43 | 43 | } |
@@ -22,7 +22,6 @@ discard block |
||
22 | 22 | * Add a field to the create/update form or both. |
23 | 23 | * |
24 | 24 | * @param string|array $field The new field. |
25 | - * @param string $form The CRUD form. Can be 'create', 'update' or 'both'. Default is 'both'. |
|
26 | 25 | * |
27 | 26 | * @return self |
28 | 27 | */ |
@@ -70,7 +69,6 @@ discard block |
||
70 | 69 | * Add multiple fields to the create/update form or both. |
71 | 70 | * |
72 | 71 | * @param array $fields The new fields. |
73 | - * @param string $form The CRUD form. Can be 'create', 'update' or 'both'. Default is 'both'. |
|
74 | 72 | */ |
75 | 73 | public function addFields($fields) |
76 | 74 | { |
@@ -85,7 +83,6 @@ discard block |
||
85 | 83 | * Move the most recently added field after the given target field. |
86 | 84 | * |
87 | 85 | * @param string $targetFieldName The target field name. |
88 | - * @param string $form The CRUD form. Can be 'create', 'update' or 'both'. Default is 'both'. |
|
89 | 86 | */ |
90 | 87 | public function afterField($targetFieldName) |
91 | 88 | { |
@@ -98,7 +95,6 @@ discard block |
||
98 | 95 | * Move the most recently added field before the given target field. |
99 | 96 | * |
100 | 97 | * @param string $targetFieldName The target field name. |
101 | - * @param string $form The CRUD form. Can be 'create', 'update' or 'both'. Default is 'both'. |
|
102 | 98 | */ |
103 | 99 | public function beforeField($targetFieldName) |
104 | 100 | { |
@@ -141,7 +137,6 @@ discard block |
||
141 | 137 | * Remove a certain field from the create/update/both forms by its name. |
142 | 138 | * |
143 | 139 | * @param string $name Field name (as defined with the addField() procedure) |
144 | - * @param string $form update/create/both |
|
145 | 140 | */ |
146 | 141 | public function removeField($name) |
147 | 142 | { |
@@ -330,8 +325,6 @@ discard block |
||
330 | 325 | * Check if the create/update form has upload fields. |
331 | 326 | * Upload fields are the ones that have "upload" => true defined on them. |
332 | 327 | * |
333 | - * @param string $form create/update/both - defaults to 'both' |
|
334 | - * @param bool|int $id id of the entity - defaults to false |
|
335 | 328 | * |
336 | 329 | * @return bool |
337 | 330 | */ |
@@ -38,23 +38,23 @@ discard block |
||
38 | 38 | |
39 | 39 | // if this is a relation type field and no corresponding model was specified, get it from the relation method |
40 | 40 | // defined in the main model |
41 | - if (isset($newField['entity']) && ! isset($newField['model'])) { |
|
41 | + if (isset($newField['entity']) && !isset($newField['model'])) { |
|
42 | 42 | $newField['model'] = $this->getRelationModel($newField['entity']); |
43 | 43 | } |
44 | 44 | |
45 | 45 | // if the label is missing, we should set it |
46 | - if (! isset($newField['label'])) { |
|
46 | + if (!isset($newField['label'])) { |
|
47 | 47 | $newField['label'] = mb_ucfirst(str_replace('_', ' ', $newField['name'])); |
48 | 48 | } |
49 | 49 | |
50 | 50 | // if the field type is missing, we should set it |
51 | - if (! isset($newField['type'])) { |
|
51 | + if (!isset($newField['type'])) { |
|
52 | 52 | $newField['type'] = $this->getFieldTypeFromDbColumnType($newField['name']); |
53 | 53 | } |
54 | 54 | |
55 | 55 | // if a tab was mentioned, we should enable it |
56 | 56 | if (isset($newField['tab'])) { |
57 | - if (! $this->tabsEnabled()) { |
|
57 | + if (!$this->tabsEnabled()) { |
|
58 | 58 | $this->enableTabs(); |
59 | 59 | } |
60 | 60 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | */ |
90 | 90 | public function afterField($targetFieldName) |
91 | 91 | { |
92 | - $this->transformFields(function ($fields) use ($targetFieldName) { |
|
92 | + $this->transformFields(function($fields) use ($targetFieldName) { |
|
93 | 93 | return $this->moveField($fields, $targetFieldName, false); |
94 | 94 | }); |
95 | 95 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | */ |
103 | 103 | public function beforeField($targetFieldName) |
104 | 104 | { |
105 | - $this->transformFields(function ($fields) use ($targetFieldName) { |
|
105 | + $this->transformFields(function($fields) use ($targetFieldName) { |
|
106 | 106 | return $this->moveField($fields, $targetFieldName, true); |
107 | 107 | }); |
108 | 108 | } |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | */ |
146 | 146 | public function removeField($name) |
147 | 147 | { |
148 | - $this->transformFields(function ($fields) use ($name) { |
|
148 | + $this->transformFields(function($fields) use ($name) { |
|
149 | 149 | array_forget($fields, $name); |
150 | 150 | |
151 | 151 | return $fields; |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | */ |
160 | 160 | public function removeFields($array_of_names) |
161 | 161 | { |
162 | - if (! empty($array_of_names)) { |
|
162 | + if (!empty($array_of_names)) { |
|
163 | 163 | foreach ($array_of_names as $name) { |
164 | 164 | $this->removeField($name); |
165 | 165 | } |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | public function removeAllFields() |
173 | 173 | { |
174 | 174 | $current_fields = $this->getCurrentFields(); |
175 | - if (! empty($current_fields)) { |
|
175 | + if (!empty($current_fields)) { |
|
176 | 176 | foreach ($current_fields as $field) { |
177 | 177 | $this->removeField($field['name']); |
178 | 178 | } |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | $jsonCastables = ['array', 'object', 'json']; |
247 | 247 | $fieldCasting = $casted_attributes[$field['name']]; |
248 | 248 | |
249 | - if (in_array($fieldCasting, $jsonCastables) && isset($data[$field['name']]) && ! empty($data[$field['name']]) && ! is_array($data[$field['name']])) { |
|
249 | + if (in_array($fieldCasting, $jsonCastables) && isset($data[$field['name']]) && !empty($data[$field['name']]) && !is_array($data[$field['name']])) { |
|
250 | 250 | try { |
251 | 251 | $data[$field['name']] = json_decode($data[$field['name']]); |
252 | 252 | } catch (\Exception $e) { |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | */ |
276 | 276 | public function orderFields($order) |
277 | 277 | { |
278 | - $this->transformFields(function ($fields) use ($order) { |
|
278 | + $this->transformFields(function($fields) use ($order) { |
|
279 | 279 | return $this->applyOrderToFields($fields, $order); |
280 | 280 | }); |
281 | 281 | } |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | public function hasUploadFields() |
339 | 339 | { |
340 | 340 | $fields = $this->getFields(); |
341 | - $upload_fields = array_where($fields, function ($value, $key) { |
|
341 | + $upload_fields = array_where($fields, function($value, $key) { |
|
342 | 342 | return isset($value['upload']) && $value['upload'] == true; |
343 | 343 | }); |
344 | 344 |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | /** |
57 | 57 | * Convenience method to make sure all calls are made to a particular operation. |
58 | 58 | * |
59 | - * @param string|array $operation Operation name in string form |
|
59 | + * @param string|array $operations Operation name in string form |
|
60 | 60 | * @param bool|\Closure $closure Code that calls CrudPanel methods. |
61 | 61 | * @return void |
62 | 62 | */ |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | * Allc configurations are put inside that operation's namespace. |
71 | 71 | * Ex: show.configuration. |
72 | 72 | * |
73 | - * @param string|array $operation Operation name in string form |
|
73 | + * @param string|array $operations Operation name in string form |
|
74 | 74 | * @param bool|\Closure $closure Code that calls CrudPanel methods. |
75 | 75 | * @return void |
76 | 76 | */ |
@@ -62,7 +62,7 @@ |
||
62 | 62 | * Order results of the query in a custom way. |
63 | 63 | * |
64 | 64 | * @param array $column Column array with all attributes |
65 | - * @param string $column_direction ASC or DESC |
|
65 | + * @param string $columnDirection ASC or DESC |
|
66 | 66 | * |
67 | 67 | * @return \Illuminate\Database\Eloquent\Builder |
68 | 68 | */ |
@@ -68,7 +68,7 @@ |
||
68 | 68 | */ |
69 | 69 | public function customOrderBy($column, $columnDirection = 'asc') |
70 | 70 | { |
71 | - if (! isset($column['orderLogic'])) { |
|
71 | + if (!isset($column['orderLogic'])) { |
|
72 | 72 | return $this->query; |
73 | 73 | } |
74 | 74 |
@@ -35,6 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | /** |
37 | 37 | * Apply the search logic for each CRUD column. |
38 | + * @param string $searchTerm |
|
38 | 39 | */ |
39 | 40 | public function applySearchLogicForColumn($query, $column, $searchTerm) |
40 | 41 | { |
@@ -230,7 +231,7 @@ discard block |
||
230 | 231 | * |
231 | 232 | * @param string $view |
232 | 233 | * @param array $column |
233 | - * @param object $entry |
|
234 | + * @param \Illuminate\Database\Eloquent\Model $entry |
|
234 | 235 | * @param bool|int $rowNumber The number shown to the user as row number (index) |
235 | 236 | * |
236 | 237 | * @return string |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace Backpack\CRUD\app\Library\CrudPanel\Traits; |
4 | 4 | |
5 | -use Validator; |
|
6 | 5 | use Carbon\Carbon; |
6 | +use Validator; |
|
7 | 7 | |
8 | 8 | trait Search |
9 | 9 | { |
@@ -210,10 +210,10 @@ |
||
210 | 210 | // add the details_row button to the first column |
211 | 211 | if ($this->getOperationSetting('detailsRow')) { |
212 | 212 | $details_row_button = \View::make('crud::columns.details_row_button') |
213 | - ->with('crud', $this) |
|
214 | - ->with('entry', $entry) |
|
215 | - ->with('row_number', $rowNumber) |
|
216 | - ->render(); |
|
213 | + ->with('crud', $this) |
|
214 | + ->with('entry', $entry) |
|
215 | + ->with('row_number', $rowNumber) |
|
216 | + ->render(); |
|
217 | 217 | $row_items[0] = $details_row_button.$row_items[0]; |
218 | 218 | } |
219 | 219 |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function applySearchTerm($searchTerm) |
24 | 24 | { |
25 | - return $this->query->where(function ($query) use ($searchTerm) { |
|
25 | + return $this->query->where(function($query) use ($searchTerm) { |
|
26 | 26 | foreach ($this->columns() as $column) { |
27 | - if (! isset($column['type'])) { |
|
27 | + if (!isset($column['type'])) { |
|
28 | 28 | abort(400, 'Missing column type when trying to apply search term.'); |
29 | 29 | } |
30 | 30 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | |
83 | 83 | case 'select': |
84 | 84 | case 'select_multiple': |
85 | - $query->orWhereHas($column['entity'], function ($q) use ($column, $searchTerm) { |
|
85 | + $query->orWhereHas($column['entity'], function($q) use ($column, $searchTerm) { |
|
86 | 86 | $q->where($column['attribute'], 'like', '%'.$searchTerm.'%'); |
87 | 87 | }); |
88 | 88 | break; |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | */ |
275 | 275 | private function renderCellView($view, $column, $entry, $rowNumber = false) |
276 | 276 | { |
277 | - if (! view()->exists($view)) { |
|
277 | + if (!view()->exists($view)) { |
|
278 | 278 | $view = 'crud::columns.text'; // fallback to text column |
279 | 279 | } |
280 | 280 |
@@ -102,7 +102,7 @@ |
||
102 | 102 | * Defaults to the current operation. |
103 | 103 | * |
104 | 104 | * @param string $key Has no operation prepended. (ex: exportButtons) |
105 | - * @return mixed [description] |
|
105 | + * @return boolean [description] |
|
106 | 106 | */ |
107 | 107 | public function hasOperationSetting(string $key, $operation = null) |
108 | 108 | { |
@@ -49,7 +49,7 @@ |
||
49 | 49 | */ |
50 | 50 | public function settings() |
51 | 51 | { |
52 | - return \Arr::sort($this->settings, function ($value, $key) { |
|
52 | + return \Arr::sort($this->settings, function($value, $key) { |
|
53 | 53 | return $key; |
54 | 54 | }); |
55 | 55 | } |
@@ -35,6 +35,9 @@ |
||
35 | 35 | return ! $this->tabsEnabled(); |
36 | 36 | } |
37 | 37 | |
38 | + /** |
|
39 | + * @param string $type |
|
40 | + */ |
|
38 | 41 | public function setTabsType($type) |
39 | 42 | { |
40 | 43 | $this->enableTabs(); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | */ |
33 | 33 | public function tabsDisabled() |
34 | 34 | { |
35 | - return ! $this->tabsEnabled(); |
|
35 | + return !$this->tabsEnabled(); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | public function setTabsType($type) |
@@ -114,8 +114,8 @@ discard block |
||
114 | 114 | { |
115 | 115 | $all_fields = $this->getCurrentFields(); |
116 | 116 | |
117 | - $fields_without_a_tab = collect($all_fields)->filter(function ($value, $key) { |
|
118 | - return ! isset($value['tab']); |
|
117 | + $fields_without_a_tab = collect($all_fields)->filter(function($value, $key) { |
|
118 | + return !isset($value['tab']); |
|
119 | 119 | }); |
120 | 120 | |
121 | 121 | return $fields_without_a_tab; |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | if ($this->tabExists($label)) { |
132 | 132 | $all_fields = $this->getCurrentFields(); |
133 | 133 | |
134 | - $fields_for_current_tab = collect($all_fields)->filter(function ($value, $key) use ($label) { |
|
134 | + $fields_for_current_tab = collect($all_fields)->filter(function($value, $key) use ($label) { |
|
135 | 135 | return isset($value['tab']) && $value['tab'] == $label; |
136 | 136 | }); |
137 | 137 | |
@@ -150,11 +150,11 @@ discard block |
||
150 | 150 | $fields = $this->getCurrentFields(); |
151 | 151 | |
152 | 152 | $fields_with_tabs = collect($fields) |
153 | - ->filter(function ($value, $key) { |
|
153 | + ->filter(function($value, $key) { |
|
154 | 154 | return isset($value['tab']); |
155 | 155 | }) |
156 | - ->each(function ($value, $key) use (&$tabs) { |
|
157 | - if (! in_array($value['tab'], $tabs)) { |
|
156 | + ->each(function($value, $key) use (&$tabs) { |
|
157 | + if (!in_array($value['tab'], $tabs)) { |
|
158 | 158 | $tabs[] = $value['tab']; |
159 | 159 | } |
160 | 160 | }); |
@@ -88,7 +88,6 @@ |
||
88 | 88 | * for the given operation. |
89 | 89 | * |
90 | 90 | * @param string $inputKey Field or input name. |
91 | - * @param string $operation create / update |
|
92 | 91 | * |
93 | 92 | * @return bool |
94 | 93 | */ |
@@ -94,7 +94,7 @@ |
||
94 | 94 | */ |
95 | 95 | public function isRequired($inputKey) |
96 | 96 | { |
97 | - if (! $this->hasOperationSetting('requiredFields')) { |
|
97 | + if (!$this->hasOperationSetting('requiredFields')) { |
|
98 | 98 | return false; |
99 | 99 | } |
100 | 100 |
@@ -69,7 +69,7 @@ |
||
69 | 69 | * |
70 | 70 | * @param array $columns - the database columns that contain the JSONs |
71 | 71 | * |
72 | - * @return Model |
|
72 | + * @return CrudTrait |
|
73 | 73 | */ |
74 | 74 | public function withFakes($columns = []) |
75 | 75 | { |
@@ -3,9 +3,9 @@ |
||
3 | 3 | namespace Backpack\CRUD\app\Models\Traits; |
4 | 4 | |
5 | 5 | use DB; |
6 | -use Traversable; |
|
7 | -use Illuminate\Support\Facades\Config; |
|
8 | 6 | use Illuminate\Database\Eloquent\Model; |
7 | +use Illuminate\Support\Facades\Config; |
|
8 | +use Traversable; |
|
9 | 9 | |
10 | 10 | trait CrudTrait |
11 | 11 | { |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $conn->getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('json', 'json_array'); |
70 | 70 | $conn->getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('jsonb', 'json_array'); |
71 | 71 | |
72 | - return ! $conn->getDoctrineColumn($table, $column_name)->getNotnull(); |
|
72 | + return !$conn->getDoctrineColumn($table, $column_name)->getNotnull(); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | /* |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | public function addFakes($columns = ['extras']) |
87 | 87 | { |
88 | 88 | foreach ($columns as $key => $column) { |
89 | - if (! isset($this->attributes[$column])) { |
|
89 | + if (!isset($this->attributes[$column])) { |
|
90 | 90 | continue; |
91 | 91 | } |
92 | 92 | |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | */ |
135 | 135 | public function shouldDecodeFake($column) |
136 | 136 | { |
137 | - return ! in_array($column, array_keys($this->casts)); |
|
137 | + return !in_array($column, array_keys($this->casts)); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | /** |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | */ |
146 | 146 | public function shouldEncodeFake($column) |
147 | 147 | { |
148 | - return ! in_array($column, array_keys($this->casts)); |
|
148 | + return !in_array($column, array_keys($this->casts)); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | /* |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | public function uploadMultipleFilesToDisk($value, $attribute_name, $disk, $destination_path) |
220 | 220 | { |
221 | 221 | $request = \Request::instance(); |
222 | - if (! is_array($this->{$attribute_name})) { |
|
222 | + if (!is_array($this->{$attribute_name})) { |
|
223 | 223 | $attribute_value = json_decode($this->{$attribute_name}, true) ?? []; |
224 | 224 | } else { |
225 | 225 | $attribute_value = $this->{$attribute_name}; |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | if ($files_to_clear) { |
232 | 232 | foreach ($files_to_clear as $key => $filename) { |
233 | 233 | \Storage::disk($disk)->delete($filename); |
234 | - $attribute_value = array_where($attribute_value, function ($value, $key) use ($filename) { |
|
234 | + $attribute_value = array_where($attribute_value, function($value, $key) use ($filename) { |
|
235 | 235 | return $value != $filename; |
236 | 236 | }); |
237 | 237 | } |