Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ parameters:
- throwErrors

reportUnmatchedIgnoredErrors: false
treatPhpDocTypesAsCertain: false

ignoreErrors:
-
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions src/Drivers/PdoMysql/PdoMysqlDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;";
Expand Down
Loading