Skip to content

Commit c17488c

Browse files
Merge pull request #236 from laravel/sync-from-base-v12.11.0-20251209-220044
Sync from base: drift:v12.11.0
2 parents 355d122 + e23fcdb commit c17488c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

config/database.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
'strict' => true,
6060
'engine' => null,
6161
'options' => extension_loaded('pdo_mysql') ? array_filter([
62-
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
62+
(PHP_VERSION_ID >= 80500 ? \Pdo\Mysql::ATTR_SSL_CA : \PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'),
6363
]) : [],
6464
],
6565

@@ -79,7 +79,7 @@
7979
'strict' => true,
8080
'engine' => null,
8181
'options' => extension_loaded('pdo_mysql') ? array_filter([
82-
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
82+
(PHP_VERSION_ID >= 80500 ? \Pdo\Mysql::ATTR_SSL_CA : \PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'),
8383
]) : [],
8484
],
8585

config/session.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
|
153153
| This value determines the domain and subdomains the session cookie is
154154
| available to. By default, the cookie will be available to the root
155-
| domain and all subdomains. Typically, this shouldn't be changed.
155+
| domain without subdomains. Typically, this shouldn't be changed.
156156
|
157157
*/
158158

0 commit comments

Comments
 (0)