Upgrade to Carbon v3

.github/workflows/databases.yml

@@ -16,7 +16,7 @@ jobs:
         image: mysql:5.7
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: forge
+          MYSQL_DATABASE: laravel
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
@@ -51,7 +51,6 @@ jobs:
         run: vendor/bin/phpunit tests/Integration/Database
         env:
           DB_CONNECTION: mysql
-          DB_USERNAME: root
           MYSQL_COLLATION: utf8mb4_unicode_ci
 
   mysql_8:
@@ -62,7 +61,7 @@ jobs:
         image: mysql:8
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: forge
+          MYSQL_DATABASE: laravel
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
@@ -97,7 +96,6 @@ jobs:
         run: vendor/bin/phpunit tests/Integration/Database
         env:
           DB_CONNECTION: mysql
-          DB_USERNAME: root
 
   mariadb:
     runs-on: ubuntu-22.04
@@ -107,7 +105,7 @@ jobs:
         image: mariadb:10
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: forge
+          MYSQL_DATABASE: laravel
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
@@ -142,7 +140,6 @@ jobs:
         run: vendor/bin/phpunit tests/Integration/Database
         env:
           DB_CONNECTION: mariadb
-          DB_USERNAME: root
 
   pgsql:
     runs-on: ubuntu-22.04
@@ -151,7 +148,7 @@ jobs:
       postgresql:
         image: postgres:14
         env:
-          POSTGRES_DB: forge
+          POSTGRES_DB: laravel
           POSTGRES_USER: forge
           POSTGRES_PASSWORD: password
         ports:
@@ -188,6 +185,7 @@ jobs:
         run: vendor/bin/phpunit tests/Integration/Database
         env:
           DB_CONNECTION: pgsql
+          DB_USERNAME: forge
           DB_PASSWORD: password
 
   mssql:

.github/workflows/pull-requests.yml

@@ -8,5 +8,5 @@ permissions:
   pull-requests: write
 
 jobs:
-  uneditable:
+  pull-requests:
     uses: laravel/.github/.github/workflows/pull-requests.yml@main

.github/workflows/tests.yml

@@ -40,9 +40,10 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.2, 8.3]
+        phpunit: ['10.5', '11.0']
         stability: [prefer-lowest, prefer-stable]
 
-    name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
+    name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
@@ -69,6 +70,22 @@ jobs:
           max_attempts: 5
           command: composer require guzzlehttp/psr7:^2.4 --no-interaction --no-update
 
+      # TODO: Remove this step once Carbon 3 tagged as stable
+      - name: Test Carbon 3
+        if: matrix.stability == 'prefer-stable'
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer require nesbot/carbon:^3.0.0-beta.3@beta --no-interaction --no-update
+
+      - name: Set PHPUnit
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer require phpunit/phpunit:^${{ matrix.phpunit }} --dev --no-interaction --no-update
+
       - name: Install dependencies
         uses: nick-fields/retry@v2
         with:
@@ -101,9 +118,10 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.2, 8.3]
+        phpunit: ['10.5', '11.0']
         stability: [prefer-lowest, prefer-stable]
 
-    name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows
+    name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} - Windows
 
     steps:
       - name: Set git to use LF
@@ -131,6 +149,13 @@ jobs:
           max_attempts: 5
           command: composer require guzzlehttp/psr7:~2.4 --no-interaction --no-update
 
+      - name: Set PHPUnit
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer require phpunit/phpunit:~${{ matrix.phpunit }} --dev --no-interaction --no-update
+
       - name: Install dependencies
         uses: nick-fields/retry@v2
         with:

.styleci.yml

@@ -1,6 +1,6 @@
 php:
   preset: laravel
-  version: 8.1
+  version: 8.2
   finder:
     not-name:
       - bad-syntax-strategy.php

composer.json

@@ -29,13 +29,14 @@
         "dragonmantank/cron-expression": "^3.3.2",
         "egulias/email-validator": "^3.2.1|^4.0",
         "fruitcake/php-cors": "^1.3",
+        "guzzlehttp/guzzle": "^7.8",
         "guzzlehttp/uri-template": "^1.0",
-        "laravel/prompts": "^0.1.12",
+        "laravel/prompts": "^0.1.15",
         "laravel/serializable-closure": "^1.3",
         "league/commonmark": "^2.2.1",
         "league/flysystem": "^3.8.0",
         "monolog/monolog": "^3.0",
-        "nesbot/carbon": "^2.67",
+        "nesbot/carbon": "^2.72.2|^3.0.0-beta.3@beta",
         "nunomaduro/termwind": "^2.0",
         "psr/container": "^1.1.1|^2.0.1",
         "psr/log": "^1.0|^2.0|^3.0",
@@ -90,15 +91,14 @@
         "illuminate/testing": "self.version",
         "illuminate/translation": "self.version",
         "illuminate/validation": "self.version",
-        "illuminate/view": "self.version"
+        "illuminate/view": "self.version",
+        "spatie/once": "*"
     },
     "require-dev": {
         "ext-gmp": "*",
         "ably/ably-php": "^1.0",
         "aws/aws-sdk-php": "^3.235.5",
-        "doctrine/dbal": "^4.0",
         "fakerphp/faker": "^1.23",
-        "guzzlehttp/guzzle": "^7.8",
         "league/flysystem-aws-s3-v3": "^3.0",
         "league/flysystem-ftp": "^3.0",
         "league/flysystem-path-prefixing": "^3.3",
@@ -109,21 +109,20 @@
         "orchestra/testbench-core": "^9.0",
         "pda/pheanstalk": "^5.0",
         "phpstan/phpstan": "^1.4.7",
-        "phpunit/phpunit": "^10.5",
+        "phpunit/phpunit": "^10.5|^11.0",
         "predis/predis": "^2.0.2",
+        "resend/resend-php": "^0.10.0",
         "symfony/cache": "^7.0",
         "symfony/http-client": "^7.0",
         "symfony/psr-http-message-bridge": "^7.0"
     },
