laravel · KIKOmanasijev · Feb 19, 2025 · Feb 19, 2025 · Feb 19, 2025 · Feb 19, 2025
diff --git a/.github/workflows/databases-nightly.yml b/.github/workflows/databases-nightly.yml
@@ -36,7 +36,7 @@ jobs:
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3
@@ -82,7 +82,7 @@ jobs:
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3

diff --git a/.github/workflows/databases.yml b/.github/workflows/databases.yml
@@ -40,7 +40,7 @@ jobs:
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3
@@ -87,7 +87,7 @@ jobs:
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3
@@ -133,7 +133,7 @@ jobs:
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3
@@ -180,7 +180,7 @@ jobs:
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3
@@ -229,7 +229,7 @@ jobs:
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3
@@ -276,7 +276,7 @@ jobs:
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3
@@ -324,7 +324,7 @@ jobs:
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3
@@ -363,7 +363,7 @@ jobs:
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3

diff --git a/.github/workflows/facades.yml b/.github/workflows/facades.yml
@@ -26,13 +26,13 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: :php-psr
           tools: composer:v2
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3

diff --git a/.github/workflows/queues.yml b/.github/workflows/queues.yml
@@ -23,13 +23,13 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
           tools: composer:v2
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3
@@ -58,13 +58,13 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
           tools: composer:v2
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3
@@ -106,13 +106,13 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
           tools: composer:v2
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3
@@ -144,13 +144,13 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
           tools: composer:v2
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3
@@ -182,9 +182,9 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - php: 8.2
-            pheanstalk: 5
           - php: 8.3
+            pheanstalk: 5
+          - php: 8.4
             pheanstalk: 7
 
     name: Beanstalkd Driver (pda/pheanstalk:^${{ matrix.pheanstalk }})
@@ -209,7 +209,7 @@ jobs:
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -25,12 +25,12 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           tools: composer:v2
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -39,14 +39,9 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3, 8.4]
+        php: [8.3, 8.4]
         phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.2.0']
         stability: [prefer-lowest, prefer-stable]
-        exclude:
-          - php: 8.2
-            phpunit: '12.0.0'
-          - php: 8.2
-            phpunit: '12.2.0'
         include:
           - php: 8.3
             phpunit: '12.1.0'
@@ -71,7 +66,7 @@ jobs:
           REDIS_LIBS: liblz4-dev, liblzf-dev, libzstd-dev
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3
@@ -104,14 +99,9 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3, 8.4]
+        php: [8.3, 8.4]
         phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.1.0']
         stability: [prefer-lowest, prefer-stable]
-        exclude:
-          - php: 8.2
-            phpunit: '12.0.0'
-          - php: 8.2
-            phpunit: '12.1.0'
 
     name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} - Windows
 
@@ -133,7 +123,7 @@ jobs:
           coverage: none
 
       - name: Set Framework version
-        run: composer config version "12.x-dev"
+        run: composer config version "13.x-dev"
 
       - name: Install dependencies
         uses: nick-fields/retry@v3

