[10.x] PHP 8.5 Compatibility

.github/workflows/strict-tests.yaml

@@ -29,6 +29,10 @@ jobs:
           - "~12.4.0"
         experimental:
           - false
+        include:
+          - php: 8.5
+            phpunit: "~12.4.0"
+            experimental: false
         exclude:
           - php: 8.2
             phpunit: "~12.0.0"

.github/workflows/tests.yaml

@@ -35,6 +35,17 @@ jobs:
           - "lowest"
         experimental:
           - false
+        include:
+          - php: 8.5
+            os: "ubuntu-latest"
+            phpunit: "~12.4.0"
+            dependencies: "highest"
+            experimental: false
+          - php: 8.5
+            os: "windows-latest"
+            phpunit: "~12.4.0"
+            dependencies: "highest"
+            experimental: false
         exclude:
           - php: 8.2
             phpunit: "~12.0.0"

composer.json

@@ -44,7 +44,7 @@
     },
     "require-dev": {
         "fakerphp/faker": "^1.24",
-        "laravel/framework": "^12.28.0",
+        "laravel/framework": "dev-12/pdo-features as 12.999.999",
         "laravel/pint": "^1.24",
         "laravel/serializable-closure": "^1.3|^2.0.4",
         "mockery/mockery": "^1.6.10",

laravel/config/database.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Database\Connectors\MariaDbConnector;
+use Illuminate\Database\Connectors\MySqlConnector;
 use Illuminate\Support\Str;
 
 return [
@@ -60,9 +62,9 @@
             'prefix_indexes' => true,
             'strict' => true,
             'engine' => null,
-            'options' => extension_loaded('pdo_mysql') ? array_filter([
-                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
-            ]) : [],
+            'options' => MySqlConnector::features([
+                'ATTR_SSL_CA' => env('MYSQL_ATTR_SSL_CA'),
+            ]),
         ],
 
         'mariadb' => [
@@ -80,9 +82,9 @@
             'prefix_indexes' => true,
             'strict' => true,
             'engine' => null,
-            'options' => extension_loaded('pdo_mysql') ? array_filter([
-                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
-            ]) : [],
+            'options' => MariaDbConnector::features([
+                'ATTR_SSL_CA' => env('MYSQL_ATTR_SSL_CA'),
+            ]),
         ],
 
         'pgsql' => [

laravel/config/queue.php

@@ -24,7 +24,8 @@
     | used by your application. An example configuration is provided for
     | each backend supported by Laravel. You're also free to add more.
     |
-    | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
+    | Drivers: "sync", "database", "beanstalkd", "sqs", "redis",
+    |          "deferred", "failover", "null"
     |
     */
 
@@ -72,6 +73,18 @@
             'after_commit' => false,
         ],
 
+        'deferred' => [
+            'driver' => 'deferred',
+        ],
+
+        'failover' => [
+            'driver' => 'failover',
+            'connections' => [
+                'database',
+                'deferred',
+            ],
+        ],
+
     ],
 
     /*