+    "conflict": {
+        "tightenco/collect": "<5.5.33"
+    },
     "provide": {
         "psr/container-implementation": "1.1|2.0",
         "psr/simple-cache-implementation": "1.0|2.0|3.0"
     },
-    "conflict": {
-        "carbonphp/carbon-doctrine-types": "<3.0.0|>=4.0",
-        "doctrine/dbal": "<4.0.0|>=5.0",
-        "tightenco/collect": "<5.5.33"
-    },
     "autoload": {
         "files": [
             "src/Illuminate/Collections/helpers.php",
@@ -166,11 +165,9 @@
         "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
         "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
         "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
-        "brianium/paratest": "Required to run tests in parallel (^6.0).",
-        "doctrine/dbal": "Required to rename columns and drop SQLite columns (^4.0).",
+        "brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).",
         "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
         "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
-        "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.8).",
         "laravel/tinker": "Required to use the tinker console command (^2.0).",
         "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
         "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
@@ -180,10 +177,11 @@
         "mockery/mockery": "Required to use mocking (^1.6).",
         "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
         "pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).",
-        "phpunit/phpunit": "Required to use assertions and run tests (^10.5).",
+        "phpunit/phpunit": "Required to use assertions and run tests (^10.5|^11.0).",
         "predis/predis": "Required to use the predis connector (^2.0.2).",
         "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
         "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
+        "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
         "symfony/cache": "Required to PSR-6 cache bridge (^7.0).",
         "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).",
         "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.0).",

config-stubs/app.php

@@ -0,0 +1,146 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Name
+    |--------------------------------------------------------------------------
+    |
+    | This value is the name of your application, which will be used when the
+    | framework needs to place the application's name in a notification or
+    | any other location as required by the application or its packages.
+    |
+    */
+
+    'name' => env('APP_NAME', 'Laravel'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Environment
+    |--------------------------------------------------------------------------
+    |
+    | This value determines the "environment" your application is currently
+    | running in. This may determine how you prefer to configure various
+    | services the application utilizes. Set this in your ".env" file.
+    |
+    */
+
+    'env' => env('APP_ENV', 'production'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Debug Mode
+    |--------------------------------------------------------------------------
+    |
+    | When your application is in debug mode, detailed error messages with
+    | stack traces will be shown on every error that occurs within your
+    | application. If disabled, a simple generic error page is shown.
+    |
+    */
+
+    'debug' => (bool) env('APP_DEBUG', false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application URL
+    |--------------------------------------------------------------------------
+    |
+    | This URL is used by the console to properly generate URLs when using
+    | the Artisan command line tool. You should set this to the root of
+    | your application so that it is used when running Artisan tasks.
+    |
+    */
+
+    'url' => env('APP_URL', 'http://localhost'),
+
+    'frontend_url' => env('FRONTEND_URL', 'http://localhost:3000'),
+
+    'asset_url' => env('ASSET_URL'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Timezone
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the default timezone for your application, which
+    | will be used by the PHP date and date-time functions. The timezone
+    | is set to "UTC" by default as it is suitable for most use cases.
+    |
+    */
+
+    'timezone' => env('APP_TIMEZONE', 'UTC'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Locale Configuration
+    |--------------------------------------------------------------------------
+    |
+    | The application locale determines the default locale that will be used
+    | by the translation service provider. You are free to set this value
+    | to any of the locales which will be supported by the application.
+    |
+    */
+
+    'locale' => env('APP_LOCALE', 'en'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Application Fallback Locale
+    |--------------------------------------------------------------------------
+    |
+    | The fallback locale determines the locale to use when the default one
+    | is not available. You may change the value to correspond to any of
+    | the languages which are currently supported by your application.
+    |
+    */
+
+    'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Faker Locale
+    |--------------------------------------------------------------------------
+    |
+    | This locale will be used by the Faker PHP library when generating fake
+    | data for your database seeds. For example, this will be used to get
+    | localized telephone numbers, street address information and more.
+    |
+    */
+
+    'faker_locale' => env('APP_FAKER_LOCALE', 'en_US'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Encryption Key
+    |--------------------------------------------------------------------------
+    |
+    | This key is utilized by Laravel's encryption services and should be set
+    | to a random, 32 character string to ensure that all encrypted values
+    | are secure. You should do this prior to deploying the application.
+    |
+    */
+
+    'key' => env('APP_KEY'),
+
+    'cipher' => 'AES-256-CBC',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Maintenance Mode Driver
+    |--------------------------------------------------------------------------
+    |
+    | These configuration options determine the driver used to determine and
+    | manage Laravel's "maintenance mode" status. The "cache" driver will
+    | allow maintenance mode to be controlled across multiple machines.
+    |
+    | Supported drivers: "file", "cache"
+    |
+    */
+
+    'maintenance' => [
+        'driver' => env('APP_MAINTENANCE_DRIVER', 'cache'),
+        'store' => env('APP_MAINTENANCE_STORE', 'database'),
+    ],
+
+];

config/app.php

@@ -119,8 +119,8 @@
     |--------------------------------------------------------------------------
     |
     | This key is utilized by Laravel's encryption services and should be set
-    | to a random, 32 character string or all of the encrypted strings are
-    | not secure. You should do this prior to deploying the application.
+    | to a random, 32 character string to ensure that all encrypted values
+    | are secure. You should do this prior to deploying the application.
     |
     */