From 1622c9f5a346f5c4a8fc3b8a69355265ec9d2dc6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 14:27:18 +0000 Subject: [PATCH 1/9] Update dependency laravel/horizon to v5.30.0 --- composer.json | 2 +- composer.lock | 64 +++++++++++++++++++++++++-------------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/composer.json b/composer.json index 07d24edd9..83ccbf019 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "http-interop/http-factory-guzzle": "1.2.0", "kiritokatklian/nova-permission": "4.0.10", "laravel/framework": "11.35.0", - "laravel/horizon": "5.29.4", + "laravel/horizon": "5.30.0", "laravel/nova": "4.35.5", "laravel/passport": "12.3.1", "laravel/scout": "10.11.9", diff --git a/composer.lock b/composer.lock index 666e4f196..eb7efc1d5 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": "d8cf1f26671e9d2176e278e4d5cc9070", + "content-hash": "ab075653b8f41813eba7344ffc41fe45", "packages": [ { "name": "ans-group/laravel-health-check", @@ -3246,16 +3246,16 @@ }, { "name": "laravel/horizon", - "version": "v5.29.4", + "version": "v5.30.0", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "c0a7087afd93e7707850cdc7ee3ff3f2eaebce98" + "reference": "37d1f29daa7500fcd170d5c45b98b592fcaab95a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/c0a7087afd93e7707850cdc7ee3ff3f2eaebce98", - "reference": "c0a7087afd93e7707850cdc7ee3ff3f2eaebce98", + "url": "https://api.github.com/repos/laravel/horizon/zipball/37d1f29daa7500fcd170d5c45b98b592fcaab95a", + "reference": "37d1f29daa7500fcd170d5c45b98b592fcaab95a", "shasum": "" }, "require": { @@ -3286,16 +3286,16 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - }, "laravel": { - "providers": [ - "Laravel\\Horizon\\HorizonServiceProvider" - ], "aliases": { "Horizon": "Laravel\\Horizon\\Horizon" - } + }, + "providers": [ + "Laravel\\Horizon\\HorizonServiceProvider" + ] + }, + "branch-alias": { + "dev-master": "5.x-dev" } }, "autoload": { @@ -3320,9 +3320,9 @@ ], "support": { "issues": "https://github.com/laravel/horizon/issues", - "source": "https://github.com/laravel/horizon/tree/v5.29.4" + "source": "https://github.com/laravel/horizon/tree/v5.30.0" }, - "time": "2024-11-21T15:06:10+00:00" + "time": "2024-12-06T18:58:00+00:00" }, { "name": "laravel/nova", @@ -8532,16 +8532,16 @@ }, { "name": "symfony/console", - "version": "v7.2.0", + "version": "v7.2.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf" + "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf", - "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf", + "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3", + "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3", "shasum": "" }, "require": { @@ -8605,7 +8605,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.2.0" + "source": "https://github.com/symfony/console/tree/v7.2.1" }, "funding": [ { @@ -8621,7 +8621,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T14:24:19+00:00" + "time": "2024-12-11T03:49:26+00:00" }, { "name": "symfony/css-selector", @@ -8757,16 +8757,16 @@ }, { "name": "symfony/error-handler", - "version": "v7.2.0", + "version": "v7.2.1", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "672b3dd1ef8b87119b446d67c58c106c43f965fe" + "reference": "6150b89186573046167796fa5f3f76601d5145f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/672b3dd1ef8b87119b446d67c58c106c43f965fe", - "reference": "672b3dd1ef8b87119b446d67c58c106c43f965fe", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/6150b89186573046167796fa5f3f76601d5145f8", + "reference": "6150b89186573046167796fa5f3f76601d5145f8", "shasum": "" }, "require": { @@ -8812,7 +8812,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v7.2.0" + "source": "https://github.com/symfony/error-handler/tree/v7.2.1" }, "funding": [ { @@ -8828,7 +8828,7 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:35:02+00:00" + "time": "2024-12-07T08:50:44+00:00" }, { "name": "symfony/event-dispatcher", @@ -9147,16 +9147,16 @@ }, { "name": "symfony/http-client-contracts", - "version": "v3.5.1", + "version": "v3.5.2", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "c2f3ad828596624ca39ea40f83617ef51ca8bbf9" + "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/c2f3ad828596624ca39ea40f83617ef51ca8bbf9", - "reference": "c2f3ad828596624ca39ea40f83617ef51ca8bbf9", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ee8d807ab20fcb51267fdace50fbe3494c31e645", + "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645", "shasum": "" }, "require": { @@ -9205,7 +9205,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.2" }, "funding": [ { @@ -9221,7 +9221,7 @@ "type": "tidelift" } ], - "time": "2024-11-25T12:02:18+00:00" + "time": "2024-12-07T08:49:48+00:00" }, { "name": "symfony/http-foundation", From 2b08c05283aa24e124863bfcdeb1e9622dbd20aa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 18:18:01 +0000 Subject: [PATCH 2/9] Update dependency caniuse-lite to v1.0.30001688 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 36c220e73..143a6f9f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "dependencies": { "@sentry/vue": "8.42.0", "axios": "1.7.9", - "caniuse-lite": "1.0.30001687", + "caniuse-lite": "1.0.30001688", "chartist": "0.11.4", "chartist-plugin-legend": "0.6.2", "chartist-plugin-pointlabels": "0.0.6", @@ -4113,9 +4113,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001687", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz", - "integrity": "sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==", + "version": "1.0.30001688", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001688.tgz", + "integrity": "sha512-Nmqpru91cuABu/DTCXbM2NSRHzM2uVHfPnhJ/1zEAJx/ILBRVmz3pzH4N7DZqbdG0gWClsCC05Oj0mJ/1AWMbA==", "funding": [ { "type": "opencollective", diff --git a/package.json b/package.json index d8a463d27..01e8a054f 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "dependencies": { "@sentry/vue": "8.42.0", "axios": "1.7.9", - "caniuse-lite": "1.0.30001687", + "caniuse-lite": "1.0.30001688", "chartist": "0.11.4", "chartist-plugin-legend": "0.6.2", "chartist-plugin-pointlabels": "0.0.6", From 161f7e8f07d79f09d0badfe9ec39af1f2f14a564 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 17:31:40 +0000 Subject: [PATCH 3/9] Update dependency laravel/framework to v11.35.1 --- composer.json | 2 +- composer.lock | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index 83ccbf019..f2282067e 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.35.0", + "laravel/framework": "11.35.1", "laravel/horizon": "5.30.0", "laravel/nova": "4.35.5", "laravel/passport": "12.3.1", diff --git a/composer.lock b/composer.lock index eb7efc1d5..1a3480218 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": "ab075653b8f41813eba7344ffc41fe45", + "content-hash": "c3e0cfac9e7bdea7473ee3214df50fec", "packages": [ { "name": "ans-group/laravel-health-check", @@ -3031,16 +3031,16 @@ }, { "name": "laravel/framework", - "version": "v11.35.0", + "version": "v11.35.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "f1a7aaa3c1235b7a95ccaa58db90e0cd9d8c3fcc" + "reference": "dcfa130ede1a6fa4343dc113410963e791ad34fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/f1a7aaa3c1235b7a95ccaa58db90e0cd9d8c3fcc", - "reference": "f1a7aaa3c1235b7a95ccaa58db90e0cd9d8c3fcc", + "url": "https://api.github.com/repos/laravel/framework/zipball/dcfa130ede1a6fa4343dc113410963e791ad34fb", + "reference": "dcfa130ede1a6fa4343dc113410963e791ad34fb", "shasum": "" }, "require": { @@ -3242,7 +3242,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-12-10T16:09:29+00:00" + "time": "2024-12-12T18:25:58+00:00" }, { "name": "laravel/horizon", @@ -9303,16 +9303,16 @@ }, { "name": "symfony/http-kernel", - "version": "v7.2.0", + "version": "v7.2.1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6b4722a25e0aed1ccb4914b9bcbd493cc4676b4d" + "reference": "d8ae58eecae44c8e66833e76cc50a4ad3c002d97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6b4722a25e0aed1ccb4914b9bcbd493cc4676b4d", - "reference": "6b4722a25e0aed1ccb4914b9bcbd493cc4676b4d", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d8ae58eecae44c8e66833e76cc50a4ad3c002d97", + "reference": "d8ae58eecae44c8e66833e76cc50a4ad3c002d97", "shasum": "" }, "require": { @@ -9397,7 +9397,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.2.0" + "source": "https://github.com/symfony/http-kernel/tree/v7.2.1" }, "funding": [ { @@ -9413,7 +9413,7 @@ "type": "tidelift" } ], - "time": "2024-11-29T08:42:40+00:00" + "time": "2024-12-11T12:09:10+00:00" }, { "name": "symfony/mailer", @@ -9497,16 +9497,16 @@ }, { "name": "symfony/mime", - "version": "v7.2.0", + "version": "v7.2.1", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "cc84a4b81f62158c3846ac7ff10f696aae2b524d" + "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/cc84a4b81f62158c3846ac7ff10f696aae2b524d", - "reference": "cc84a4b81f62158c3846ac7ff10f696aae2b524d", + "url": "https://api.github.com/repos/symfony/mime/zipball/7f9617fcf15cb61be30f8b252695ed5e2bfac283", + "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283", "shasum": "" }, "require": { @@ -9561,7 +9561,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v7.2.0" + "source": "https://github.com/symfony/mime/tree/v7.2.1" }, "funding": [ { @@ -9577,7 +9577,7 @@ "type": "tidelift" } ], - "time": "2024-11-23T09:19:39+00:00" + "time": "2024-12-07T08:50:44+00:00" }, { "name": "symfony/options-resolver", From 0b44b6286f9261b00e281ad7a5aa48ebfb08b188 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 19:59:32 +0000 Subject: [PATCH 4/9] Update dependency spatie/laravel-responsecache to v7.6.3 --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index f2282067e..6bc00a819 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,7 @@ "spatie/laravel-csp": "2.10.1", "spatie/laravel-failed-job-monitor": "4.3.2", "spatie/laravel-permission": "6.10.1", - "spatie/laravel-responsecache": "7.6.2", + "spatie/laravel-responsecache": "7.6.3", "spatie/laravel-webhook-client": "3.4.2", "square/square": "38.2.0.20241017", "subfission/cas": "5.1.0", diff --git a/composer.lock b/composer.lock index 1a3480218..302e950e9 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": "c3e0cfac9e7bdea7473ee3214df50fec", + "content-hash": "bb20b3f081cb223f3883ca0b90eb6e32", "packages": [ { "name": "ans-group/laravel-health-check", @@ -8172,16 +8172,16 @@ }, { "name": "spatie/laravel-responsecache", - "version": "7.6.2", + "version": "7.6.3", "source": { "type": "git", "url": "https://github.com/spatie/laravel-responsecache.git", - "reference": "2604409809f575511a4cc9333482a52a9e912358" + "reference": "713c56862b2e9145caa659aec19b1077d474064d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-responsecache/zipball/2604409809f575511a4cc9333482a52a9e912358", - "reference": "2604409809f575511a4cc9333482a52a9e912358", + "url": "https://api.github.com/repos/spatie/laravel-responsecache/zipball/713c56862b2e9145caa659aec19b1077d474064d", + "reference": "713c56862b2e9145caa659aec19b1077d474064d", "shasum": "" }, "require": { @@ -8239,7 +8239,7 @@ "spatie" ], "support": { - "source": "https://github.com/spatie/laravel-responsecache/tree/7.6.2" + "source": "https://github.com/spatie/laravel-responsecache/tree/7.6.3" }, "funding": [ { @@ -8251,7 +8251,7 @@ "type": "github" } ], - "time": "2024-12-09T15:33:20+00:00" + "time": "2024-12-11T15:21:42+00:00" }, { "name": "spatie/laravel-webhook-client", From 46072515ff8470479f6c3e4b5bdb3b5e668cefbf Mon Sep 17 00:00:00 2001 From: Kristaps Berzinch Date: Sat, 14 Dec 2024 11:34:45 -0500 Subject: [PATCH 5/9] Use dedicated Redis service --- .nomad/apiary.nomad | 95 ++++++++++++++++++++++++++++++++++++++++++++ .nomad/conf/.env.tpl | 14 +++---- .nomad/conf/www.conf | 4 +- 3 files changed, 103 insertions(+), 10 deletions(-) diff --git a/.nomad/apiary.nomad b/.nomad/apiary.nomad index e8683a11a..ba69169fd 100644 --- a/.nomad/apiary.nomad +++ b/.nomad/apiary.nomad @@ -75,6 +75,10 @@ job "apiary" { type = "service" group "apiary" { + network { + port "resp" {} + } + volume "run" { type = "host" source = "run" @@ -378,6 +382,97 @@ EOF } } } + + dynamic "task" { + for_each = var.run_background_containers ? ["redis"] : [] + + labels = [task.value] + + content { + driver = "docker" + + lifecycle { + hook = "prestart" + sidecar = true + } + + config { + image = "redis" + + args = [ + "/usr/local/etc/redis/redis.conf" + ] + + force_pull = true + + network_mode = "host" + + mount { + type = "bind" + source = "secrets/" + target = "/usr/local/etc/redis/" + } + } + + resources { + cpu = 100 + memory = 256 + memory_max = 2048 + } + + template { + data = < Date: Sat, 14 Dec 2024 11:42:00 -0500 Subject: [PATCH 6/9] Fix PHPStan ignores --- phpstan.neon | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index c481db9ed..beebb7290 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -33,18 +33,17 @@ parameters: - '#Access to an undefined property Illuminate\\Database\\Eloquent\\Model::\$[a-zA-Z_]+\.#' - '#Access to an undefined property Laravel\\Nova\\Fields\\ActionFields::\$[a-zA-Z_]+\.#' - '#Access to an undefined property Laravel\\Nova\\Fields\\FormData::\$travel\.#' - - '#Access to an undefined property Laravel\\Passport\\Token::\$expires_at\.#' - '#Access to an undefined property object::\$[a-zA-Z_]+\.#' - '#Access to an undefined property Spatie\\Permission\\Contracts\\Permission::\$id\.#' - '#Access to an undefined property Spatie\\Permission\\Contracts\\Permission::\$name\.#' - '#Access to an undefined property Spatie\\Permission\\Contracts\\Role::\$id\.#' - '#Access to an undefined property Spatie\\Permission\\Contracts\\Role::\$name\.#' - '#Access to undefined constant Illuminate\\Database\\Eloquent\\Model::DO_NOT_FILTER_ON\.#' + - '#Access to undefined constant object::RELATIONSHIP_PERMISSIONS\.#' - '#Access to undefined constant static\(App\\Nova\\Actions\\Payments\\RecordPayment\)::METHOD\.#' - '#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\(\)\.#' @@ -61,7 +60,6 @@ parameters: - '#Cannot call method (?:pluck|count|contains|first)\(\) on array|Illuminate\\Database\\Eloquent\\Collection\.#' - '#Cannot call method [a-zA-Z]+\(\) on App\\Models\\[a-zA-Z]+\|null\.#' - '#Cannot call method [a-zA-Z_]+\(\) on mixed\.#' - - '#Cannot call method format\(\) on Illuminate\\Support\\Carbon\|null\.#' - '#Cannot call method format\(\) on string\.#' - '#Cannot call method getMorphClass\(\) on App\\Models\\Event|App\\Models\\Team\|null\.#' - '#Cannot call method members\(\) on App\\Models\\[a-zA-Z]+|Illuminate\\Database\\Eloquent\\Collection\|null\.#' @@ -92,6 +90,7 @@ parameters: - '#Method App\\Models\\User::duesPackages\(\) should return Illuminate\\Database\\Eloquent\\Relations\\HasManyThrough but returns Illuminate\\Database\\Eloquent\\Relations\\HasManyThrough\.#' - '#Method App\\Models\\User::merchandise\(\) should return Illuminate\\Database\\Eloquent\\Relations\\HasManyThrough but returns Illuminate\\Database\\Eloquent\\Relations\\HasManyThrough\.#' - '#Method App\\Models\\User::novaNotifications\(\) should return Illuminate\\Database\\Eloquent\\Relations\\MorphMany but returns Illuminate\\Database\\Eloquent\\Relations\\MorphMany\.#' + - '#Method App\\Notifiables\\[a-zA-Z]+::routeNotificationFor[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\.#' @@ -111,13 +110,9 @@ parameters: - '#Only booleans are allowed in a negated boolean, bool\|string given\.#' - '#Only booleans are allowed in a negated boolean, Illuminate\\Support\\Carbon\|null given\.#' - '#Only booleans are allowed in a ternary operator condition, Illuminate\\Support\\Carbon\|null given\.#' - - '#Parameter \#1 ...\$addresses of method Symfony\\Component\\Mime\\Email::replyTo\(\) expects string\|Symfony\\Component\\Mime\\Address, mixed given\.#' - - '#Parameter \#1 \$address of method Illuminate\\Mail\\Mailable::cc\(\) expects array\|object\|string, mixed given\.#' - - '#Parameter \#1 \$address of method Illuminate\\Mail\\Mailable::replyTo\(\) expects array\|object\|string, mixed given\.#' - '#Parameter \#1 \$assignment of class App\\Mail\\DocuSign\\Travel constructor expects App\\Models\\TravelAssignment, mixed given\.#' - '#Parameter \#1 \$assignment of class App\\Notifications\\Travel\\TravelAssignmentCreated constructor expects App\\Models\\TravelAssignment, mixed given\.#' - '#Parameter \#1 \$assignment of class App\\Notifications\\Travel\\TravelAssignmentReminder constructor expects App\\Models\\TravelAssignment, mixed given\.#' - - '#Parameter \#1 \$assignment of job class App\\Jobs\\SendTravelAssignmentReminder constructor expects App\\Models\\TravelAssignment in App\\Jobs\\SendTravelAssignmentReminder::dispatch\(\), App\\Models\\DuesTransaction\|App\\Models\\TravelAssignment given\.#' - '#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\.#' @@ -148,6 +143,7 @@ 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\.#' @@ -167,12 +163,14 @@ parameters: - '#Parameter \#1 \$resourceId of class App\\Nova\\Actions\\DistributeMerchandise constructor expects string\|null, mixed given\.#' - '#Parameter \#1 \$security_domain of method DocuSign\\eSign\\Model\\RecipientViewRequest::setSecurityDomain\(\) expects string\|null, mixed given\.#' - '#Parameter \#1 \$string of function base64_encode expects string, string\|false given\.#' + - '#Parameter \#1 \$string of function strtolower expects string, string\|null given\.#' - '#Parameter \#1 \$string of function substr expects string, mixed given\.#' - '#Parameter \#1 \$string of function ucfirst expects string, mixed given\.#' - '#Parameter \#1 \$string of static method Illuminate\\Support\\Str::of\(\) expects string, string\|null given\.#' - '#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, bool\|string 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\.#' @@ -201,10 +199,10 @@ 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\.#' - - '#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\(\)#' - '#Parameter \#2 \$query \(Illuminate\\Database\\Eloquent\\Builder\) of method App\\Nova\\[a-zA-Z]+::relatableQuery\(\) should be contravariant with parameter \$query \(Illuminate\\Database\\Eloquent\\Builder\) of method Laravel\\Nova\\Resource::relatableQuery\(\)#' @@ -228,7 +226,6 @@ parameters: - '#Parameter \$account_id of method DocuSign\\eSign\\Api\\EnvelopesApi::create[a-zA-Z]+\(\) expects string\|null, mixed given\.#' - '#Parameter \$account_id of method DocuSign\\eSign\\Api\\EnvelopesApi::update\(\) expects string\|null, mixed given\.#' - '#Parameter \$client_id of method DocuSign\\eSign\\Client\\ApiClient::getAuthorizationURI\(\) expects string, mixed given\.#' - - '#Parameter \$to of class Illuminate\\Mail\\Mailables\\Envelope constructor expects array, array given\.#' - '#PHPDoc type array of property App\\Models\\[a-zA-Z]+::\$appends is not covariant with PHPDoc type array of overridden property Illuminate\\Database\\Eloquent\\Model::\$appends\.#' - '#PHPDoc type array of property App\\Models\\[a-zA-Z]+::\$fillable is not covariant with PHPDoc type array of overridden property Illuminate\\Database\\Eloquent\\Model::\$fillable\.#' - '#PHPDoc type array of property App\\Models\\User::\$hidden is not covariant with PHPDoc type array of overridden property Illuminate\\Database\\Eloquent\\Model::\$hidden\.#' From ea25cff8df897464af23eaaddf6445462302691f Mon Sep 17 00:00:00 2001 From: Kristaps Berzinch Date: Sat, 14 Dec 2024 13:50:55 -0500 Subject: [PATCH 7/9] Improve travel help text --- app/Nova/TravelAssignment.php | 3 ++- resources/views/nova/help/travel/assignment/member.blade.php | 1 + resources/views/nova/help/travel/assignment/trip.blade.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 resources/views/nova/help/travel/assignment/member.blade.php diff --git a/app/Nova/TravelAssignment.php b/app/Nova/TravelAssignment.php index c35d25379..e11fa109e 100644 --- a/app/Nova/TravelAssignment.php +++ b/app/Nova/TravelAssignment.php @@ -110,7 +110,8 @@ public function fields(NovaRequest $request): array ->withoutTrashed() ->searchable() ->rules('required', 'unique:travel_assignments,user_id,NULL,id,travel_id,'.$request->travel) - ->readonly(static fn (NovaRequest $request): bool => $request->editMode === 'update'), + ->readonly(static fn (NovaRequest $request): bool => $request->editMode === 'update') + ->help(view('nova.help.travel.assignment.member')->render()), BelongsTo::make('Trip', 'travel', Travel::class) ->withoutTrashed() diff --git a/resources/views/nova/help/travel/assignment/member.blade.php b/resources/views/nova/help/travel/assignment/member.blade.php new file mode 100644 index 000000000..5f1e6ce5a --- /dev/null +++ b/resources/views/nova/help/travel/assignment/member.blade.php @@ -0,0 +1 @@ +Only members that have recently paid dues are shown here by default. If you need to create an assignment for a member that hasn't paid dues, go to their user details page and click Create Trip Assignment there. diff --git a/resources/views/nova/help/travel/assignment/trip.blade.php b/resources/views/nova/help/travel/assignment/trip.blade.php index 910698344..7a01750e5 100644 --- a/resources/views/nova/help/travel/assignment/trip.blade.php +++ b/resources/views/nova/help/travel/assignment/trip.blade.php @@ -1 +1 @@ -Only upcoming trips are shown here by default. If you need to create an assignment for a past trip, go to the trip details page and click Create Trip Assignment there. +Only upcoming trips in draft status are shown here by default. If you need to create an assignment for a past trip, go to the trip details page and click Create Trip Assignment there. From 9aaab2624b5be551d800d0ae8654ef3a7a50a07c Mon Sep 17 00:00:00 2001 From: Kristaps Berzinch Date: Sat, 14 Dec 2024 14:13:46 -0500 Subject: [PATCH 8/9] More specific subtitle for single-semester dues --- app/Nova/User.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Nova/User.php b/app/Nova/User.php index 5a690a383..c5e669dd6 100644 --- a/app/Nova/User.php +++ b/app/Nova/User.php @@ -807,8 +807,8 @@ public function subtitle(): ?string $lastPaidTransact = $paidTransactions->last(); if ($firstPaidTransact !== null && $lastPaidTransact !== null) { - $firstYear = (new Carbon($firstPaidTransact->effective_start, 'America/New_York'))->year; - $lastYear = (new Carbon($lastPaidTransact->effective_end, 'America/New_York'))->year; + $firstYear = (new Carbon($firstPaidTransact->effective_start, 'America/New_York'))->addMonth()->year; + $lastYear = (new Carbon($lastPaidTransact->effective_end, 'America/New_York'))->subMonth()->year; return $firstYear === $lastYear ? 'Member '.$firstYear : 'Member '.$firstYear.'-'.$lastYear; } From ea994d2159def138c1cc0b10699871c9060af13d Mon Sep 17 00:00:00 2001 From: Kristaps Berzinch Date: Sat, 14 Dec 2024 14:14:24 -0500 Subject: [PATCH 9/9] Don't record action event for Matrix airfare search Fixes #4917 --- app/Nova/Actions/MatrixAirfareSearch.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Nova/Actions/MatrixAirfareSearch.php b/app/Nova/Actions/MatrixAirfareSearch.php index 99882d746..47938b1d5 100644 --- a/app/Nova/Actions/MatrixAirfareSearch.php +++ b/app/Nova/Actions/MatrixAirfareSearch.php @@ -22,6 +22,13 @@ class MatrixAirfareSearch extends Action { + /** + * Disables action log events for this action. + * + * @var bool + */ + public $withoutActionEvents = true; + /** * The text to be used for the action's confirm button. *