We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace Backpack\CRUD\app\Http\Controllers\Auth; |
4 | 4 | |
5 | +use Illuminate\Foundation\Auth\SendsPasswordResetEmails; |
|
5 | 6 | use Illuminate\Routing\Controller; |
6 | 7 | use Illuminate\Support\Facades\Password; |
7 | -use Illuminate\Foundation\Auth\SendsPasswordResetEmails; |
|
8 | 8 | |
9 | 9 | class ForgotPasswordController extends Controller |
10 | 10 | { |
@@ -67,7 +67,7 @@ |
||
67 | 67 | * |
68 | 68 | * @param \Illuminate\Http\Request $request |
69 | 69 | * |
70 | - * @return \Illuminate\Http\Response |
|
70 | + * @return \Illuminate\Http\RedirectResponse |
|
71 | 71 | */ |
72 | 72 | public function logout(Request $request) |
73 | 73 | { |
@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace Backpack\CRUD\app\Http\Controllers\Auth; |
4 | 4 | |
5 | +use Illuminate\Foundation\Auth\AuthenticatesUsers; |
|
5 | 6 | use Illuminate\Http\Request; |
6 | 7 | use Illuminate\Routing\Controller; |
7 | -use Illuminate\Foundation\Auth\AuthenticatesUsers; |
|
8 | 8 | |
9 | 9 | class LoginController extends Controller |
10 | 10 | { |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * |
67 | 67 | * @param array $data |
68 | 68 | * |
69 | - * @return User |
|
69 | + * @return \Illuminate\Contracts\Auth\Authenticatable |
|
70 | 70 | */ |
71 | 71 | protected function create(array $data) |
72 | 72 | { |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | * |
103 | 103 | * @param \Illuminate\Http\Request $request |
104 | 104 | * |
105 | - * @return \Illuminate\Http\Response |
|
105 | + * @return \Illuminate\Http\RedirectResponse |
|
106 | 106 | */ |
107 | 107 | public function register(Request $request) |
108 | 108 | { |
@@ -2,11 +2,11 @@ |
||
2 | 2 | |
3 | 3 | namespace Backpack\CRUD\app\Http\Controllers\Auth; |
4 | 4 | |
5 | -use Validator; |
|
6 | -use Illuminate\Http\Request; |
|
7 | -use Illuminate\Routing\Controller; |
|
8 | 5 | use Illuminate\Auth\Events\Registered; |
9 | 6 | use Illuminate\Foundation\Auth\RegistersUsers; |
7 | +use Illuminate\Http\Request; |
|
8 | +use Illuminate\Routing\Controller; |
|
9 | +use Validator; |
|
10 | 10 | |
11 | 11 | class RegisterController extends Controller |
12 | 12 | { |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | public function showRegistrationForm() |
89 | 89 | { |
90 | 90 | // if registration is closed, deny access |
91 | - if (! config('backpack.base.registration_open')) { |
|
91 | + if (!config('backpack.base.registration_open')) { |
|
92 | 92 | abort(403, trans('backpack::base.registration_closed')); |
93 | 93 | } |
94 | 94 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | public function register(Request $request) |
108 | 108 | { |
109 | 109 | // if registration is closed, deny access |
110 | - if (! config('backpack.base.registration_open')) { |
|
110 | + if (!config('backpack.base.registration_open')) { |
|
111 | 111 | abort(403, trans('backpack::base.registration_closed')); |
112 | 112 | } |
113 | 113 |
@@ -27,7 +27,6 @@ |
||
27 | 27 | /** |
28 | 28 | * Get the path the user should be redirected to after password reset. |
29 | 29 | * |
30 | - * @param \Illuminate\Http\Request $request |
|
31 | 30 | * |
32 | 31 | * @return string |
33 | 32 | */ |
@@ -2,10 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace Backpack\CRUD\app\Http\Controllers\Auth; |
4 | 4 | |
5 | +use Illuminate\Foundation\Auth\ResetsPasswords; |
|
5 | 6 | use Illuminate\Http\Request; |
6 | 7 | use Illuminate\Routing\Controller; |
7 | 8 | use Illuminate\Support\Facades\Password; |
8 | -use Illuminate\Foundation\Auth\ResetsPasswords; |
|
9 | 9 | |
10 | 10 | class ResetPasswordController extends Controller |
11 | 11 | { |
@@ -47,7 +47,7 @@ |
||
47 | 47 | |
48 | 48 | $this->middleware("guest:$guard"); |
49 | 49 | |
50 | - if (! backpack_users_have_email()) { |
|
50 | + if (!backpack_users_have_email()) { |
|
51 | 51 | abort(501, trans('backpack::base.no_email_column')); |
52 | 52 | } |
53 | 53 |
@@ -3,10 +3,10 @@ |
||
3 | 3 | namespace Backpack\CRUD\app\Http\Controllers; |
4 | 4 | |
5 | 5 | use Alert; |
6 | -use Illuminate\Routing\Controller; |
|
7 | -use Illuminate\Support\Facades\Hash; |
|
8 | 6 | use Backpack\CRUD\app\Http\Requests\AccountInfoRequest; |
9 | 7 | use Backpack\CRUD\app\Http\Requests\ChangePasswordRequest; |
8 | +use Illuminate\Routing\Controller; |
|
9 | +use Illuminate\Support\Facades\Hash; |
|
10 | 10 | |
11 | 11 | class MyAccountController extends Controller |
12 | 12 | { |
@@ -29,7 +29,7 @@ |
||
29 | 29 | /** |
30 | 30 | * Answer to unauthorized access request. |
31 | 31 | * |
32 | - * @param [type] $request [description] |
|
32 | + * @param \Illuminate\Http\Request $request [description] |
|
33 | 33 | * |
34 | 34 | * @return [type] [description] |
35 | 35 | */ |
@@ -56,7 +56,7 @@ |
||
56 | 56 | return $this->respondToUnauthorizedRequest($request); |
57 | 57 | } |
58 | 58 | |
59 | - if (! $this->checkIfUserIsAdmin(backpack_user())) { |
|
59 | + if (!$this->checkIfUserIsAdmin(backpack_user())) { |
|
60 | 60 | return $this->respondToUnauthorizedRequest($request); |
61 | 61 | } |
62 | 62 |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace Backpack\CRUD\app\Http\Requests; |
4 | 4 | |
5 | -use Illuminate\Validation\Rule; |
|
6 | 5 | use Illuminate\Foundation\Http\FormRequest; |
6 | +use Illuminate\Validation\Rule; |
|
7 | 7 | |
8 | 8 | class AccountInfoRequest extends FormRequest |
9 | 9 | { |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace Backpack\CRUD\app\Http\Requests; |
4 | 4 | |
5 | -use Illuminate\Support\Facades\Hash; |
|
6 | 5 | use Illuminate\Foundation\Http\FormRequest; |
6 | +use Illuminate\Support\Facades\Hash; |
|
7 | 7 | |
8 | 8 | class ChangePasswordRequest extends FormRequest |
9 | 9 | { |
@@ -41,9 +41,9 @@ |
||
41 | 41 | */ |
42 | 42 | public function withValidator($validator) |
43 | 43 | { |
44 | - $validator->after(function ($validator) { |
|
44 | + $validator->after(function($validator) { |
|
45 | 45 | // check old password matches |
46 | - if (! Hash::check($this->input('old_password'), backpack_auth()->user()->password)) { |
|
46 | + if (!Hash::check($this->input('old_password'), backpack_auth()->user()->password)) { |
|
47 | 47 | $validator->errors()->add('old_password', trans('backpack::base.old_password_incorrect')); |
48 | 48 | } |
49 | 49 | }); |
@@ -2,33 +2,33 @@ |
||
2 | 2 | |
3 | 3 | namespace Backpack\CRUD\app\Library\CrudPanel; |
4 | 4 | |
5 | -use Illuminate\Database\Eloquent\Collection; |
|
6 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\Read; |
|
7 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\Tabs; |
|
8 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\Query; |
|
9 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\Views; |
|
10 | 5 | use Backpack\CRUD\app\Library\CrudPanel\Traits\Access; |
6 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\AutoFocus; |
|
7 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\AutoSet; |
|
8 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\Buttons; |
|
9 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\Columns; |
|
11 | 10 | use Backpack\CRUD\app\Library\CrudPanel\Traits\Create; |
12 | 11 | use Backpack\CRUD\app\Library\CrudPanel\Traits\Delete; |
13 | 12 | use Backpack\CRUD\app\Library\CrudPanel\Traits\Errors; |
13 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\FakeColumns; |
|
14 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\FakeFields; |
|
14 | 15 | use Backpack\CRUD\app\Library\CrudPanel\Traits\Fields; |
15 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\Search; |
|
16 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\Update; |
|
17 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\AutoSet; |
|
18 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\Buttons; |
|
19 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\Columns; |
|
20 | 16 | use Backpack\CRUD\app\Library\CrudPanel\Traits\Filters; |
21 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\Reorder; |
|
22 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\Settings; |
|
23 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\AutoFocus; |
|
17 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\HeadingsAndTitles; |
|
24 | 18 | use Backpack\CRUD\app\Library\CrudPanel\Traits\Macroable; |
25 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\FakeFields; |
|
26 | 19 | use Backpack\CRUD\app\Library\CrudPanel\Traits\Operations; |
27 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\Validation; |
|
28 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\FakeColumns; |
|
20 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\Query; |
|
21 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\Read; |
|
22 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\Reorder; |
|
29 | 23 | use Backpack\CRUD\app\Library\CrudPanel\Traits\SaveActions; |
30 | -use Backpack\CRUD\app\Library\CrudPanel\Traits\HeadingsAndTitles; |
|
24 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\Search; |
|
25 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\Settings; |
|
26 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\Tabs; |
|
27 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\Update; |
|
28 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\Validation; |
|
29 | +use Backpack\CRUD\app\Library\CrudPanel\Traits\Views; |
|
31 | 30 | use Backpack\CRUD\app\Library\CrudPanel\Traits\ViewsAndRestoresRevisions; |
31 | +use Illuminate\Database\Eloquent\Collection; |
|
32 | 32 | |
33 | 33 | class CrudPanel |
34 | 34 | { |
@@ -76,11 +76,11 @@ discard block |
||
76 | 76 | */ |
77 | 77 | public function setModel($model_namespace) |
78 | 78 | { |
79 | - if (! class_exists($model_namespace)) { |
|
79 | + if (!class_exists($model_namespace)) { |
|
80 | 80 | throw new \Exception('The model does not exist.', 500); |
81 | 81 | } |
82 | 82 | |
83 | - if (! method_exists($model_namespace, 'hasCrudTrait')) { |
|
83 | + if (!method_exists($model_namespace, 'hasCrudTrait')) { |
|
84 | 84 | throw new \Exception('Please use CrudTrait on the model.', 500); |
85 | 85 | } |
86 | 86 | |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | { |
144 | 144 | $complete_route = $route.'.index'; |
145 | 145 | |
146 | - if (! \Route::has($complete_route)) { |
|
146 | + if (!\Route::has($complete_route)) { |
|
147 | 147 | throw new \Exception('There are no routes for this route name.', 404); |
148 | 148 | } |
149 | 149 | |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | */ |
245 | 245 | public function getFirstOfItsTypeInArray($type, $array) |
246 | 246 | { |
247 | - return array_first($array, function ($item) use ($type) { |
|
247 | + return array_first($array, function($item) use ($type) { |
|
248 | 248 | return $item['type'] == $type; |
249 | 249 | }); |
250 | 250 | } |
@@ -261,8 +261,8 @@ discard block |
||
261 | 261 | |
262 | 262 | public function sync($type, $fields, $attributes) |
263 | 263 | { |
264 | - if (! empty($this->{$type})) { |
|
265 | - $this->{$type} = array_map(function ($field) use ($fields, $attributes) { |
|
264 | + if (!empty($this->{$type})) { |
|
265 | + $this->{$type} = array_map(function($field) use ($fields, $attributes) { |
|
266 | 266 | if (in_array($field['name'], (array) $fields)) { |
267 | 267 | $field = array_merge($field, $attributes); |
268 | 268 | } |
@@ -294,15 +294,15 @@ discard block |
||
294 | 294 | { |
295 | 295 | $relationArray = explode('.', $relationString); |
296 | 296 | |
297 | - if (! isset($length)) { |
|
297 | + if (!isset($length)) { |
|
298 | 298 | $length = count($relationArray); |
299 | 299 | } |
300 | 300 | |
301 | - if (! isset($model)) { |
|
301 | + if (!isset($model)) { |
|
302 | 302 | $model = $this->model; |
303 | 303 | } |
304 | 304 | |
305 | - $result = array_reduce(array_splice($relationArray, 0, $length), function ($obj, $method) { |
|
305 | + $result = array_reduce(array_splice($relationArray, 0, $length), function($obj, $method) { |
|
306 | 306 | return $obj->$method()->getRelated(); |
307 | 307 | }, $model); |
308 | 308 | |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | $relation = $model->{$firstRelationName}; |
353 | 353 | |
354 | 354 | $results = []; |
355 | - if (! empty($relation)) { |
|
355 | + if (!empty($relation)) { |
|
356 | 356 | if ($relation instanceof Collection) { |
357 | 357 | $currentResults = $relation->toArray(); |
358 | 358 | } else { |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | |
362 | 362 | array_shift($relationArray); |
363 | 363 | |
364 | - if (! empty($relationArray)) { |
|
364 | + if (!empty($relationArray)) { |
|
365 | 365 | foreach ($currentResults as $currentResult) { |
366 | 366 | $results = array_merge($results, $this->getRelationModelInstances($currentResult, implode('.', $relationArray))); |
367 | 367 | } |