From 28a665a08dbb72709e6e9b257aee3937bc88a61d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Jul 2026 08:38:45 +0000 Subject: [PATCH] chore(deps): update phpstan packages & fix issues --- .phpstan.neon | 1 + composer.json | 4 ++-- src/Drivers/PdoMysql/PdoMysqlDriver.php | 14 +++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.phpstan.neon b/.phpstan.neon index 4d23eabe..dd437fc3 100644 --- a/.phpstan.neon +++ b/.phpstan.neon @@ -15,6 +15,7 @@ parameters: - throwErrors reportUnmatchedIgnoredErrors: false + treatPhpDocTypesAsCertain: false ignoreErrors: - diff --git a/composer.json b/composer.json index cf03bea6..23a97944 100644 --- a/composer.json +++ b/composer.json @@ -24,9 +24,9 @@ "nette/neon": "~3.1", "nextras/multi-query-parser": "~2.0", "phpstan/extension-installer": "1.4.3", - "phpstan/phpstan": "2.1.51", + "phpstan/phpstan": "2.2.5", "phpstan/phpstan-deprecation-rules": "2.0.4", - "phpstan/phpstan-strict-rules": "2.0.10", + "phpstan/phpstan-strict-rules": "2.0.11", "symfony/config": "~5.4 || ~6.0 || ~7.0 || ~8.0", "symfony/dependency-injection": "~5.4 || ~6.0 || ~7.0 || ~8.0", "symfony/http-kernel": "~5.4 || ~6.0 || ~7.0 || ~8.0", diff --git a/src/Drivers/PdoMysql/PdoMysqlDriver.php b/src/Drivers/PdoMysql/PdoMysqlDriver.php index df87b43f..a5998974 100644 --- a/src/Drivers/PdoMysql/PdoMysqlDriver.php +++ b/src/Drivers/PdoMysql/PdoMysqlDriver.php @@ -22,7 +22,6 @@ use Nextras\Dbal\Platforms\IPlatform; use Nextras\Dbal\Platforms\MySqlPlatform; use Nextras\Dbal\Result\IResultAdapter; -use PDO; use PDOStatement; use function array_key_exists; use function date; @@ -73,12 +72,13 @@ public function connect(array $params, ILogger $logger): void $charset = $params['charset'] ?? 'utf8mb4'; $options = (array) ($params['options'] ?? []); - if (isset($params['sslKey'])) $options[PDO::MYSQL_ATTR_SSL_KEY] = $params['sslKey']; - if (isset($params['sslCert'])) $options[PDO::MYSQL_ATTR_SSL_CERT] = $params['sslCert']; - if (isset($params['sslCa'])) $options[PDO::MYSQL_ATTR_SSL_CA] = $params['sslCa']; - if (isset($params['sslCapath'])) $options[PDO::MYSQL_ATTR_SSL_CAPATH] = $params['sslCapath']; - if (isset($params['sslCipher'])) $options[PDO::MYSQL_ATTR_SSL_CIPHER] = $params['sslCipher']; - if (isset($params['sslVerify'])) $options[PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $params['sslVerify']; + $pdoMysqlClass = version_compare(PHP_VERSION, '8.5.0', '>=') ? \Pdo\Mysql::class : \PDO::class; + if (isset($params['sslKey'])) $options[$pdoMysqlClass::ATTR_SSL_KEY] = $params['sslKey']; + if (isset($params['sslCert'])) $options[$pdoMysqlClass::ATTR_SSL_CERT] = $params['sslCert']; + if (isset($params['sslCa'])) $options[$pdoMysqlClass::ATTR_SSL_CA] = $params['sslCa']; + if (isset($params['sslCapath'])) $options[$pdoMysqlClass::ATTR_SSL_CAPATH] = $params['sslCapath']; + if (isset($params['sslCipher'])) $options[$pdoMysqlClass::ATTR_SSL_CIPHER] = $params['sslCipher']; + if (isset($params['sslVerify'])) $options[$pdoMysqlClass::ATTR_SSL_VERIFY_SERVER_CERT] = $params['sslVerify']; if ($host !== null) { $target = "host=$host;";