From f5ba6cbe248dafb3850d408d1a1150e1cabfd695 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:12:36 +0000 Subject: [PATCH 1/3] Update dependency laravel/framework to v11.27.2 --- composer.json | 2 +- composer.lock | 30 +++++++++++++++++------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index e0e0d24e4..30f2bc692 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ "htmlmin/htmlmin": "dev-master", "http-interop/http-factory-guzzle": "1.2.0", "kiritokatklian/nova-permission": "4.0.10", - "laravel/framework": "11.27.0", + "laravel/framework": "11.27.2", "laravel/horizon": "5.29.0", "laravel/nova": "4.35.2", "laravel/passport": "12.3.0", diff --git a/composer.lock b/composer.lock index 3270903d9..61826665f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "66cd8540cb16d7fddd577c9c31102a54", + "content-hash": "853845e8bcb14af7ab5541e18be75ea0", "packages": [ { "name": "ans-group/laravel-health-check", @@ -1522,16 +1522,16 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v3.3.3", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a" + "reference": "8c784d071debd117328803d86b2097615b457500" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", - "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500", + "reference": "8c784d071debd117328803d86b2097615b457500", "shasum": "" }, "require": { @@ -1544,10 +1544,14 @@ "require-dev": { "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.0", - "phpstan/phpstan-webmozart-assert": "^1.0", "phpunit/phpunit": "^7.0|^8.0|^9.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, "autoload": { "psr-4": { "Cron\\": "src/Cron/" @@ -1571,7 +1575,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0" }, "funding": [ { @@ -1579,7 +1583,7 @@ "type": "github" } ], - "time": "2023-08-10T19:36:49+00:00" + "time": "2024-10-09T13:47:03+00:00" }, { "name": "egulias/email-validator", @@ -3027,16 +3031,16 @@ }, { "name": "laravel/framework", - "version": "v11.27.0", + "version": "v11.27.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "fa6ce79f02d35c045605534bc9b105763c4eff1b" + "reference": "a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/fa6ce79f02d35c045605534bc9b105763c4eff1b", - "reference": "fa6ce79f02d35c045605534bc9b105763c4eff1b", + "url": "https://api.github.com/repos/laravel/framework/zipball/a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9", + "reference": "a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9", "shasum": "" }, "require": { @@ -3232,7 +3236,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-10-08T16:02:30+00:00" + "time": "2024-10-09T04:17:35+00:00" }, { "name": "laravel/horizon", From 9f75e0c24fa9816d33d1fa8deec8364b5229b66a Mon Sep 17 00:00:00 2001 From: Kristaps Berzinch Date: Sat, 12 Oct 2024 21:02:51 -0600 Subject: [PATCH 2/3] Add new PHPStan ignores --- phpstan.neon | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/phpstan.neon b/phpstan.neon index db5397194..9fe385e02 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -18,6 +18,7 @@ parameters: - '#^Parameter \#1 \$callback of method Illuminate\\Support\\Collection\<\(int\|string\),mixed\>\:\:mapWithKeys\(\) expects callable\(mixed, int\|string\)\: array, Closure\(object\)\: non\-empty\-array given\.$#' - '#^Parameter \#1 \$callback of method Illuminate\\Support\\Collection\<\(int\|string\),mixed\>\:\:mapWithKeys\(\) expects callable\(mixed, int\|string\)\: array\, Closure\(object\)\: non\-empty\-array\ given\.$#' - '#^Parameter \#1 \$options of method Laravel\\Nova\\Fields\\Select\:\:options\(\) expects \(callable\(\)\: iterable\\)\|iterable\, array given\.$#' + - '#Access to an undefined property App\\Http\\Resources\\[a-zA-Z]+::\$[a-zA-Z_]+\.#' - '#Access to an undefined property App\\Http\\Resources\\TravelAssignment::\$[a-z_]+\.#' - '#Access to an undefined property App\\Models\\[a-zA-Z]+::\$(aggregate|day|rsvpsource|count|ending_year|member_count|active|revenue|is_paid|pivot)\.#' - '#Access to an undefined property App\\Models\\[a-zA-Z]+\|App\\Models\\[a-zA-Z]+::\$[a-z_]+\.#' @@ -47,10 +48,12 @@ parameters: - '#Anonymous function should return (bool|string|string\|null) but returns mixed\.#' - '#Anonymous function should return int but returns int\|false\.#' - '#Argument of an invalid type mixed supplied for foreach, only iterables are supported\.#' + - '#Call to an undefined method App\\Http\\Resources\\User::getAllPermissions\(\)\.#' - '#Call to an undefined method App\\Models\\Payment\|Illuminate\\Database\\Eloquent\\Collection::getSquareOrderState\(\)\.#' - '#Call to an undefined method Illuminate\\Http\\Request::model\(\)\.#' - '#Call to an undefined method Laravel\\Nova\\Actions\\Action\|Laravel\\Nova\\Actions\\ActionResponse::withMessage\(\)\.#' - '#Call to an undefined method Laravel\\Nova\\Actions\\Action\|Laravel\\Nova\\Actions\\ActionResponse::withoutConfirmation\(\)\.#' + - '#Cannot access constant class on App\\Models\\User\|null\.#' - '#Cannot access offset ''[a-z]+'' on mixed\.#' - '#Cannot access offset [0-9]+ on mixed\.#' - '#Cannot access property \$[a-z]+ on Illuminate\\Support\\Carbon\|null\.#' @@ -121,6 +124,7 @@ parameters: - '#Parameter \#1 \$assignment of job class App\\Jobs\\SendTravelAssignmentReminder constructor expects App\\Models\\TravelAssignment in App\\Jobs\\SendTravelAssignmentReminder::dispatch\(\), App\\Models\\TravelAssignment\|null given\.#' - '#Parameter \#1 \$authentication_instant of method DocuSign\\eSign\\Model\\RecipientViewRequest::setAuthenticationInstant\(\) expects string\|null, mixed given\.#' - '#Parameter \#1 \$callback of method Illuminate\\Support\\Collection<\(int\|string\),mixed>::each\(\) expects callable\(mixed, int\|string\): mixed, Closure\(int\): void given\.#' + - '#Parameter \#1 \$callback of method Illuminate\\Support\\Collection<\(int\|string\),mixed>::filter\(\) expects \(callable\(mixed, int\|string\): bool\)\|null, Closure\(App\\Models\\User\): bool given\.#' - '#Parameter \#1 \$callback of method Illuminate\\Support\\Collection<\(int\|string\),mixed>::map\(\) expects callable\(mixed, int\|string\): string, Closure\(array\): string given\.#' - '#Parameter \#1 \$callback of method Illuminate\\Support\\Collection<\(int\|string\),mixed>::map\(\) expects callable\(mixed, int\|string\): string, Closure\(string\): string given\.#' - '#Parameter \#1 \$callback of method Illuminate\\Support\\Collection<\(int\|string\),mixed>::mapWithKeys\(\) expects callable\(mixed, int\|string\): array, Closure\(string\|null\): array given\.#' @@ -131,14 +135,17 @@ parameters: - '#Parameter \#1 \$callback of method Laravel\\Nova\\Fields\\FieldElement::hideFromDetail\(\) expects bool\|\(callable\(\): bool\), Closure\(Laravel\\Nova\\Http\\Requests\\NovaRequest, App\\Models\\User\): bool given\.#' - '#Parameter \#1 \$callback of method Laravel\\Nova\\Fields\\FieldElement::showOnDetail\(\) expects bool\|\(callable\(\): bool\), Closure\(Laravel\\Nova\\Http\\Requests\\NovaRequest, App\\Models\\Travel\): bool given\.#' - '#Parameter \#1 \$callback of method Laravel\\Nova\\Fields\\FieldElement::showOnUpdating\(\) expects bool\|\(callable\(Laravel\\Nova\\Http\\Requests\\NovaRequest, mixed\): bool\), Closure\(Laravel\\Nova\\Http\\Requests\\NovaRequest, App\\Models\\Travel\): bool given\.#' + - '#Parameter \#1 \$channel of method Illuminate\\Notifications\\Messages\\SlackMessage::to\(\) expects string, string\|null given\.#' - '#Parameter \#1 \$cookie of static method Laravel\\Passport\\Passport::cookie\(\) expects string\|null, mixed given\.#' - '#Parameter \#1 \$date of method Illuminate\\Database\\Eloquent\\Builder::[a-z]+\(\) expects string, mixed given\.#' - '#Parameter \#1 \$displayCallback of method Laravel\\Nova\\Fields\\Field::displayUsing\(\) expects callable\(mixed, mixed, string\): mixed, Closure\(string\|null\): \(string\|null\) given\.#' - '#Parameter \#1 \$envelope of class App\\Notifications\\MembershipAgreementDocuSignEnvelopeReceived constructor expects App\\Models\\DocuSignEnvelope, mixed given\.#' - '#Parameter \#1 \$envelope of class App\\Notifications\\Travel\\DocuSignEnvelopeReceived constructor expects App\\Models\\DocuSignEnvelope, mixed given\.#' - '#Parameter \#1 \$haystack of function str_contains expects string, mixed given\.#' + - '#Parameter \#1 \$id of static method Illuminate\\Database\\Eloquent\\Builder::findByIdentifier\(\) expects string, int given\.#' - '#Parameter \#1 \$id of static method Illuminate\\Database\\Eloquent\\Builder::findByIdentifier\(\) expects string, mixed given\.#' - '#Parameter \#1 \$idempotencyKey of static method Square\\Models\\Builders\\RefundPaymentRequestBuilder::init\(\) expects string, string\|null given\.#' + - '#Parameter \#1 \$ids of method Illuminate\\Database\\Eloquent\\Relations\\BelongsToMany::sync\(\) expects array\|Illuminate\\Database\\Eloquent\\Model\|Illuminate\\Support\\Collection, mixed given\.#' - '#Parameter \#1 \$json of function json_decode expects string, mixed given\.#' - '#Parameter \#1 \$json of function json_decode expects string, string\|false given\.#' - '#Parameter \#1 \$locationId of class Square\\Models\\Order constructor expects string, mixed given\.#' @@ -184,6 +191,7 @@ parameters: - '#Parameter \#1 \$user of (static)? method Illuminate\\Database\\Eloquent\\Builder::userCanPurchase\(\) expects App\\Models\\User, App\\Models\\User\|null given\.#' - '#Parameter \#1 \$user of class App\\Mail\\DocuSign\\Agreement\\MemberNotification constructor expects App\\Models\\User, mixed given\.#' - '#Parameter \#1 \$user of class App\\Mail\\DocuSign\\Agreement\\ParentNotification constructor expects App\\Models\\User, mixed given\.#' + - '#Parameter \#1 \$user of job class App\\Jobs\\PushToJedi constructor expects App\\Models\\User in App\\Jobs\\PushToJedi::dispatch\(\), App\\Models\\User\|null given\.#' - '#Parameter \#1 \$user of method App\\Policies\\DocuSignEnvelopePolicy::delete\(\) expects App\\Models\\User, App\\Models\\User\|null given\.#' - '#Parameter \#1 \$user of method Illuminate\\Database\\Eloquent\\Builder::userCanPurchase\(\) expects App\\Models\\User, App\\Models\\User\|null given\.#' - '#Parameter \#1 \$user of static method App\\Util\\DocuSign::getApiClientForUser\(\) expects App\\Models\\User, App\\Models\\User\|null given\.#' @@ -201,6 +209,7 @@ parameters: - '#Parameter \#2 \$contents of method Illuminate\\Filesystem\\FilesystemAdapter::put\(\) expects Illuminate\\Http\\File\|Illuminate\\Http\\UploadedFile\|Psr\\Http\\Message\\StreamInterface\|resource\|string, string\|false given\.#' - '#Parameter \#2 \$e of method Laravel\\Nova\\Actions\\Action::markAsFailed\(\) expects string\|Throwable\|null, string\|false given\.#' - '#Parameter \#2 \$haystack of function in_array expects array, mixed given\.#' + - '#Parameter \#2 \$model_class of job class App\\Jobs\\PushToJedi constructor expects string in App\\Jobs\\PushToJedi::dispatch\(\), class-string\|null given\.#' - '#Parameter \#2 \$name of method Illuminate\\Mail\\Mailable::replyTo\(\) expects string\|null, mixed given\.#' - '#Parameter \#2 \$operator of method Illuminate\\Database\\Eloquent\\Builder::whereDate\(\) expects DateTimeInterface\|string\|null, mixed given\.#' - '#Parameter \#2 \$query \(Illuminate\\Database\\Eloquent\\Builder\) of method App\\Nova\\[a-zA-Z]+::indexQuery\(\) should be contravariant with parameter \$query \(Illuminate\\Database\\Eloquent\\Builder\) of method Laravel\\Nova\\Resource::indexQuery\(\)#' @@ -248,4 +257,5 @@ parameters: - '#Unable to resolve the template type TMapWithKeysValue in call to method Illuminate\\Database\\Eloquent\\Collection::mapWithKeys\(\)#' - '#Unable to resolve the template type TMapWithKeysValue in call to method Illuminate\\Support\\Collection<\(int\|string\),mixed>::mapWithKeys\(\)#' - '#Unable to resolve the template type TValue in call to function collect#' + - '#Variable property access on App\\Models\\User\.#' - '#Variable property access on object\.#' From 4385be7c28a538621f44c813c9286c8f347710dd Mon Sep 17 00:00:00 2001 From: Kristaps Berzinch Date: Sat, 12 Oct 2024 21:06:18 -0600 Subject: [PATCH 3/3] More PHPStan ignores --- phpstan.neon | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 9fe385e02..54108de95 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -18,8 +18,7 @@ parameters: - '#^Parameter \#1 \$callback of method Illuminate\\Support\\Collection\<\(int\|string\),mixed\>\:\:mapWithKeys\(\) expects callable\(mixed, int\|string\)\: array, Closure\(object\)\: non\-empty\-array given\.$#' - '#^Parameter \#1 \$callback of method Illuminate\\Support\\Collection\<\(int\|string\),mixed\>\:\:mapWithKeys\(\) expects callable\(mixed, int\|string\)\: array\, Closure\(object\)\: non\-empty\-array\ given\.$#' - '#^Parameter \#1 \$options of method Laravel\\Nova\\Fields\\Select\:\:options\(\) expects \(callable\(\)\: iterable\\)\|iterable\, array given\.$#' - - '#Access to an undefined property App\\Http\\Resources\\[a-zA-Z]+::\$[a-zA-Z_]+\.#' - - '#Access to an undefined property App\\Http\\Resources\\TravelAssignment::\$[a-z_]+\.#' + - '#Access to an undefined property App\\Http\\Resources\\[a-zA-Z]+::\$[a-zA-Z0-9_]+\.#' - '#Access to an undefined property App\\Models\\[a-zA-Z]+::\$(aggregate|day|rsvpsource|count|ending_year|member_count|active|revenue|is_paid|pivot)\.#' - '#Access to an undefined property App\\Models\\[a-zA-Z]+\|App\\Models\\[a-zA-Z]+::\$[a-z_]+\.#' - '#Access to an undefined property App\\Models\\DuesTransaction::\$effective_end\.#' @@ -94,7 +93,6 @@ parameters: - '#Method App\\Models\\[a-zA-Z]+::removeFalsyAssocArrayValues\(\) has parameter \$arr with no value type specified in iterable type array\.#' - '#Method App\\Models\\[a-zA-Z]+::removeFalsyAssocArrayValues\(\) return type has no value type specified in iterable type array\.#' - '#Method App\\Models\\Airport::getRows\(\) should return array> but returns array, array>\.#' - - '#Method App\\Notifiables\\[a-zA-Z]+::[a-zA-Z]+\(\) should return string\|null but returns mixed\.#' - '#Method App\\Nova\\[a-zA-Z0-9]+::__invoke\(\) return type has no value type specified in iterable type array\.#' - '#Method App\\Nova\\[a-zA-Z0-9]+::fields\(\) return type has no value type specified in iterable type array\.#' - '#Method App\\Nova\\Actions\\[a-zA-Z0-9]+::handle\(\) has no return type specified\.#' @@ -151,7 +149,6 @@ parameters: - '#Parameter \#1 \$locationId of class Square\\Models\\Order constructor expects string, mixed given\.#' - '#Parameter \#1 \$message of function Sentry\\captureMessage expects string, string\|false given\.#' - '#Parameter \#1 \$missing of method Illuminate\\Routing\\Route::missing\(\) expects Closure, array{''App\\\\Http\\\\Controllers\\\\MerchandiseController'', ''handleMissingModel''} given\.#' - - '#Parameter \#1 \$models \(Illuminate\\Support\\Collection>\) of method App\\Models\\ActionEvent::prune\(\) should be contravariant with parameter \$models \(Illuminate\\Support\\Collection\) of method Laravel\\Nova\\Actions\\ActionEvent::prune\(\)#' - '#Parameter \#1 \$object_or_class of function property_exists expects object\|string, mixed given\.#' - '#Parameter \#1 \$options of method Laravel\\Nova\\Fields\\BooleanGroup::options\(\) expects array\|\(Closure\(\): \(array\|Illuminate\\Support\\Collection\)\)\|Illuminate\\Support\\Collection, mixed given\.#' - '#Parameter \#1 \$orderId of method Square\\Apis\\OrdersApi::retrieveOrder\(\) expects string, string\|null given\.#' @@ -177,7 +174,6 @@ parameters: - '#Parameter \#1 \$time of class Carbon\\Carbon constructor expects Carbon\\Month\|Carbon\\WeekDay\|DateTimeInterface\|float\|int\|string\|null, mixed given\.#' - '#Parameter \#1 \$time of class Illuminate\\Support\\Carbon constructor expects Carbon\\Month\|Carbon\\WeekDay\|DateTimeInterface\|float\|int\|string\|null, mixed given\.#' - '#Parameter \#1 \$timestamp of static method Carbon\\Carbon::createFromTimestamp\(\) expects float\|int\|string, int\|false given\.#' - - '#Parameter \#1 \$timeZone of method Carbon\\Carbon::setTimezone\(\) expects DateTimeZone\|int\|string, mixed given\.#' - '#Parameter \#1 \$title of static method Illuminate\\Support\\Str::slug\(\) expects string, mixed given\.#' - '#Parameter \#1 \$to of function redirect expects string\|null, array\|string\|null given\.#' - '#Parameter \#1 \$transaction of class App\\Notifications\\Dues\\PaymentReminder constructor expects App\\Models\\DuesTransaction, mixed given\.#' @@ -206,7 +202,6 @@ parameters: - '#Parameter \#1 \.\.\.\$permissions of method Spatie\\Permission\\Models\\Role::givePermissionTo\(\) expects array\|BackedEnum\|Illuminate\\Support\\Collection\|int\|Spatie\\Permission\\Contracts\\Permission\|string, mixed given\.#' - '#Parameter \#2 \$array of function array_key_exists expects array, array\|null given\.#' - '#Parameter \#2 \$array of function array_key_exists expects array, mixed given\.#' - - '#Parameter \#2 \$contents of method Illuminate\\Filesystem\\FilesystemAdapter::put\(\) expects Illuminate\\Http\\File\|Illuminate\\Http\\UploadedFile\|Psr\\Http\\Message\\StreamInterface\|resource\|string, string\|false given\.#' - '#Parameter \#2 \$e of method Laravel\\Nova\\Actions\\Action::markAsFailed\(\) expects string\|Throwable\|null, string\|false given\.#' - '#Parameter \#2 \$haystack of function in_array expects array, mixed given\.#' - '#Parameter \#2 \$model_class of job class App\\Jobs\\PushToJedi constructor expects string in App\\Jobs\\PushToJedi::dispatch\(\), class-string\|null given\.#'