From 7e96da91865edeb196165db2170fb9ea1e21f6ed Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Mon, 10 Jun 2024 16:15:14 -0400 Subject: [PATCH] Update to laravel 11.1.1 --- .gitignore | 1 + .laravel-commit | 2 +- composer.json | 4 ++-- config/cache.php | 2 +- config/filesystems.php | 2 +- config/logging.php | 2 +- config/mail.php | 17 +++++++++++++++-- config/services.php | 4 ++++ config/session.php | 1 - readme.md | 2 +- 10 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index dd2325b..a019a03 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .env .env.backup .env.production +.phpactor.json auth.json npm-debug.log yarn-error.log diff --git a/.laravel-commit b/.laravel-commit index a2775ff..e459df8 100644 --- a/.laravel-commit +++ b/.laravel-commit @@ -1 +1 @@ -58baff2c70144c7cd4c04eecb51fee5a24e873a8 +ad38e564ac871505e2fa829004cc45848b8b85e5 diff --git a/composer.json b/composer.json index aaa3259..6f39e82 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "erusev/parsedown": "^1.7.4", "guzzlehttp/guzzle": "^7.8", "intervention/image-laravel": "^1.2", - "laravel/framework": "^11.0", + "laravel/framework": "^11.9", "laravel/helpers": "^1.7", "laravel/sanctum": "^4.0", "laravel/tinker": "^2.9", @@ -23,7 +23,7 @@ "laravel/sail": "^1.26", "mockery/mockery": "^1.6", "nunomaduro/collision": "^8.0", - "phpunit/phpunit": "^11.0", + "phpunit/phpunit": "^11.0.1", "spatie/laravel-ignition": "^2.4" }, "autoload": { diff --git a/config/cache.php b/config/cache.php index 3868091..6b57b18 100644 --- a/config/cache.php +++ b/config/cache.php @@ -26,7 +26,7 @@ return [ | well as their drivers. You may even define multiple stores for the | same cache driver to group types of items stored in your caches. | - | Supported drivers: "apc", "array", "database", "file", "memcached", + | Supported drivers: "array", "database", "file", "memcached", | "redis", "dynamodb", "octane", "null" | */ diff --git a/config/filesystems.php b/config/filesystems.php index 44fe9c8..c5f244d 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -24,7 +24,7 @@ return [ | may even configure multiple disks for the same driver. Examples for | most supported storage drivers are configured here for reference. | - | Supported Drivers: "local", "ftp", "sftp", "s3" + | Supported drivers: "local", "ftp", "sftp", "s3" | */ diff --git a/config/logging.php b/config/logging.php index d526b64..8d94292 100644 --- a/config/logging.php +++ b/config/logging.php @@ -45,7 +45,7 @@ return [ | utilizes the Monolog PHP logging library, which includes a variety | of powerful log handlers and formatters that you're free to use. | - | Available Drivers: "single", "daily", "slack", "syslog", + | Available drivers: "single", "daily", "slack", "syslog", | "errorlog", "monolog", "custom", "stack" | */ diff --git a/config/mail.php b/config/mail.php index a4a02fe..df13d3d 100644 --- a/config/mail.php +++ b/config/mail.php @@ -30,7 +30,8 @@ return [ | your mailers below. You may also add additional mailers if needed. | | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2", - | "postmark", "log", "array", "failover", "roundrobin" + | "postmark", "resend", "log", "array", + | "failover", "roundrobin" | */ @@ -45,7 +46,7 @@ return [ 'username' => env('MAIL_USERNAME'), 'password' => env('MAIL_PASSWORD'), 'timeout' => null, - 'local_domain' => env('MAIL_EHLO_DOMAIN'), + 'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url(env('APP_URL', 'http://localhost'), PHP_URL_HOST)), ], 'ses' => [ @@ -60,6 +61,10 @@ return [ // ], ], + 'resend' => [ + 'transport' => 'resend', + ], + 'sendmail' => [ 'transport' => 'sendmail', 'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'), @@ -82,6 +87,14 @@ return [ ], ], + 'roundrobin' => [ + 'transport' => 'roundrobin', + 'mailers' => [ + 'ses', + 'postmark', + ], + ], + ], /* diff --git a/config/services.php b/config/services.php index 6bb68f6..27a3617 100644 --- a/config/services.php +++ b/config/services.php @@ -24,6 +24,10 @@ return [ 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], + 'resend' => [ + 'key' => env('RESEND_KEY'), + ], + 'slack' => [ 'notifications' => [ 'bot_user_oauth_token' => env('SLACK_BOT_USER_OAUTH_TOKEN'), diff --git a/config/session.php b/config/session.php index 49d456c..5a8b50e 100644 --- a/config/session.php +++ b/config/session.php @@ -125,7 +125,6 @@ return [ | the framework. Typically, you should not need to change this value | since doing so does not grant a meaningful security improvement. | - | */ 'cookie' => env( diff --git a/readme.md b/readme.md index 8253adf..4cc9dc6 100644 --- a/readme.md +++ b/readme.md @@ -21,7 +21,7 @@ A Hypothetical website template for bootstrapping new projects. * Gsap * Gulp * Jquery -* Laravel 11.0.5 +* Laravel 11.1.1 * Sass * Vue 3 (Optional)