diff --git a/bin/split.sh b/bin/split.sh
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-CURRENT_BRANCH="12.x"
+CURRENT_BRANCH="master"
 
 function split()
 {

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-ctype": "*",
         "ext-filter": "*",
         "ext-hash": "*",
@@ -44,18 +44,17 @@
         "psr/log": "^1.0|^2.0|^3.0",
         "psr/simple-cache": "^1.0|^2.0|^3.0",
         "ramsey/uuid": "^4.7",
-        "symfony/console": "^7.2.0",
-        "symfony/error-handler": "^7.2.0",
-        "symfony/finder": "^7.2.0",
-        "symfony/http-foundation": "^7.2.0",
-        "symfony/http-kernel": "^7.2.0",
-        "symfony/mailer": "^7.2.0",
-        "symfony/mime": "^7.2.0",
-        "symfony/polyfill-php83": "^1.31",
-        "symfony/process": "^7.2.0",
-        "symfony/routing": "^7.2.0",
-        "symfony/uid": "^7.2.0",
-        "symfony/var-dumper": "^7.2.0",
+        "symfony/console": "^7.4.0|^8.0.0",
+        "symfony/error-handler": "^7.4.0|^8.0.0",
+        "symfony/finder": "^7.4.0|^8.0.0",
+        "symfony/http-foundation": "^7.4.0|^8.0.0",
+        "symfony/http-kernel": "^7.4.0|^8.0.0",
+        "symfony/mailer": "^7.4.0|^8.0.0",
+        "symfony/mime": "^7.4.0|^8.0.0",
+        "symfony/process": "^7.4.0|^8.0.0",
+        "symfony/routing": "^7.4.0|^8.0.0",
+        "symfony/uid": "^7.4.0|^8.0.0",
+        "symfony/var-dumper": "^7.4.0|^8.0.0",
         "tijsverkoyen/css-to-inline-styles": "^2.2.5",
         "vlucas/phpdotenv": "^5.6.1",
         "voku/portable-ascii": "^2.0.2"
@@ -111,17 +110,17 @@
         "league/flysystem-read-only": "^3.25.1",
         "league/flysystem-sftp-v3": "^3.25.1",
         "mockery/mockery": "^1.6.10",
-        "orchestra/testbench-core": "^10.0.0",
+        "orchestra/testbench-core": "^11.0.0",
         "pda/pheanstalk": "^5.0.6|^7.0.0",
         "php-http/discovery": "^1.15",
         "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^10.5.35|^11.5.3|^12.0.1",
         "predis/predis": "^2.3|^3.0",
         "resend/resend-php": "^0.10.0",
-        "symfony/cache": "^7.2.0",
-        "symfony/http-client": "^7.2.0",
-        "symfony/psr-http-message-bridge": "^7.2.0",
-        "symfony/translation": "^7.2.0"
+        "symfony/cache": "^7.4.0|^8.0.0",
+        "symfony/http-client": "^7.4.0|^8.0.0",
+        "symfony/psr-http-message-bridge": "^7.4.0|^8.0.0",
+        "symfony/translation": "^7.4.0"
     },
     "conflict": {
         "tightenco/collect": "<5.5.33"
@@ -161,7 +160,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "12.x-dev"
+            "dev-master": "13.0.x-dev"
         }
     },
     "suggest": {
@@ -193,12 +192,12 @@
         "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.2).",
-        "symfony/filesystem": "Required to enable support for relative symbolic links (^7.2).",
-        "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.2).",
-        "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.2).",
-        "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.2).",
-        "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.2)."
+        "symfony/cache": "Required to PSR-6 cache bridge (^7.4|^8.0).",
+        "symfony/filesystem": "Required to enable support for relative symbolic links (^7.4|^8.0).",
+        "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.4|^8.0).",
+        "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.4|^8.0).",
+        "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.4|^8.0).",
+        "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.4|^8.0)."
     },
     "config": {
         "sort-packages": true,

diff --git a/config/cache.php b/config/cache.php
@@ -103,6 +103,6 @@
     |
     */
 
-    'prefix' => env('CACHE_PREFIX', Str::slug((string) env('APP_NAME', 'laravel'), '_').'_cache_'),
+    'prefix' => env('CACHE_PREFIX', Str::slug((string) env('APP_NAME', 'laravel')).'-cache-'),
 
 ];
diff --git a/config/database.php b/config/database.php
@@ -148,7 +148,7 @@
 
         'options' => [
             'cluster' => env('REDIS_CLUSTER', 'redis'),
-            'prefix' => env('REDIS_PREFIX', Str::slug((string) env('APP_NAME', 'laravel'), '_').'_database_'),
+            'prefix' => env('REDIS_PREFIX', Str::slug((string) env('APP_NAME', 'laravel')).'-database-'),
             'persistent' => env('REDIS_PERSISTENT', false),
         ],
 

diff --git a/config/session.php b/config/session.php
@@ -129,7 +129,7 @@
 
     'cookie' => env(
         'SESSION_COOKIE',
-        Str::slug((string) env('APP_NAME', 'laravel'), '_').'_session'
+        Str::snake((string) env('APP_NAME', 'laravel')).'_session'
     ),
 
     /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     set -e
     set -x
-    CURRENT_BRANCH="12.x"
+    CURRENT_BRANCH="master"
     function split()
     {
@@ Expand Down @@