diff --git a/app/Http/Controllers/Auth/ChangePasswordController.php b/app/Http/Controllers/Auth/ChangePasswordController.php index 047aea2f40b83785a90ed5103ac658063e30aa64..226787113d1ed072d11b2ab18c72b7aa1c257962 100644 --- a/app/Http/Controllers/Auth/ChangePasswordController.php +++ b/app/Http/Controllers/Auth/ChangePasswordController.php @@ -25,8 +25,8 @@ class ChangePasswordController extends Controller protected function update(Request $request) { $input = $request->validate([ - 'old_password' => 'required', - 'password' => 'required|between:6,15|confirmed', + 'old_password' => 'required', + 'password' => 'required|between:6,15|confirmed', 'password_confirmation' => 'required', ]); diff --git a/app/Http/Controllers/Auth/ProfileController.php b/app/Http/Controllers/Auth/ProfileController.php index 8483296d705549bdef25933a570c7459dc450175..25f541def610590af6186d86af7d8f186e1be6be 100644 --- a/app/Http/Controllers/Auth/ProfileController.php +++ b/app/Http/Controllers/Auth/ProfileController.php @@ -40,10 +40,10 @@ class ProfileController extends Controller public function update(Request $request) { $userData = $request->validate([ - 'name' => 'required|max:60', - 'email' => 'required|max:255|unique:users,email,'.auth()->id(), + 'name' => 'required|max:60', + 'email' => 'required|max:255|unique:users,email,'.auth()->id(), 'account_start_date' => 'nullable|date', - 'currency_code' => 'required|string|max:3', + 'currency_code' => 'required|string|max:3', ]); auth()->user()->update($userData); diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 40d9723c6077f18b0f6aa78670fda4eeccbaafda..3395c432c186cb1425149998fa03a37fd4d6378a 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -49,8 +49,8 @@ class RegisterController extends Controller protected function validator(array $data) { return Validator::make($data, [ - 'name' => 'required|string|max:255', - 'email' => 'required|string|email|max:255|unique:users', + 'name' => 'required|string|max:255', + 'email' => 'required|string|email|max:255|unique:users', 'password' => 'required|string|min:6|confirmed', ]); } @@ -64,9 +64,9 @@ class RegisterController extends Controller protected function create(array $data) { return User::create([ - 'name' => $data['name'], - 'email' => $data['email'], - 'password' => bcrypt($data['password']), + 'name' => $data['name'], + 'email' => $data['email'], + 'password' => bcrypt($data['password']), 'api_token' => Str::random(24), ]); } diff --git a/app/Http/Controllers/Loans/TransactionController.php b/app/Http/Controllers/Loans/TransactionController.php index 78e9d0b0b9bf89bc9ae87b04d5f82e15f28a65ad..f1dbd4e4e8c66effa7d923640d5bb391760681c4 100644 --- a/app/Http/Controllers/Loans/TransactionController.php +++ b/app/Http/Controllers/Loans/TransactionController.php @@ -13,9 +13,9 @@ class TransactionController extends Controller public function store(Request $request, Loan $loan) { $newTransaction = $request->validate([ - 'amount' => 'required|numeric', - 'date' => 'required|date_format:Y-m-d', - 'in_out' => 'required|boolean', + 'amount' => 'required|numeric', + 'date' => 'required|date_format:Y-m-d', + 'in_out' => 'required|boolean', 'description' => 'required|max:255', ]); $newTransaction['loan_id'] = $loan->id; diff --git a/app/Http/Controllers/PartnerController.php b/app/Http/Controllers/PartnerController.php index 665eb687c9ad5d3db068c96d86030d5ed1452768..3b62f20f107c8ecd37986b04d5111e0281cd3fbc 100644 --- a/app/Http/Controllers/PartnerController.php +++ b/app/Http/Controllers/PartnerController.php @@ -38,7 +38,7 @@ class PartnerController extends Controller $this->authorize('create', new Partner); $newPartner = $request->validate([ - 'name' => 'required|max:60', + 'name' => 'required|max:60', 'description' => 'nullable|max:255', ]); $newPartner['creator_id'] = auth()->id(); @@ -67,9 +67,9 @@ class PartnerController extends Controller $transactions = $this->getPartnerTransactions($partner, [ 'category_id' => request('category_id'), - 'start_date' => $startDate, - 'end_date' => $endDate, - 'query' => request('query'), + 'start_date' => $startDate, + 'end_date' => $endDate, + 'query' => request('query'), ]); $incomeTotal = $this->getIncomeTotal($transactions); $spendingTotal = $this->getSpendingTotal($transactions); @@ -97,7 +97,7 @@ class PartnerController extends Controller $this->authorize('update', $partner); $partnerData = $request->validate([ - 'name' => 'required|max:60', + 'name' => 'required|max:60', 'description' => 'nullable|max:255', 'status_id' => ['required', Rule::in(Partner::getConstants('STATUS'))], ]); diff --git a/app/Http/Controllers/Transactions/ExportController.php b/app/Http/Controllers/Transactions/ExportController.php index 73ea27f5759d3b8a9c80fa149983ad0280791886..12138dc76f8be09efab4f53abf37f19d4264288e 100644 --- a/app/Http/Controllers/Transactions/ExportController.php +++ b/app/Http/Controllers/Transactions/ExportController.php @@ -25,8 +25,8 @@ class ExportController extends Controller $transactions = $this->getCategoryTransactions($category, [ 'partner_id' => request('partner_id'), 'start_date' => $startDate, - 'end_date' => $endDate, - 'query' => request('query'), + 'end_date' => $endDate, + 'query' => request('query'), ]); return Response::csv($transactions); @@ -38,9 +38,9 @@ class ExportController extends Controller $endDate = request('end_date', date('Y-m-d')); $transactions = $this->getPartnerTransactions($partner, [ 'category_id' => request('category_id'), - 'start_date' => $startDate, - 'end_date' => $endDate, - 'query' => request('query'), + 'start_date' => $startDate, + 'end_date' => $endDate, + 'query' => request('query'), ]); return Response::csv($transactions); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 5c151bd10bb2e12fd1bc7e1d2075f199267a9bbf..186ac9c0f2bf7e8676c97ffba6da45f64de4223e 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -54,11 +54,11 @@ class Kernel extends HttpKernel * @var array */ protected $routeMiddleware = [ - 'auth' => \Illuminate\Auth\Middleware\Authenticate::class, + 'auth' => \Illuminate\Auth\Middleware\Authenticate::class, 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, - 'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class, - 'can' => \Illuminate\Auth\Middleware\Authorize::class, - 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, - 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, + 'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class, + 'can' => \Illuminate\Auth\Middleware\Authorize::class, + 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, + 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, ]; } diff --git a/app/Providers/ResponseMacroServiceProvider.php b/app/Providers/ResponseMacroServiceProvider.php index b3d15f5850d449566c23172952e1fabf4eacbe12..3e04097deb91344ede36a876ce5819bc42ba1a28 100644 --- a/app/Providers/ResponseMacroServiceProvider.php +++ b/app/Providers/ResponseMacroServiceProvider.php @@ -20,7 +20,7 @@ class ResponseMacroServiceProvider extends ServiceProvider $output = (new CsvTransformer($transactions))->toString(); return Response::make(rtrim($output, "\n"), 200, [ - 'Content-type' => 'text/csv', + 'Content-type' => 'text/csv', 'Content-Disposition' => 'attachment; filename=transactions_'.date('YmdHis').'.csv', ]); }); diff --git a/config/app.php b/config/app.php index 228860c536f46da2e03d76e4cf36c8a24d844a91..c573d9c14c22e56ebcc5fe369ee33e75f2e78e3d 100644 --- a/config/app.php +++ b/config/app.php @@ -193,39 +193,39 @@ return [ 'aliases' => [ - 'App' => Illuminate\Support\Facades\App::class, - 'Artisan' => Illuminate\Support\Facades\Artisan::class, - 'Auth' => Illuminate\Support\Facades\Auth::class, - 'Blade' => Illuminate\Support\Facades\Blade::class, - 'Broadcast' => Illuminate\Support\Facades\Broadcast::class, - 'Bus' => Illuminate\Support\Facades\Bus::class, - 'Cache' => Illuminate\Support\Facades\Cache::class, - 'Config' => Illuminate\Support\Facades\Config::class, - 'Cookie' => Illuminate\Support\Facades\Cookie::class, - 'Crypt' => Illuminate\Support\Facades\Crypt::class, - 'DB' => Illuminate\Support\Facades\DB::class, - 'Eloquent' => Illuminate\Database\Eloquent\Model::class, - 'Event' => Illuminate\Support\Facades\Event::class, - 'File' => Illuminate\Support\Facades\File::class, - 'Gate' => Illuminate\Support\Facades\Gate::class, - 'Hash' => Illuminate\Support\Facades\Hash::class, - 'Lang' => Illuminate\Support\Facades\Lang::class, - 'Log' => Illuminate\Support\Facades\Log::class, - 'Mail' => Illuminate\Support\Facades\Mail::class, + 'App' => Illuminate\Support\Facades\App::class, + 'Artisan' => Illuminate\Support\Facades\Artisan::class, + 'Auth' => Illuminate\Support\Facades\Auth::class, + 'Blade' => Illuminate\Support\Facades\Blade::class, + 'Broadcast' => Illuminate\Support\Facades\Broadcast::class, + 'Bus' => Illuminate\Support\Facades\Bus::class, + 'Cache' => Illuminate\Support\Facades\Cache::class, + 'Config' => Illuminate\Support\Facades\Config::class, + 'Cookie' => Illuminate\Support\Facades\Cookie::class, + 'Crypt' => Illuminate\Support\Facades\Crypt::class, + 'DB' => Illuminate\Support\Facades\DB::class, + 'Eloquent' => Illuminate\Database\Eloquent\Model::class, + 'Event' => Illuminate\Support\Facades\Event::class, + 'File' => Illuminate\Support\Facades\File::class, + 'Gate' => Illuminate\Support\Facades\Gate::class, + 'Hash' => Illuminate\Support\Facades\Hash::class, + 'Lang' => Illuminate\Support\Facades\Lang::class, + 'Log' => Illuminate\Support\Facades\Log::class, + 'Mail' => Illuminate\Support\Facades\Mail::class, 'Notification' => Illuminate\Support\Facades\Notification::class, - 'Password' => Illuminate\Support\Facades\Password::class, - 'Queue' => Illuminate\Support\Facades\Queue::class, - 'Redirect' => Illuminate\Support\Facades\Redirect::class, - 'Redis' => Illuminate\Support\Facades\Redis::class, - 'Request' => Illuminate\Support\Facades\Request::class, - 'Response' => Illuminate\Support\Facades\Response::class, - 'Route' => Illuminate\Support\Facades\Route::class, - 'Schema' => Illuminate\Support\Facades\Schema::class, - 'Session' => Illuminate\Support\Facades\Session::class, - 'Storage' => Illuminate\Support\Facades\Storage::class, - 'URL' => Illuminate\Support\Facades\URL::class, - 'Validator' => Illuminate\Support\Facades\Validator::class, - 'View' => Illuminate\Support\Facades\View::class, + 'Password' => Illuminate\Support\Facades\Password::class, + 'Queue' => Illuminate\Support\Facades\Queue::class, + 'Redirect' => Illuminate\Support\Facades\Redirect::class, + 'Redis' => Illuminate\Support\Facades\Redis::class, + 'Request' => Illuminate\Support\Facades\Request::class, + 'Response' => Illuminate\Support\Facades\Response::class, + 'Route' => Illuminate\Support\Facades\Route::class, + 'Schema' => Illuminate\Support\Facades\Schema::class, + 'Session' => Illuminate\Support\Facades\Session::class, + 'Storage' => Illuminate\Support\Facades\Storage::class, + 'URL' => Illuminate\Support\Facades\URL::class, + 'Validator' => Illuminate\Support\Facades\Validator::class, + 'View' => Illuminate\Support\Facades\View::class, ], diff --git a/config/logging.php b/config/logging.php index 296e0ee4b865a69eacb59263b9e56966725bb0ed..811711884061d844fb3eed7f01e36373bac076d5 100644 --- a/config/logging.php +++ b/config/logging.php @@ -61,7 +61,7 @@ return [ ], 'papertrail' => [ - 'driver' => 'monolog', + 'driver' => 'monolog', 'level' => 'debug', 'handler' => SyslogUdpHandler::class, 'handler_with' => [ diff --git a/tests/Traits/ValidateFormRequest.php b/tests/Traits/ValidateFormRequest.php index 6bf8af496b729189785bf799f33082d0eeac9e89..fc9a473ece85af6a5975d7fec0ccaf08b88b6ee2 100644 --- a/tests/Traits/ValidateFormRequest.php +++ b/tests/Traits/ValidateFormRequest.php @@ -16,7 +16,7 @@ trait ValidateFormRequest return $validator; } - protected function assertValidationFails(FormRequest $formRequest, array $attributes, Closure $callback = null) + protected function assertValidationFails(FormRequest $formRequest, array $attributes, ?Closure $callback = null) { $validator = $this->getValidator($formRequest, $attributes); $this->assertTrue($validator->fails(), 'Validation should be fails, but it passed.');