We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -42,7 +42,7 @@ |
||
42 | 42 | */ |
43 | 43 | public function isRequired($inputName, $operation) |
44 | 44 | { |
45 | - if (! isset($this->requiredFields[$operation])) { |
|
45 | + if (!isset($this->requiredFields[$operation])) { |
|
46 | 46 | return false; |
47 | 47 | } |
48 | 48 |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | public function addColumn($column) |
67 | 67 | { |
68 | 68 | // if a string was passed, not an array, change it to an array |
69 | - if (! is_array($column)) { |
|
69 | + if (!is_array($column)) { |
|
70 | 70 | $column = ['name' => $column]; |
71 | 71 | } |
72 | 72 | |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $column_with_details = $this->addDefaultLabel($column); |
75 | 75 | |
76 | 76 | // make sure the column has a name |
77 | - if (! array_key_exists('name', $column_with_details)) { |
|
77 | + if (!array_key_exists('name', $column_with_details)) { |
|
78 | 78 | $column_with_details['name'] = 'anonymous_column_'.str_random(5); |
79 | 79 | } |
80 | 80 | |
@@ -82,27 +82,27 @@ discard block |
||
82 | 82 | $columnExistsInDb = $this->hasColumn($this->model->getTable(), $column_with_details['name']); |
83 | 83 | |
84 | 84 | // make sure the column has a type |
85 | - if (! array_key_exists('type', $column_with_details)) { |
|
85 | + if (!array_key_exists('type', $column_with_details)) { |
|
86 | 86 | $column_with_details['type'] = 'text'; |
87 | 87 | } |
88 | 88 | |
89 | 89 | // make sure the column has a key |
90 | - if (! array_key_exists('key', $column_with_details)) { |
|
90 | + if (!array_key_exists('key', $column_with_details)) { |
|
91 | 91 | $column_with_details['key'] = $column_with_details['name']; |
92 | 92 | } |
93 | 93 | |
94 | 94 | // make sure the column has a tableColumn boolean |
95 | - if (! array_key_exists('tableColumn', $column_with_details)) { |
|
95 | + if (!array_key_exists('tableColumn', $column_with_details)) { |
|
96 | 96 | $column_with_details['tableColumn'] = $columnExistsInDb ? true : false; |
97 | 97 | } |
98 | 98 | |
99 | 99 | // make sure the column has a orderable boolean |
100 | - if (! array_key_exists('orderable', $column_with_details)) { |
|
100 | + if (!array_key_exists('orderable', $column_with_details)) { |
|
101 | 101 | $column_with_details['orderable'] = $columnExistsInDb ? true : false; |
102 | 102 | } |
103 | 103 | |
104 | 104 | // make sure the column has a searchLogic |
105 | - if (! array_key_exists('searchLogic', $column_with_details)) { |
|
105 | + if (!array_key_exists('searchLogic', $column_with_details)) { |
|
106 | 106 | $column_with_details['searchLogic'] = $columnExistsInDb ? true : false; |
107 | 107 | } |
108 | 108 | |
@@ -110,14 +110,14 @@ discard block |
||
110 | 110 | |
111 | 111 | // make sure the column has a priority in terms of visibility |
112 | 112 | // if no priority has been defined, use the order in the array plus one |
113 | - if (! array_key_exists('priority', $column_with_details)) { |
|
113 | + if (!array_key_exists('priority', $column_with_details)) { |
|
114 | 114 | $position_in_columns_array = (int) array_search($column_with_details['key'], array_keys($this->columns)); |
115 | 115 | $this->columns[$column_with_details['key']]['priority'] = $position_in_columns_array + 1; |
116 | 116 | } |
117 | 117 | |
118 | 118 | // if this is a relation type field and no corresponding model was specified, get it from the relation method |
119 | 119 | // defined in the main model |
120 | - if (isset($column_with_details['entity']) && ! isset($column_with_details['model'])) { |
|
120 | + if (isset($column_with_details['entity']) && !isset($column_with_details['model'])) { |
|
121 | 121 | $column_with_details['model'] = $this->getRelationModel($column_with_details['entity']); |
122 | 122 | } |
123 | 123 | |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | */ |
164 | 164 | public function makeFirstColumn() |
165 | 165 | { |
166 | - if (! $this->columns) { |
|
166 | + if (!$this->columns) { |
|
167 | 167 | return false; |
168 | 168 | } |
169 | 169 | |
@@ -184,8 +184,7 @@ discard block |
||
184 | 184 | $targetColumnName = is_array($targetColumn) ? $targetColumn['name'] : $targetColumn; |
185 | 185 | |
186 | 186 | if (array_key_exists($targetColumnName, $this->columns)) { |
187 | - $targetColumnPosition = $before ? array_search($targetColumnName, array_keys($this->columns)) : |
|
188 | - array_search($targetColumnName, array_keys($this->columns)) + 1; |
|
187 | + $targetColumnPosition = $before ? array_search($targetColumnName, array_keys($this->columns)) : array_search($targetColumnName, array_keys($this->columns)) + 1; |
|
189 | 188 | |
190 | 189 | $element = array_pop($this->columns); |
191 | 190 | $beginningPart = array_slice($this->columns, 0, $targetColumnPosition, true); |
@@ -219,7 +218,7 @@ discard block |
||
219 | 218 | */ |
220 | 219 | public function addDefaultLabel($array) |
221 | 220 | { |
222 | - if (! array_key_exists('label', (array) $array) && array_key_exists('name', (array) $array)) { |
|
221 | + if (!array_key_exists('label', (array) $array) && array_key_exists('name', (array) $array)) { |
|
223 | 222 | $array = array_merge(['label' => ucfirst($this->makeLabel($array['name']))], $array); |
224 | 223 | |
225 | 224 | return $array; |
@@ -245,7 +244,7 @@ discard block |
||
245 | 244 | */ |
246 | 245 | public function removeColumns($columns) |
247 | 246 | { |
248 | - if (! empty($columns)) { |
|
247 | + if (!empty($columns)) { |
|
249 | 248 | foreach ($columns as $columnName) { |
250 | 249 | $this->removeColumn($columnName); |
251 | 250 | } |
@@ -266,8 +265,8 @@ discard block |
||
266 | 265 | */ |
267 | 266 | public function remove($entity, $fields) |
268 | 267 | { |
269 | - return array_values(array_filter($this->{$entity}, function ($field) use ($fields) { |
|
270 | - return ! in_array($field['name'], (array) $fields); |
|
268 | + return array_values(array_filter($this->{$entity}, function($field) use ($fields) { |
|
269 | + return !in_array($field['name'], (array) $fields); |
|
271 | 270 | })); |
272 | 271 | } |
273 | 272 | |
@@ -312,7 +311,7 @@ discard block |
||
312 | 311 | { |
313 | 312 | $columns = $this->getColumns(); |
314 | 313 | |
315 | - return collect($columns)->pluck('entity')->reject(function ($value, $key) { |
|
314 | + return collect($columns)->pluck('entity')->reject(function($value, $key) { |
|
316 | 315 | return $value == null; |
317 | 316 | })->toArray(); |
318 | 317 | } |
@@ -141,7 +141,7 @@ |
||
141 | 141 | /** |
142 | 142 | * Move the most recently added column after the given target column. |
143 | 143 | * |
144 | - * @param string|array $targetColumn The target column name or array. |
|
144 | + * @param string $targetColumn The target column name or array. |
|
145 | 145 | */ |
146 | 146 | public function afterColumn($targetColumn) |
147 | 147 | { |
@@ -174,7 +174,7 @@ |
||
174 | 174 | { |
175 | 175 | $this->crud->hasAccessOrFail('reorder'); |
176 | 176 | |
177 | - if (! $this->crud->isReorderEnabled()) { |
|
177 | + if (!$this->crud->isReorderEnabled()) { |
|
178 | 178 | abort(403, 'Reorder is disabled.'); |
179 | 179 | } |
180 | 180 |
@@ -41,7 +41,7 @@ |
||
41 | 41 | $this->crud->hasAccessOrFail('revisions'); |
42 | 42 | |
43 | 43 | $revisionId = \Request::input('revision_id', false); |
44 | - if (! $revisionId) { |
|
44 | + if (!$revisionId) { |
|
45 | 45 | abort(500, 'Can\'t restore revision without revision_id'); |
46 | 46 | } else { |
47 | 47 | $this->crud->restoreRevision($id, $revisionId); // do the update |
@@ -22,11 +22,11 @@ discard block |
||
22 | 22 | |
23 | 23 | $saveOptions = collect($permissions) |
24 | 24 | // Restrict list to allowed actions. |
25 | - ->filter(function ($action, $permission) { |
|
25 | + ->filter(function($action, $permission) { |
|
26 | 26 | return $this->crud->hasAccess($permission); |
27 | 27 | }) |
28 | 28 | // Generate list of possible actions. |
29 | - ->mapWithKeys(function ($action, $permission) { |
|
29 | + ->mapWithKeys(function($action, $permission) { |
|
30 | 30 | return [$action => $this->getSaveActionButtonName($action)]; |
31 | 31 | }) |
32 | 32 | ->all(); |
@@ -61,8 +61,7 @@ discard block |
||
61 | 61 | */ |
62 | 62 | public function setSaveAction($forceSaveAction = null) |
63 | 63 | { |
64 | - $saveAction = $forceSaveAction ?: |
|
65 | - \Request::input('save_action', config('backpack.crud.default_save_action', 'save_and_back')); |
|
64 | + $saveAction = $forceSaveAction ?: \Request::input('save_action', config('backpack.crud.default_save_action', 'save_and_back')); |
|
66 | 65 | |
67 | 66 | if (config('backpack.crud.show_save_action_change', true) && |
68 | 67 | session('save_action', 'save_and_back') !== $saveAction) { |
@@ -59,6 +59,9 @@ discard block |
||
59 | 59 | $this->addButton($stack, $name, 'model_function', $model_function_name, $position); |
60 | 60 | } |
61 | 61 | |
62 | + /** |
|
63 | + * @param string $view |
|
64 | + */ |
|
62 | 65 | public function addButtonFromView($stack, $name, $view, $position = false) |
63 | 66 | { |
64 | 67 | if (! view()->exists($view)) { |
@@ -130,6 +133,9 @@ discard block |
||
130 | 133 | $this->buttons = collect([]); |
131 | 134 | } |
132 | 135 | |
136 | + /** |
|
137 | + * @param string $stack |
|
138 | + */ |
|
133 | 139 | public function removeAllButtonsFromStack($stack) |
134 | 140 | { |
135 | 141 | $this->buttons = $this->buttons->reject(function ($button) use ($stack) { |
@@ -152,6 +158,12 @@ discard block |
||
152 | 158 | public $type = 'view'; |
153 | 159 | public $content; |
154 | 160 | |
161 | + /** |
|
162 | + * @param string $stack |
|
163 | + * @param string $name |
|
164 | + * @param string $type |
|
165 | + * @param string $content |
|
166 | + */ |
|
155 | 167 | public function __construct($stack, $name, $type, $content) |
156 | 168 | { |
157 | 169 | $this->stack = $stack; |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | public function addButtonFromView($stack, $name, $view, $position = false) |
63 | 63 | { |
64 | - if (! view()->exists($view)) { |
|
64 | + if (!view()->exists($view)) { |
|
65 | 65 | $view = 'crud::buttons.'.$view; |
66 | 66 | } |
67 | 67 | |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | { |
100 | 100 | $button = $this->buttons()->firstWhere('name', $name); |
101 | 101 | |
102 | - if (! $button) { |
|
102 | + if (!$button) { |
|
103 | 103 | abort(500, 'CRUD Button "'.$name.'" not found. Please check the button exists before you modify it.'); |
104 | 104 | } |
105 | 105 | |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | */ |
121 | 121 | public function removeButton($name, $stack = null) |
122 | 122 | { |
123 | - $this->buttons = $this->buttons->reject(function ($button) use ($name, $stack) { |
|
123 | + $this->buttons = $this->buttons->reject(function($button) use ($name, $stack) { |
|
124 | 124 | return $stack == null ? $button->name == $name : ($button->stack == $stack) && ($button->name == $name); |
125 | 125 | }); |
126 | 126 | } |
@@ -132,14 +132,14 @@ discard block |
||
132 | 132 | |
133 | 133 | public function removeAllButtonsFromStack($stack) |
134 | 134 | { |
135 | - $this->buttons = $this->buttons->reject(function ($button) use ($stack) { |
|
135 | + $this->buttons = $this->buttons->reject(function($button) use ($stack) { |
|
136 | 136 | return $button->stack == $stack; |
137 | 137 | }); |
138 | 138 | } |
139 | 139 | |
140 | 140 | public function removeButtonFromStack($name, $stack) |
141 | 141 | { |
142 | - $this->buttons = $this->buttons->reject(function ($button) use ($name, $stack) { |
|
142 | + $this->buttons = $this->buttons->reject(function($button) use ($name, $stack) { |
|
143 | 143 | return $button->name == $name && $button->stack == $stack; |
144 | 144 | }); |
145 | 145 | } |