We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | <!-- elFinder JS (REQUIRED) --> |
| 18 | 18 | <script src="<?= asset($dir.'/js/elfinder.min.js') ?>"></script> |
| 19 | 19 | |
| 20 | - <?php if($locale){ ?> |
|
| 20 | + <?php if ($locale) { ?> |
|
| 21 | 21 | <!-- elFinder translation (OPTIONAL) --> |
| 22 | 22 | <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script> |
| 23 | 23 | <?php } ?> |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | $().ready(function() { |
| 41 | 41 | var elf = $('#elfinder').elfinder({ |
| 42 | 42 | // set your elFinder options here |
| 43 | - <?php if($locale){ ?> |
|
| 43 | + <?php if ($locale) { ?> |
|
| 44 | 44 | lang: '<?= $locale ?>', // locale |
| 45 | 45 | <?php } ?> |
| 46 | 46 | customData: { |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | <!-- elFinder JS (REQUIRED) --> |
| 18 | 18 | <script src="<?= asset($dir.'/js/elfinder.min.js') ?>"></script> |
| 19 | 19 | |
| 20 | - <?php if($locale){ ?> |
|
| 20 | + <?php if ($locale) { ?> |
|
| 21 | 21 | <!-- elFinder translation (OPTIONAL) --> |
| 22 | 22 | <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script> |
| 23 | 23 | <?php } ?> |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | $().ready(function() { |
| 41 | 41 | var elf = $('#elfinder').elfinder({ |
| 42 | 42 | // set your elFinder options here |
| 43 | - <?php if($locale){ ?> |
|
| 43 | + <?php if ($locale) { ?> |
|
| 44 | 44 | lang: '<?= $locale ?>', // locale |
| 45 | 45 | <?php } ?> |
| 46 | 46 | customData: { |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | <!-- elFinder JS (REQUIRED) --> |
| 18 | 18 | <script src="<?= asset($dir.'/js/elfinder.min.js') ?>"></script> |
| 19 | 19 | |
| 20 | - <?php if($locale){ ?> |
|
| 20 | + <?php if ($locale) { ?> |
|
| 21 | 21 | <!-- elFinder translation (OPTIONAL) --> |
| 22 | 22 | <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script> |
| 23 | 23 | <?php } ?> |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | $().ready(function() { |
| 41 | 41 | var elf = $('#elfinder').elfinder({ |
| 42 | 42 | // set your elFinder options here |
| 43 | - <?php if($locale){ ?> |
|
| 43 | + <?php if ($locale) { ?> |
|
| 44 | 44 | lang: '<?= $locale ?>', // locale |
| 45 | 45 | <?php } ?> |
| 46 | 46 | customData: { |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | <!-- elFinder JS (REQUIRED) --> |
| 18 | 18 | <script src="<?= asset($dir.'/js/elfinder.min.js') ?>"></script> |
| 19 | 19 | |
| 20 | - <?php if($locale){ ?> |
|
| 20 | + <?php if ($locale) { ?> |
|
| 21 | 21 | <!-- elFinder translation (OPTIONAL) --> |
| 22 | 22 | <script src="<?= asset($dir."/js/i18n/elfinder.$locale.js") ?>"></script> |
| 23 | 23 | <?php } ?> |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | $().ready(function() { |
| 41 | 41 | var elf = $('#elfinder').elfinder({ |
| 42 | 42 | // set your elFinder options here |
| 43 | - <?php if($locale){ ?> |
|
| 43 | + <?php if ($locale) { ?> |
|
| 44 | 44 | lang: '<?= $locale ?>', // locale |
| 45 | 45 | <?php } ?> |
| 46 | 46 | customData: { |
@@ -12,14 +12,14 @@ |
||
| 12 | 12 | |-------------------------------------------------------------------------- |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | - public static function getPossibleEnumValues($field_name){ |
|
| 15 | + public static function getPossibleEnumValues($field_name) { |
|
| 16 | 16 | $instance = new static; // create an instance of the model to be able to get the table name |
| 17 | - $type = DB::select( DB::raw('SHOW COLUMNS FROM '.$instance->getTable().' WHERE Field = "'.$field_name.'"') )[0]->Type; |
|
| 17 | + $type = DB::select(DB::raw('SHOW COLUMNS FROM '.$instance->getTable().' WHERE Field = "'.$field_name.'"'))[0]->Type; |
|
| 18 | 18 | preg_match('/^enum\((.*)\)$/', $type, $matches); |
| 19 | 19 | $enum = array(); |
| 20 | 20 | $exploded = explode(',', $matches[1]); |
| 21 | - foreach($exploded as $value){ |
|
| 22 | - $v = trim( $value, "'" ); |
|
| 21 | + foreach ($exploded as $value) { |
|
| 22 | + $v = trim($value, "'"); |
|
| 23 | 23 | $enum[] = $v; |
| 24 | 24 | } |
| 25 | 25 | return $enum; |
@@ -161,7 +161,7 @@ |
||
| 161 | 161 | * Remove the specified resource from storage. |
| 162 | 162 | * |
| 163 | 163 | * @param int $id |
| 164 | - * @return string |
|
| 164 | + * @return \Illuminate\Http\Response |
|
| 165 | 165 | */ |
| 166 | 166 | public function destroy($id) |
| 167 | 167 | { |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * Store a newly created resource in storage. |
| 55 | 55 | * |
| 56 | 56 | * @param \Illuminate\Http\Request $request |
| 57 | - * @return \Illuminate\Http\Response |
|
| 57 | + * @return \Illuminate\Http\RedirectResponse |
|
| 58 | 58 | */ |
| 59 | 59 | public function crudStore(Request $request = null) |
| 60 | 60 | { |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | * |
| 102 | 102 | * @param \Illuminate\Http\Request $request |
| 103 | 103 | * @param int $id |
| 104 | - * @return \Illuminate\Http\Response |
|
| 104 | + * @return \Illuminate\Http\RedirectResponse |
|
| 105 | 105 | */ |
| 106 | 106 | public function crudUpdate($parentId, $id, Request $request = null) |
| 107 | 107 | { |
@@ -286,6 +286,7 @@ discard block |
||
| 286 | 286 | * Delete a row from the database. |
| 287 | 287 | * |
| 288 | 288 | * @param [int] The id of the item to be deleted. |
| 289 | + * @param integer $id |
|
| 289 | 290 | * @return [bool] Deletion confirmation. |
| 290 | 291 | * |
| 291 | 292 | * TODO: should this delete items with relations to it too? |
@@ -404,7 +405,8 @@ discard block |
||
| 404 | 405 | * Check if a permission is enabled for a Crud Panel. Fail if not. |
| 405 | 406 | * |
| 406 | 407 | * @param [string] Permission. |
| 407 | - * @return boolean |
|
| 408 | + * @param string $permission |
|
| 409 | + * @return boolean|null |
|
| 408 | 410 | */ |
| 409 | 411 | public function hasAccessOrFail($permission) |
| 410 | 412 | { |
@@ -433,6 +435,7 @@ discard block |
||
| 433 | 435 | * All Create-Read-Update-Delete operations are done using that Eloquent Collection. |
| 434 | 436 | * |
| 435 | 437 | * @param [string] Full model namespace. Ex: App\Models\Article |
| 438 | + * @param string $model_namespace |
|
| 436 | 439 | */ |
| 437 | 440 | public function setModel($model_namespace) |
| 438 | 441 | { |
@@ -460,6 +463,7 @@ discard block |
||
| 460 | 463 | * |
| 461 | 464 | * @param [string] Route name. |
| 462 | 465 | * @param [array] Parameters. |
| 466 | + * @param string $route |
|
| 463 | 467 | */ |
| 464 | 468 | public function setRoute($route) |
| 465 | 469 | { |
@@ -492,7 +496,7 @@ discard block |
||
| 492 | 496 | * - $this->crud->setRouteName('admin.article') |
| 493 | 497 | * - $this->crud->route = "admin/article" |
| 494 | 498 | * |
| 495 | - * @return [string] |
|
| 499 | + * @return string |
|
| 496 | 500 | */ |
| 497 | 501 | public function getRoute() |
| 498 | 502 | { |
@@ -505,6 +509,8 @@ discard block |
||
| 505 | 509 | * |
| 506 | 510 | * @param [string] Entity name, in singular. Ex: article |
| 507 | 511 | * @param [string] Entity name, in plural. Ex: articles |
| 512 | + * @param string $singular |
|
| 513 | + * @param string $plural |
|
| 508 | 514 | */ |
| 509 | 515 | public function setEntityNameStrings($singular, $plural) { |
| 510 | 516 | $this->entity_name = $singular; |
@@ -1237,6 +1243,9 @@ discard block |
||
| 1237 | 1243 | return array_filter($this->{$entity}[] = $this->syncField($field)); |
| 1238 | 1244 | } |
| 1239 | 1245 | |
| 1246 | + /** |
|
| 1247 | + * @param string $entity |
|
| 1248 | + */ |
|
| 1240 | 1249 | public function addMultiple($entity, $field) |
| 1241 | 1250 | { |
| 1242 | 1251 | $this->{$entity} = array_filter(array_map([$this, 'syncField'], $fields)); |
@@ -1256,16 +1265,25 @@ discard block |
||
| 1256 | 1265 | |
| 1257 | 1266 | |
| 1258 | 1267 | |
| 1268 | + /** |
|
| 1269 | + * @param string $entity |
|
| 1270 | + */ |
|
| 1259 | 1271 | public function remove($entity, $fields) |
| 1260 | 1272 | { |
| 1261 | 1273 | return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array)$fields);})); |
| 1262 | 1274 | } |
| 1263 | 1275 | |
| 1276 | + /** |
|
| 1277 | + * @param string $items |
|
| 1278 | + */ |
|
| 1264 | 1279 | public function setSort($items, $order) |
| 1265 | 1280 | { |
| 1266 | 1281 | $this->sort[$items] = $order; |
| 1267 | 1282 | } |
| 1268 | 1283 | |
| 1284 | + /** |
|
| 1285 | + * @param string $items |
|
| 1286 | + */ |
|
| 1269 | 1287 | public function sort($items) |
| 1270 | 1288 | { |
| 1271 | 1289 | if (array_key_exists($items, $this->sort)) |
@@ -1301,6 +1319,10 @@ discard block |
||
| 1301 | 1319 | } |
| 1302 | 1320 | |
| 1303 | 1321 | // face un fel de merge intre ce ii dai si ce e in CRUD |
| 1322 | + |
|
| 1323 | + /** |
|
| 1324 | + * @param string $entity |
|
| 1325 | + */ |
|
| 1304 | 1326 | public function syncRelations($entity) |
| 1305 | 1327 | { |
| 1306 | 1328 | foreach ($this->relations as $field => $relation) { |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | */ |
| 81 | 81 | public function getCreateFields() |
| 82 | 82 | { |
| 83 | - return $this->prepareFields(empty($this->create_fields)?$this->fields:$this->create_fields); |
|
| 83 | + return $this->prepareFields(empty($this->create_fields) ? $this->fields : $this->create_fields); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | |
@@ -90,11 +90,11 @@ discard block |
||
| 90 | 90 | { |
| 91 | 91 | foreach ($this->relations as $key => $relation) |
| 92 | 92 | { |
| 93 | - if ($relation['pivot']){ |
|
| 93 | + if ($relation['pivot']) { |
|
| 94 | 94 | $model->{$relation['name']}()->sync($data[$key]); |
| 95 | 95 | |
| 96 | - foreach($relation['pivotFields'] as $pivotField){ |
|
| 97 | - foreach($data[$pivotField] as $pivot_id => $field){ |
|
| 96 | + foreach ($relation['pivotFields'] as $pivotField) { |
|
| 97 | + foreach ($data[$pivotField] as $pivot_id => $field) { |
|
| 98 | 98 | $model->{$relation['name']}()->updateExistingPivot($pivot_id, [$pivotField => $field]); |
| 99 | 99 | } |
| 100 | 100 | } |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | */ |
| 253 | 253 | public function getUpdateFields($id) |
| 254 | 254 | { |
| 255 | - $fields = $this->prepareFields(empty($this->update_fields)?$this->fields:$this->update_fields); |
|
| 255 | + $fields = $this->prepareFields(empty($this->update_fields) ? $this->fields : $this->update_fields); |
|
| 256 | 256 | $entry = $this->getEntry($id); |
| 257 | 257 | |
| 258 | 258 | foreach ($fields as $k => $field) { |
@@ -376,13 +376,13 @@ discard block |
||
| 376 | 376 | public function allowAccess($access) |
| 377 | 377 | { |
| 378 | 378 | // $this->addButtons((array)$access); |
| 379 | - return $this->access = array_merge(array_diff((array)$access, $this->access), $this->access); |
|
| 379 | + return $this->access = array_merge(array_diff((array) $access, $this->access), $this->access); |
|
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | public function denyAccess($access) |
| 383 | 383 | { |
| 384 | 384 | // $this->removeButtons((array)$access); |
| 385 | - return $this->access = array_diff($this->access, (array)$access); |
|
| 385 | + return $this->access = array_diff($this->access, (array) $access); |
|
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | /** |
@@ -595,7 +595,7 @@ discard block |
||
| 595 | 595 | */ |
| 596 | 596 | public function addDefaultTypeToColumn($column) |
| 597 | 597 | { |
| 598 | - if (array_key_exists('name', (array)$column)) |
|
| 598 | + if (array_key_exists('name', (array) $column)) |
|
| 599 | 599 | { |
| 600 | 600 | $default_type = $this->getFieldTypeFromDbColumnType($column['name']); |
| 601 | 601 | return array_merge(['type' => $default_type], $column); |
@@ -611,7 +611,7 @@ discard block |
||
| 611 | 611 | * @param [field or column] |
| 612 | 612 | */ |
| 613 | 613 | public function addDefaultLabel($array) { |
| 614 | - if (!array_key_exists('label', (array)$array) && array_key_exists('name', (array)$array)) { |
|
| 614 | + if (!array_key_exists('label', (array) $array) && array_key_exists('name', (array) $array)) { |
|
| 615 | 615 | $array = array_merge(['label' => ucfirst($this->makeLabel($array['name']))], $array); |
| 616 | 616 | return $array; |
| 617 | 617 | } |
@@ -785,7 +785,7 @@ discard block |
||
| 785 | 785 | array_map(function($field) { |
| 786 | 786 | // $this->labels[$field] = $this->makeLabel($field); |
| 787 | 787 | |
| 788 | - $this->fields[] = [ |
|
| 788 | + $this->fields[] = [ |
|
| 789 | 789 | 'name' => $field, |
| 790 | 790 | 'label' => ucfirst($field), |
| 791 | 791 | 'value' => '', 'default' => $this->field_types[$field]['default'], |
@@ -1127,7 +1127,7 @@ discard block |
||
| 1127 | 1127 | |
| 1128 | 1128 | public function orderColumns($order) |
| 1129 | 1129 | { |
| 1130 | - $this->setSort('columns', (array)$order); |
|
| 1130 | + $this->setSort('columns', (array) $order); |
|
| 1131 | 1131 | } |
| 1132 | 1132 | |
| 1133 | 1133 | |
@@ -1202,13 +1202,13 @@ discard block |
||
| 1202 | 1202 | |
| 1203 | 1203 | public function orderFields($order) |
| 1204 | 1204 | { |
| 1205 | - $this->setSort('fields', (array)$order); |
|
| 1205 | + $this->setSort('fields', (array) $order); |
|
| 1206 | 1206 | } |
| 1207 | 1207 | |
| 1208 | 1208 | |
| 1209 | 1209 | public function syncField($field) |
| 1210 | 1210 | { |
| 1211 | - if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field); |
|
| 1211 | + if (array_key_exists('name', (array) $field)) return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field); |
|
| 1212 | 1212 | |
| 1213 | 1213 | return false; |
| 1214 | 1214 | } |
@@ -1247,7 +1247,7 @@ discard block |
||
| 1247 | 1247 | if (!empty($this->{$type})) |
| 1248 | 1248 | { |
| 1249 | 1249 | $this->{$type} = array_map(function($field) use ($fields, $attributes) { |
| 1250 | - if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes); |
|
| 1250 | + if (in_array($field['name'], (array) $fields)) $field = array_merge($field, $attributes); |
|
| 1251 | 1251 | |
| 1252 | 1252 | return $field; |
| 1253 | 1253 | }, $this->{$type}); |
@@ -1258,7 +1258,7 @@ discard block |
||
| 1258 | 1258 | |
| 1259 | 1259 | public function remove($entity, $fields) |
| 1260 | 1260 | { |
| 1261 | - return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array)$fields);})); |
|
| 1261 | + return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array) $fields); })); |
|
| 1262 | 1262 | } |
| 1263 | 1263 | |
| 1264 | 1264 | public function setSort($items, $order) |
@@ -1277,7 +1277,7 @@ discard block |
||
| 1277 | 1277 | if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key]; |
| 1278 | 1278 | } |
| 1279 | 1279 | |
| 1280 | - return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);})); |
|
| 1280 | + return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]); })); |
|
| 1281 | 1281 | } |
| 1282 | 1282 | |
| 1283 | 1283 | return $this->{$items}; |
@@ -1290,7 +1290,7 @@ discard block |
||
| 1290 | 1290 | // cred ca ia valorile din tabela de legatura ca sa ti le afiseze in select |
| 1291 | 1291 | public function getRelationValues($model, $field, $where = [], $order = []) |
| 1292 | 1292 | { |
| 1293 | - $order = (array)$order; |
|
| 1293 | + $order = (array) $order; |
|
| 1294 | 1294 | $values = $model->select('*'); |
| 1295 | 1295 | |
| 1296 | 1296 | if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1)); |
@@ -38,6 +38,9 @@ discard block |
||
| 38 | 38 | $this->initState(); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | + /** |
|
| 42 | + * @param string $model |
|
| 43 | + */ |
|
| 41 | 44 | public function setModel($model) |
| 42 | 45 | { |
| 43 | 46 | if (!class_exists($model)) throw new \Exception('This model does not exist.', 404); |
@@ -54,6 +57,10 @@ discard block |
||
| 54 | 57 | } |
| 55 | 58 | |
| 56 | 59 | // TODO: make this work without having to specify "index" |
| 60 | + |
|
| 61 | + /** |
|
| 62 | + * @param string $route |
|
| 63 | + */ |
|
| 57 | 64 | public function setRoute($route, $parameters = []) |
| 58 | 65 | { |
| 59 | 66 | if (!\Route::has($route)) throw new \Exception('This route does not exist.', 404); |
@@ -259,6 +266,9 @@ discard block |
||
| 259 | 266 | return $model; |
| 260 | 267 | } |
| 261 | 268 | |
| 269 | + /** |
|
| 270 | + * @param integer $id |
|
| 271 | + */ |
|
| 262 | 272 | public function delete($id) // DONE |
| 263 | 273 | { |
| 264 | 274 | return $this->model->destroy($id); |
@@ -489,6 +499,9 @@ discard block |
||
| 489 | 499 | return array_filter($this->{$entity}[] = $this->syncField($field)); |
| 490 | 500 | } |
| 491 | 501 | |
| 502 | + /** |
|
| 503 | + * @param string $entity |
|
| 504 | + */ |
|
| 492 | 505 | private function addMultiple($entity, $field) |
| 493 | 506 | { |
| 494 | 507 | $this->{$entity} = array_filter(array_map([$this, 'syncField'], $fields)); |
@@ -506,16 +519,25 @@ discard block |
||
| 506 | 519 | } |
| 507 | 520 | } |
| 508 | 521 | |
| 522 | + /** |
|
| 523 | + * @param string $entity |
|
| 524 | + */ |
|
| 509 | 525 | private function remove($entity, $fields) |
| 510 | 526 | { |
| 511 | 527 | return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array)$fields);})); |
| 512 | 528 | } |
| 513 | 529 | |
| 530 | + /** |
|
| 531 | + * @param string $items |
|
| 532 | + */ |
|
| 514 | 533 | private function setSort($items, $order) |
| 515 | 534 | { |
| 516 | 535 | $this->sort[$items] = $order; |
| 517 | 536 | } |
| 518 | 537 | |
| 538 | + /** |
|
| 539 | + * @param string $items |
|
| 540 | + */ |
|
| 519 | 541 | private function sort($items) |
| 520 | 542 | { |
| 521 | 543 | if (array_key_exists($items, $this->sort)) |
@@ -561,6 +583,9 @@ discard block |
||
| 561 | 583 | return $values->get()->lists($field, $model->getKeyName())->toArray(); |
| 562 | 584 | } |
| 563 | 585 | |
| 586 | + /** |
|
| 587 | + * @param string $entity |
|
| 588 | + */ |
|
| 564 | 589 | private function syncRelations($entity) |
| 565 | 590 | { |
| 566 | 591 | foreach ($this->relations as $field => $relation) { |
@@ -125,9 +125,9 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | public function removePermissions($permissions) // DONE |
| 127 | 127 | { |
| 128 | - $this->removeButtons((array)$permissions); |
|
| 128 | + $this->removeButtons((array) $permissions); |
|
| 129 | 129 | |
| 130 | - return $this->permissions = array_diff($this->permissions, (array)$permissions); |
|
| 130 | + return $this->permissions = array_diff($this->permissions, (array) $permissions); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | public function setColumns($columns) |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | |
| 159 | 159 | public function orderColumns($order) |
| 160 | 160 | { |
| 161 | - $this->setSort('columns', (array)$order); |
|
| 161 | + $this->setSort('columns', (array) $order); |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | public function setFields($fields) |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | |
| 229 | 229 | public function orderFields($order) |
| 230 | 230 | { |
| 231 | - $this->setSort('fields', (array)$order); |
|
| 231 | + $this->setSort('fields', (array) $order); |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | public function items() |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | |
| 288 | 288 | public function unsetListActions($actions) |
| 289 | 289 | { |
| 290 | - return $this->listActions = array_diff($this->listActions, (array)$actions); |
|
| 290 | + return $this->listActions = array_diff($this->listActions, (array) $actions); |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | public function checkListAction($action) |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | |
| 313 | 313 | public function setRequired($fields) |
| 314 | 314 | { |
| 315 | - $this->required = array_merge($this->required, (array)$fields); |
|
| 315 | + $this->required = array_merge($this->required, (array) $fields); |
|
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | public function required() |
@@ -380,14 +380,14 @@ discard block |
||
| 380 | 380 | |
| 381 | 381 | private function syncColumn($column) |
| 382 | 382 | { |
| 383 | - if (array_key_exists('name', (array)$column)) return array_merge(['type' => $this->getType($column['name'])], $column); |
|
| 383 | + if (array_key_exists('name', (array) $column)) return array_merge(['type' => $this->getType($column['name'])], $column); |
|
| 384 | 384 | |
| 385 | 385 | return false; |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | private function syncField($field) |
| 389 | 389 | { |
| 390 | - if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field); |
|
| 390 | + if (array_key_exists('name', (array) $field)) return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field); |
|
| 391 | 391 | |
| 392 | 392 | return false; |
| 393 | 393 | } |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | if (!empty($this->{$type})) |
| 500 | 500 | { |
| 501 | 501 | $this->{$type} = array_map(function($field) use ($fields, $attributes) { |
| 502 | - if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes); |
|
| 502 | + if (in_array($field['name'], (array) $fields)) $field = array_merge($field, $attributes); |
|
| 503 | 503 | |
| 504 | 504 | return $field; |
| 505 | 505 | }, $this->{$type}); |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | |
| 509 | 509 | private function remove($entity, $fields) |
| 510 | 510 | { |
| 511 | - return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array)$fields);})); |
|
| 511 | + return array_values(array_filter($this->{$entity}, function($field) use ($fields) { return !in_array($field['name'], (array) $fields); })); |
|
| 512 | 512 | } |
| 513 | 513 | |
| 514 | 514 | private function setSort($items, $order) |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key]; |
| 528 | 528 | } |
| 529 | 529 | |
| 530 | - return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);})); |
|
| 530 | + return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]); })); |
|
| 531 | 531 | } |
| 532 | 532 | |
| 533 | 533 | return $this->{$items}; |
@@ -537,11 +537,11 @@ discard block |
||
| 537 | 537 | { |
| 538 | 538 | foreach ($this->relations as $key => $relation) |
| 539 | 539 | { |
| 540 | - if ($relation['pivot']){ |
|
| 540 | + if ($relation['pivot']) { |
|
| 541 | 541 | $model->{$relation['name']}()->sync($data[$key]); |
| 542 | 542 | |
| 543 | - foreach($relation['pivotFields'] as $pivotField){ |
|
| 544 | - foreach($data[$pivotField] as $pivot_id => $field){ |
|
| 543 | + foreach ($relation['pivotFields'] as $pivotField) { |
|
| 544 | + foreach ($data[$pivotField] as $pivot_id => $field) { |
|
| 545 | 545 | $model->{$relation['name']}()->updateExistingPivot($pivot_id, [$pivotField => $field]); |
| 546 | 546 | } |
| 547 | 547 | } |
@@ -551,7 +551,7 @@ discard block |
||
| 551 | 551 | |
| 552 | 552 | private function getRelationValues($model, $field, $where = [], $order = []) |
| 553 | 553 | { |
| 554 | - $order = (array)$order; |
|
| 554 | + $order = (array) $order; |
|
| 555 | 555 | $values = $model->select('*'); |
| 556 | 556 | |
| 557 | 557 | if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1)); |