From 99115a45b559f65334a7f9a7cfc3f7649e243bbc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 22:57:05 +0000 Subject: [PATCH 1/2] Bump guzzlehttp/psr7 from 1.6.1 to 1.8.5 Bumps [guzzlehttp/psr7](https://github.com/guzzle/psr7) from 1.6.1 to 1.8.5. - [Release notes](https://github.com/guzzle/psr7/releases) - [Changelog](https://github.com/guzzle/psr7/blob/1.8.5/CHANGELOG.md) - [Commits](https://github.com/guzzle/psr7/compare/1.6.1...1.8.5) --- updated-dependencies: - dependency-name: guzzlehttp/psr7 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- composer.lock | 73 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 13 deletions(-) diff --git a/composer.lock b/composer.lock index 0b4ceab..a67cd7b 100644 --- a/composer.lock +++ b/composer.lock @@ -633,16 +633,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.6.1", + "version": "1.8.5", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a" + "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268", + "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268", "shasum": "" }, "require": { @@ -655,37 +655,58 @@ }, "require-dev": { "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" }, "suggest": { - "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.7-dev" } }, "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" } ], @@ -700,7 +721,25 @@ "uri", "url" ], - "time": "2019-07-01T23:21:34+00:00" + "support": { + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/1.8.5" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2022-03-20T21:51:18+00:00" }, { "name": "jakub-onderka/php-console-color", @@ -2153,6 +2192,9 @@ "request", "response" ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/master" + }, "time": "2016-08-06T14:39:51+00:00" }, { @@ -2362,6 +2404,10 @@ } ], "description": "A polyfill for getallheaders.", + "support": { + "issues": "https://github.com/ralouphie/getallheaders/issues", + "source": "https://github.com/ralouphie/getallheaders/tree/develop" + }, "time": "2019-03-08T08:55:37+00:00" }, { @@ -6139,5 +6185,6 @@ "platform": { "php": "^7.2" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "2.2.0" } From 2eef00d9e8bb29d15fd10b2291a182f216c00fe1 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Tue, 29 Mar 2022 22:57:13 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- app/Console/Kernel.php | 2 +- app/Events/GoalAchieved.php | 2 +- app/Events/LoanRecorded.php | 2 +- app/Exceptions/Handler.php | 6 ++--- app/Http/Controllers/CategoryController.php | 2 +- app/Http/Controllers/ExpenseController.php | 2 +- app/Http/Controllers/GoalController.php | 2 +- .../Controllers/GoalTransactionController.php | 4 ++-- app/Http/Controllers/LoanController.php | 2 +- app/Http/Controllers/PlanController.php | 2 +- app/Http/Controllers/TransferController.php | 5 ++-- .../Controllers/WalletExpenseController.php | 4 ++-- .../Controllers/WalletIncomeController.php | 4 ++-- app/Http/Middleware/Authenticate.php | 2 +- .../Middleware/RedirectIfAuthenticated.php | 6 ++--- app/Jobs/GenerateMonthlyTransactions.php | 2 +- app/Listeners/DepositLoanToWallet.php | 2 +- app/Listeners/PayoffTheLoanGoal.php | 2 +- app/PendingTransaction.php | 2 +- app/Policies/WalletPolicy.php | 24 +++++++++---------- app/ScheduledTransaction.php | 1 + tests/Feature/CategoryTest.php | 5 ++-- 22 files changed, 44 insertions(+), 41 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index e5ecfbb..228fccd 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -19,7 +19,7 @@ class Kernel extends ConsoleKernel /** * Define the application's command schedule. * - * @param Schedule $schedule + * @param Schedule $schedule * @return void */ protected function schedule(Schedule $schedule) diff --git a/app/Events/GoalAchieved.php b/app/Events/GoalAchieved.php index 60629d5..a10a70e 100644 --- a/app/Events/GoalAchieved.php +++ b/app/Events/GoalAchieved.php @@ -20,7 +20,7 @@ class GoalAchieved /** * Create a new event instance. * - * @param Goal $goal + * @param Goal $goal */ public function __construct(Goal $goal) { diff --git a/app/Events/LoanRecorded.php b/app/Events/LoanRecorded.php index 8db0ae2..56a0c09 100644 --- a/app/Events/LoanRecorded.php +++ b/app/Events/LoanRecorded.php @@ -20,7 +20,7 @@ class LoanRecorded /** * Create a new event instance. * - * @param Loan $loan + * @param Loan $loan */ public function __construct(Loan $loan) { diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 05dffaf..3dcc158 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -31,7 +31,7 @@ class Handler extends ExceptionHandler /** * Report or log an exception. * - * @param Exception $exception + * @param Exception $exception * @return void * * @throws Exception @@ -44,8 +44,8 @@ public function report(Exception $exception) /** * Render an exception into an HTTP response. * - * @param Request $request - * @param Exception $exception + * @param Request $request + * @param Exception $exception * @return Response * * @throws Exception diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 7215257..ec0fcb0 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -11,7 +11,7 @@ class CategoryController extends Controller /** * Display a listing of the resource. * - * @param Request $request + * @param Request $request * @return Response */ public function index(Request $request) diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php index 498b41f..5cfcdf3 100644 --- a/app/Http/Controllers/ExpenseController.php +++ b/app/Http/Controllers/ExpenseController.php @@ -10,7 +10,7 @@ class ExpenseController extends Controller { /** - * @param Request $request + * @param Request $request * @return Collection */ public function store(Request $request) diff --git a/app/Http/Controllers/GoalController.php b/app/Http/Controllers/GoalController.php index 9ecd070..ae8d29a 100644 --- a/app/Http/Controllers/GoalController.php +++ b/app/Http/Controllers/GoalController.php @@ -13,7 +13,7 @@ class GoalController extends Controller /** * Store a newly created resource in storage. * - * @param GoalRequest $request + * @param GoalRequest $request * @return Response */ public function store(GoalRequest $request) diff --git a/app/Http/Controllers/GoalTransactionController.php b/app/Http/Controllers/GoalTransactionController.php index e74d826..9e1bd1e 100644 --- a/app/Http/Controllers/GoalTransactionController.php +++ b/app/Http/Controllers/GoalTransactionController.php @@ -12,8 +12,8 @@ class GoalTransactionController extends Controller /** * Store a newly created resource in storage. * - * @param Request $request - * @param Goal $goal + * @param Request $request + * @param Goal $goal * @return Response */ public function store(Request $request, Goal $goal) diff --git a/app/Http/Controllers/LoanController.php b/app/Http/Controllers/LoanController.php index de11d62..2d31964 100644 --- a/app/Http/Controllers/LoanController.php +++ b/app/Http/Controllers/LoanController.php @@ -11,7 +11,7 @@ class LoanController extends Controller /** * Store a newly created resource in storage. * - * @param Request $request + * @param Request $request * @return void */ public function store(Request $request) diff --git a/app/Http/Controllers/PlanController.php b/app/Http/Controllers/PlanController.php index 2531402..06b4e49 100644 --- a/app/Http/Controllers/PlanController.php +++ b/app/Http/Controllers/PlanController.php @@ -12,7 +12,7 @@ class PlanController extends Controller /** * Store a newly created resource in storage. * - * @param Request $request + * @param Request $request * @return Response */ public function store(Request $request) diff --git a/app/Http/Controllers/TransferController.php b/app/Http/Controllers/TransferController.php index 5477b2f..039833b 100644 --- a/app/Http/Controllers/TransferController.php +++ b/app/Http/Controllers/TransferController.php @@ -13,7 +13,7 @@ class TransferController extends Controller /** * Store a newly created resource in storage. * - * @param Request $request + * @param Request $request * @return JsonResponse */ public function store(Request $request) @@ -41,8 +41,9 @@ public function store(Request $request) } /** - * @param Request $request + * @param Request $request * @return array + * * @deprecated */ private function singleToManyCurrency(Request $request): array diff --git a/app/Http/Controllers/WalletExpenseController.php b/app/Http/Controllers/WalletExpenseController.php index 8d1345a..32687ed 100644 --- a/app/Http/Controllers/WalletExpenseController.php +++ b/app/Http/Controllers/WalletExpenseController.php @@ -12,8 +12,8 @@ class WalletExpenseController extends Controller /** * Store a newly created resource in storage. * - * @param Request $request - * @param Wallet $wallet + * @param Request $request + * @param Wallet $wallet * @return Response */ public function store(Request $request, Wallet $wallet) diff --git a/app/Http/Controllers/WalletIncomeController.php b/app/Http/Controllers/WalletIncomeController.php index c3c0ff2..ee7cc0c 100644 --- a/app/Http/Controllers/WalletIncomeController.php +++ b/app/Http/Controllers/WalletIncomeController.php @@ -12,8 +12,8 @@ class WalletIncomeController extends Controller /** * Store a newly created resource in storage. * - * @param Request $request - * @param Wallet $wallet + * @param Request $request + * @param Wallet $wallet * @return Response */ public function store(Request $request, Wallet $wallet) diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index adff969..4e8922a 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -10,7 +10,7 @@ class Authenticate extends Middleware /** * Get the path the user should be redirected to when they are not authenticated. * - * @param Request $request + * @param Request $request * @return string|null */ protected function redirectTo($request) diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index fec22fe..b8a8409 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -12,9 +12,9 @@ class RedirectIfAuthenticated /** * Handle an incoming request. * - * @param Request $request - * @param Closure $next - * @param string|null $guard + * @param Request $request + * @param Closure $next + * @param string|null $guard * @return mixed */ public function handle($request, Closure $next, $guard = null) diff --git a/app/Jobs/GenerateMonthlyTransactions.php b/app/Jobs/GenerateMonthlyTransactions.php index f74f714..a9c6bff 100644 --- a/app/Jobs/GenerateMonthlyTransactions.php +++ b/app/Jobs/GenerateMonthlyTransactions.php @@ -20,7 +20,7 @@ class GenerateMonthlyTransactions implements ShouldQueue /** * Create a new job instance. * - * @param User $user + * @param User $user */ public function __construct(User $user) { diff --git a/app/Listeners/DepositLoanToWallet.php b/app/Listeners/DepositLoanToWallet.php index 92e3b4e..6008084 100644 --- a/app/Listeners/DepositLoanToWallet.php +++ b/app/Listeners/DepositLoanToWallet.php @@ -19,7 +19,7 @@ public function __construct() /** * Handle the event. * - * @param LoanRecorded $event + * @param LoanRecorded $event * @return void */ public function handle(LoanRecorded $event) diff --git a/app/Listeners/PayoffTheLoanGoal.php b/app/Listeners/PayoffTheLoanGoal.php index 063a87d..7b97a97 100644 --- a/app/Listeners/PayoffTheLoanGoal.php +++ b/app/Listeners/PayoffTheLoanGoal.php @@ -19,7 +19,7 @@ public function __construct() /** * Handle the event. * - * @param LoanRecorded $event + * @param LoanRecorded $event * @return void */ public function handle(LoanRecorded $event) diff --git a/app/PendingTransaction.php b/app/PendingTransaction.php index fed2d68..aab4841 100644 --- a/app/PendingTransaction.php +++ b/app/PendingTransaction.php @@ -16,7 +16,7 @@ class PendingTransaction extends Transaction ]; /** - * @param ScheduledTransaction $scheduledTransaction + * @param ScheduledTransaction $scheduledTransaction */ public static function generateMonthlyTransactions($scheduledTransaction) { diff --git a/app/Policies/WalletPolicy.php b/app/Policies/WalletPolicy.php index 60c31f9..e48aafa 100644 --- a/app/Policies/WalletPolicy.php +++ b/app/Policies/WalletPolicy.php @@ -13,7 +13,7 @@ class WalletPolicy /** * Determine whether the user can view any wallets. * - * @param User $user + * @param User $user * @return mixed */ public function viewAny(User $user) @@ -24,8 +24,8 @@ public function viewAny(User $user) /** * Determine whether the user can view the wallet. * - * @param User $user - * @param Wallet $wallet + * @param User $user + * @param Wallet $wallet * @return mixed */ public function view(User $user, Wallet $wallet) @@ -36,7 +36,7 @@ public function view(User $user, Wallet $wallet) /** * Determine whether the user can create wallets. * - * @param User $user + * @param User $user * @return mixed */ public function create(User $user) @@ -54,8 +54,8 @@ public function adjustment(User $user, Wallet $wallet) /** * Determine whether the user can update the wallet. * - * @param User $user - * @param Wallet $wallet + * @param User $user + * @param Wallet $wallet * @return mixed */ public function update(User $user, Wallet $wallet) @@ -66,8 +66,8 @@ public function update(User $user, Wallet $wallet) /** * Determine whether the user can delete the wallet. * - * @param User $user - * @param Wallet $wallet + * @param User $user + * @param Wallet $wallet * @return mixed */ public function delete(User $user, Wallet $wallet) @@ -78,8 +78,8 @@ public function delete(User $user, Wallet $wallet) /** * Determine whether the user can restore the wallet. * - * @param User $user - * @param Wallet $wallet + * @param User $user + * @param Wallet $wallet * @return mixed */ public function restore(User $user, Wallet $wallet) @@ -90,8 +90,8 @@ public function restore(User $user, Wallet $wallet) /** * Determine whether the user can permanently delete the wallet. * - * @param User $user - * @param Wallet $wallet + * @param User $user + * @param Wallet $wallet * @return mixed */ public function forceDelete(User $user, Wallet $wallet) diff --git a/app/ScheduledTransaction.php b/app/ScheduledTransaction.php index 7c4649b..621c4c1 100644 --- a/app/ScheduledTransaction.php +++ b/app/ScheduledTransaction.php @@ -20,6 +20,7 @@ class ScheduledTransaction extends Transaction /** * @return Rule + * * @throws InvalidRRule */ public static function rule() diff --git a/tests/Feature/CategoryTest.php b/tests/Feature/CategoryTest.php index 3b3a798..b158498 100644 --- a/tests/Feature/CategoryTest.php +++ b/tests/Feature/CategoryTest.php @@ -44,8 +44,9 @@ public function test_can_get_categories_list() /** * @dataProvider typesCountProvider - * @param int $type - * @param int $count + * + * @param int $type + * @param int $count */ public function test_can_filter_categories_per_type($type, $count) {