We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -71,8 +71,7 @@ |
||
| 71 | 71 | if ($results && $results->count()) { |
| 72 | 72 | $results_array = $results->lists($column['attribute'], 'id'); |
| 73 | 73 | echo implode(', ', $results_array->toArray()); |
| 74 | - } |
|
| 75 | - else |
|
| 74 | + } else |
|
| 76 | 75 | { |
| 77 | 76 | echo '-'; |
| 78 | 77 | } |
@@ -238,7 +238,9 @@ discard block |
||
| 238 | 238 | $item = $this->model->findOrFail($id); |
| 239 | 239 | $updated = $item->update($this->compactFakeFields($data)); |
| 240 | 240 | |
| 241 | - if ($updated) $this->syncPivot($item, $data); |
|
| 241 | + if ($updated) { |
|
| 242 | + $this->syncPivot($item, $data); |
|
| 243 | + } |
|
| 242 | 244 | |
| 243 | 245 | return $item; |
| 244 | 246 | } |
@@ -436,7 +438,9 @@ discard block |
||
| 436 | 438 | */ |
| 437 | 439 | public function setModel($model_namespace) |
| 438 | 440 | { |
| 439 | - if (!class_exists($model_namespace)) throw new \Exception('This model does not exist.', 404); |
|
| 441 | + if (!class_exists($model_namespace)) { |
|
| 442 | + throw new \Exception('This model does not exist.', 404); |
|
| 443 | + } |
|
| 440 | 444 | |
| 441 | 445 | $this->model = new $model_namespace(); |
| 442 | 446 | $this->query = $this->model->select('*'); |
@@ -478,7 +482,9 @@ discard block |
||
| 478 | 482 | { |
| 479 | 483 | $complete_route = $route.'.index'; |
| 480 | 484 | |
| 481 | - if (!\Route::has($complete_route)) throw new \Exception('There are no routes for this route name.', 404); |
|
| 485 | + if (!\Route::has($complete_route)) { |
|
| 486 | + throw new \Exception('There are no routes for this route name.', 404); |
|
| 487 | + } |
|
| 482 | 488 | |
| 483 | 489 | $this->route = route($complete_route, $parameters); |
| 484 | 490 | $this->initButtons(); |
@@ -534,8 +540,7 @@ discard block |
||
| 534 | 540 | // if label and other details have been defined in the array |
| 535 | 541 | if (is_array($columns[0])) { |
| 536 | 542 | $this->addColumn($column); |
| 537 | - } |
|
| 538 | - else |
|
| 543 | + } else |
|
| 539 | 544 | { |
| 540 | 545 | $this->addColumn([ |
| 541 | 546 | 'name' => $column, |
@@ -831,11 +836,17 @@ discard block |
||
| 831 | 836 | */ |
| 832 | 837 | public function getFieldTypeFromDbColumnType($field) |
| 833 | 838 | { |
| 834 | - if (!array_key_exists($field, $this->field_types)) return 'text'; |
|
| 839 | + if (!array_key_exists($field, $this->field_types)) { |
|
| 840 | + return 'text'; |
|
| 841 | + } |
|
| 835 | 842 | |
| 836 | - if ($field == 'password') return 'password'; |
|
| 843 | + if ($field == 'password') { |
|
| 844 | + return 'password'; |
|
| 845 | + } |
|
| 837 | 846 | |
| 838 | - if ($field == 'email') return 'email'; |
|
| 847 | + if ($field == 'email') { |
|
| 848 | + return 'email'; |
|
| 849 | + } |
|
| 839 | 850 | |
| 840 | 851 | switch ($this->field_types[$field]['type']) |
| 841 | 852 | { |
@@ -908,7 +919,9 @@ discard block |
||
| 908 | 919 | $columns = \Schema::getColumnListing($this->model->getTable()); |
| 909 | 920 | $fillable = $this->model->getFillable(); |
| 910 | 921 | |
| 911 | - if (!empty($fillable)) $columns = array_intersect($columns, $fillable); |
|
| 922 | + if (!empty($fillable)) { |
|
| 923 | + $columns = array_intersect($columns, $fillable); |
|
| 924 | + } |
|
| 912 | 925 | |
| 913 | 926 | // but not updated_at, deleted_at |
| 914 | 927 | return array_values(array_diff($columns, [$this->model->getKeyName(), 'updated_at', 'deleted_at'])); |
@@ -1208,7 +1221,9 @@ discard block |
||
| 1208 | 1221 | |
| 1209 | 1222 | public function syncField($field) |
| 1210 | 1223 | { |
| 1211 | - if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field); |
|
| 1224 | + if (array_key_exists('name', (array)$field)) { |
|
| 1225 | + return array_merge(['type' => $this->getFieldTypeFromDbColumnType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field); |
|
| 1226 | + } |
|
| 1212 | 1227 | |
| 1213 | 1228 | return false; |
| 1214 | 1229 | } |
@@ -1226,8 +1241,11 @@ discard block |
||
| 1226 | 1241 | |
| 1227 | 1242 | foreach ($this->{$fields} as $key => $field) |
| 1228 | 1243 | { |
| 1229 | - if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) $this->{$fields}[$key]['value'] = $this->entry->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray(); |
|
| 1230 | - else $this->{$fields}[$key]['value'] = $this->entry->{$field['name']}; |
|
| 1244 | + if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) { |
|
| 1245 | + $this->{$fields}[$key]['value'] = $this->entry->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray(); |
|
| 1246 | + } else { |
|
| 1247 | + $this->{$fields}[$key]['value'] = $this->entry->{$field['name']}; |
|
| 1248 | + } |
|
| 1231 | 1249 | } |
| 1232 | 1250 | } |
| 1233 | 1251 | } |
@@ -1247,7 +1265,9 @@ discard block |
||
| 1247 | 1265 | if (!empty($this->{$type})) |
| 1248 | 1266 | { |
| 1249 | 1267 | $this->{$type} = array_map(function($field) use ($fields, $attributes) { |
| 1250 | - if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes); |
|
| 1268 | + if (in_array($field['name'], (array)$fields)) { |
|
| 1269 | + $field = array_merge($field, $attributes); |
|
| 1270 | + } |
|
| 1251 | 1271 | |
| 1252 | 1272 | return $field; |
| 1253 | 1273 | }, $this->{$type}); |
@@ -1274,7 +1294,9 @@ discard block |
||
| 1274 | 1294 | |
| 1275 | 1295 | foreach ($this->sort[$items] as $item) |
| 1276 | 1296 | { |
| 1277 | - if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key]; |
|
| 1297 | + if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) { |
|
| 1298 | + $elements[] = $this->{$items}[$key]; |
|
| 1299 | + } |
|
| 1278 | 1300 | } |
| 1279 | 1301 | |
| 1280 | 1302 | return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);})); |
@@ -1293,9 +1315,13 @@ discard block |
||
| 1293 | 1315 | $order = (array)$order; |
| 1294 | 1316 | $values = $model->select('*'); |
| 1295 | 1317 | |
| 1296 | - if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1)); |
|
| 1318 | + if (!empty($where)) { |
|
| 1319 | + call_user_func_array([$values, $where[0]], array_slice($where, 1)); |
|
| 1320 | + } |
|
| 1297 | 1321 | |
| 1298 | - if (!empty($order)) call_user_func_array([$values, 'orderBy'], $order); |
|
| 1322 | + if (!empty($order)) { |
|
| 1323 | + call_user_func_array([$values, 'orderBy'], $order); |
|
| 1324 | + } |
|
| 1299 | 1325 | |
| 1300 | 1326 | return $values->get()->lists($field, $model->getKeyName())->toArray(); |
| 1301 | 1327 | } |
@@ -1304,8 +1330,11 @@ discard block |
||
| 1304 | 1330 | public function syncRelations($entity) |
| 1305 | 1331 | { |
| 1306 | 1332 | foreach ($this->relations as $field => $relation) { |
| 1307 | - if ($relation['pivot']) $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]); |
|
| 1308 | - else $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]); |
|
| 1333 | + if ($relation['pivot']) { |
|
| 1334 | + $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]); |
|
| 1335 | + } else { |
|
| 1336 | + $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]); |
|
| 1337 | + } |
|
| 1309 | 1338 | } |
| 1310 | 1339 | } |
| 1311 | 1340 | |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | $secondary_ids[$second_item] = $second_item; |
| 46 | 46 | } |
| 47 | 47 | } |
| 48 | - }else{ //create dependecies from relation if not from validate error |
|
| 48 | + } else{ //create dependecies from relation if not from validate error |
|
| 49 | 49 | foreach( $primary_array as $primary_item ){ |
| 50 | 50 | foreach($primary_item[$secondary_dependency['entity']] as $second_item ){ |
| 51 | 51 | $secondary_ids[$second_item['id']] = $second_item['id']; |
@@ -40,7 +40,9 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | public function setModel($model) |
| 42 | 42 | { |
| 43 | - if (!class_exists($model)) throw new \Exception('This model does not exist.', 404); |
|
| 43 | + if (!class_exists($model)) { |
|
| 44 | + throw new \Exception('This model does not exist.', 404); |
|
| 45 | + } |
|
| 44 | 46 | |
| 45 | 47 | $this->model = new $model(); |
| 46 | 48 | $this->query = $this->model->select('*'); |
@@ -56,7 +58,9 @@ discard block |
||
| 56 | 58 | // TODO: make this work without having to specify "index" |
| 57 | 59 | public function setRoute($route, $parameters = []) |
| 58 | 60 | { |
| 59 | - if (!\Route::has($route)) throw new \Exception('This route does not exist.', 404); |
|
| 61 | + if (!\Route::has($route)) { |
|
| 62 | + throw new \Exception('This route does not exist.', 404); |
|
| 63 | + } |
|
| 60 | 64 | |
| 61 | 65 | $this->route = route($route, $parameters); |
| 62 | 66 | $this->initButtons(); |
@@ -254,7 +258,9 @@ discard block |
||
| 254 | 258 | { |
| 255 | 259 | $model = $this->model->findOrFail($id); |
| 256 | 260 | $updated = $model->update($data); |
| 257 | - if ($updated) $this->syncPivot($model, $data); |
|
| 261 | + if ($updated) { |
|
| 262 | + $this->syncPivot($model, $data); |
|
| 263 | + } |
|
| 258 | 264 | |
| 259 | 265 | return $model; |
| 260 | 266 | } |
@@ -282,7 +288,9 @@ discard block |
||
| 282 | 288 | |
| 283 | 289 | public function checkPermission($permission) // DONE |
| 284 | 290 | { |
| 285 | - if (!in_array($permission, $this->permissions)) abort(403); |
|
| 291 | + if (!in_array($permission, $this->permissions)) { |
|
| 292 | + abort(403); |
|
| 293 | + } |
|
| 286 | 294 | } |
| 287 | 295 | |
| 288 | 296 | public function unsetListActions($actions) |
@@ -351,11 +359,17 @@ discard block |
||
| 351 | 359 | |
| 352 | 360 | $this->state = 'list'; |
| 353 | 361 | |
| 354 | - if (in_array('create', $segments)) $this->state = 'add'; |
|
| 362 | + if (in_array('create', $segments)) { |
|
| 363 | + $this->state = 'add'; |
|
| 364 | + } |
|
| 355 | 365 | |
| 356 | - if (in_array('edit', $segments)) $this->state = 'edit'; |
|
| 366 | + if (in_array('edit', $segments)) { |
|
| 367 | + $this->state = 'edit'; |
|
| 368 | + } |
|
| 357 | 369 | |
| 358 | - if (is_numeric(end($segments))) $this->state = 'view'; |
|
| 370 | + if (is_numeric(end($segments))) { |
|
| 371 | + $this->state = 'view'; |
|
| 372 | + } |
|
| 359 | 373 | } |
| 360 | 374 | |
| 361 | 375 | private function removeButtons($buttons) |
@@ -373,21 +387,27 @@ discard block |
||
| 373 | 387 | $columns = \Schema::getColumnListing($this->model->getTable()); |
| 374 | 388 | $fillable = $this->model->getFillable(); |
| 375 | 389 | |
| 376 | - if (!empty($fillable)) $columns = array_intersect($columns, $fillable); |
|
| 390 | + if (!empty($fillable)) { |
|
| 391 | + $columns = array_intersect($columns, $fillable); |
|
| 392 | + } |
|
| 377 | 393 | |
| 378 | 394 | return array_values(array_diff($columns, [$this->model->getKeyName(), 'updated_at', 'deleted_at'])); |
| 379 | 395 | } |
| 380 | 396 | |
| 381 | 397 | private function syncColumn($column) |
| 382 | 398 | { |
| 383 | - if (array_key_exists('name', (array)$column)) return array_merge(['type' => $this->getType($column['name'])], $column); |
|
| 399 | + if (array_key_exists('name', (array)$column)) { |
|
| 400 | + return array_merge(['type' => $this->getType($column['name'])], $column); |
|
| 401 | + } |
|
| 384 | 402 | |
| 385 | 403 | return false; |
| 386 | 404 | } |
| 387 | 405 | |
| 388 | 406 | private function syncField($field) |
| 389 | 407 | { |
| 390 | - if (array_key_exists('name', (array)$field)) return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field); |
|
| 408 | + if (array_key_exists('name', (array)$field)) { |
|
| 409 | + return array_merge(['type' => $this->getType($field['name']), 'value' => '', 'default' => null, 'values' => [], 'attributes' => []], $field); |
|
| 410 | + } |
|
| 391 | 411 | |
| 392 | 412 | return false; |
| 393 | 413 | } |
@@ -404,11 +424,17 @@ discard block |
||
| 404 | 424 | |
| 405 | 425 | private function getType($field) // DONE |
| 406 | 426 | { |
| 407 | - if (!array_key_exists($field, $this->fieldTypes)) return 'text'; |
|
| 427 | + if (!array_key_exists($field, $this->fieldTypes)) { |
|
| 428 | + return 'text'; |
|
| 429 | + } |
|
| 408 | 430 | |
| 409 | - if ($field == 'password') return 'password'; |
|
| 431 | + if ($field == 'password') { |
|
| 432 | + return 'password'; |
|
| 433 | + } |
|
| 410 | 434 | |
| 411 | - if ($field == 'email') return 'email'; |
|
| 435 | + if ($field == 'email') { |
|
| 436 | + return 'email'; |
|
| 437 | + } |
|
| 412 | 438 | |
| 413 | 439 | switch ($this->fieldTypes[$field]['type']) |
| 414 | 440 | { |
@@ -466,7 +492,9 @@ discard block |
||
| 466 | 492 | |
| 467 | 493 | $this->fields[] = ['name' => $field, 'value' => '', 'default' => $this->fieldTypes[$field]['default'], 'type' => $this->getType($field), 'values' => [], 'attributes' => []]; |
| 468 | 494 | |
| 469 | - if (!in_array($field, $this->model->getHidden())) $this->columns[] = ['name' => $field, 'type' => $this->getType($field)]; |
|
| 495 | + if (!in_array($field, $this->model->getHidden())) { |
|
| 496 | + $this->columns[] = ['name' => $field, 'type' => $this->getType($field)]; |
|
| 497 | + } |
|
| 470 | 498 | }, $this->getColumns()); |
| 471 | 499 | } |
| 472 | 500 | |
@@ -478,8 +506,11 @@ discard block |
||
| 478 | 506 | |
| 479 | 507 | foreach ($this->{$fields} as $key => $field) |
| 480 | 508 | { |
| 481 | - if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) $this->{$fields}[$key]['value'] = $this->item->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray(); |
|
| 482 | - else $this->{$fields}[$key]['value'] = $this->item->{$field['name']}; |
|
| 509 | + if (array_key_exists($field['name'], $this->relations) && $this->relations[$field['name']]['pivot']) { |
|
| 510 | + $this->{$fields}[$key]['value'] = $this->item->{$this->relations[$field['name']]['name']}()->lists($this->relations[$field['name']]['model']->getKeyName())->toArray(); |
|
| 511 | + } else { |
|
| 512 | + $this->{$fields}[$key]['value'] = $this->item->{$field['name']}; |
|
| 513 | + } |
|
| 483 | 514 | } |
| 484 | 515 | } |
| 485 | 516 | } |
@@ -499,7 +530,9 @@ discard block |
||
| 499 | 530 | if (!empty($this->{$type})) |
| 500 | 531 | { |
| 501 | 532 | $this->{$type} = array_map(function($field) use ($fields, $attributes) { |
| 502 | - if (in_array($field['name'], (array)$fields)) $field = array_merge($field, $attributes); |
|
| 533 | + if (in_array($field['name'], (array)$fields)) { |
|
| 534 | + $field = array_merge($field, $attributes); |
|
| 535 | + } |
|
| 503 | 536 | |
| 504 | 537 | return $field; |
| 505 | 538 | }, $this->{$type}); |
@@ -524,7 +557,9 @@ discard block |
||
| 524 | 557 | |
| 525 | 558 | foreach ($this->sort[$items] as $item) |
| 526 | 559 | { |
| 527 | - if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) $elements[] = $this->{$items}[$key]; |
|
| 560 | + if (is_numeric($key = array_search($item, array_column($this->{$items}, 'name')))) { |
|
| 561 | + $elements[] = $this->{$items}[$key]; |
|
| 562 | + } |
|
| 528 | 563 | } |
| 529 | 564 | |
| 530 | 565 | return $this->{$items} = array_merge($elements, array_filter($this->{$items}, function($item) use($items) {return !in_array($item['name'], $this->sort[$items]);})); |
@@ -554,9 +589,13 @@ discard block |
||
| 554 | 589 | $order = (array)$order; |
| 555 | 590 | $values = $model->select('*'); |
| 556 | 591 | |
| 557 | - if (!empty($where)) call_user_func_array([$values, $where[0]], array_slice($where, 1)); |
|
| 592 | + if (!empty($where)) { |
|
| 593 | + call_user_func_array([$values, $where[0]], array_slice($where, 1)); |
|
| 594 | + } |
|
| 558 | 595 | |
| 559 | - if (!empty($order)) call_user_func_array([$values, 'orderBy'], $order); |
|
| 596 | + if (!empty($order)) { |
|
| 597 | + call_user_func_array([$values, 'orderBy'], $order); |
|
| 598 | + } |
|
| 560 | 599 | |
| 561 | 600 | return $values->get()->lists($field, $model->getKeyName())->toArray(); |
| 562 | 601 | } |
@@ -564,8 +603,11 @@ discard block |
||
| 564 | 603 | private function syncRelations($entity) |
| 565 | 604 | { |
| 566 | 605 | foreach ($this->relations as $field => $relation) { |
| 567 | - if ($relation['pivot']) $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]); |
|
| 568 | - else $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]); |
|
| 606 | + if ($relation['pivot']) { |
|
| 607 | + $this->add($entity, ['name' => $field, 'type' => 'multiselect', 'value' => [], 'values' => $this->relations[$field]['values']]); |
|
| 608 | + } else { |
|
| 609 | + $this->sync($entity, $field, ['type' => 'select', 'values' => $this->relations[$field]['values']]); |
|
| 610 | + } |
|
| 569 | 611 | } |
| 570 | 612 | } |
| 571 | 613 | |