Merge branch '3.9.x' into 4.1.x

* 3.9.x: Use generators for large data providers (doctrine#6508) PHPStan 1.12 (doctrine#6507)
derrabus · Aug 28, 2024 · a8777ff · a8777ff
2 parents 94dfede + d19cf2c
commit a8777ff
Show file tree

Hide file tree

Showing 4 changed files with 366 additions and 338 deletions.
diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
         "doctrine/coding-standard": "12.0.0",
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "2023.2",
-        "phpstan/phpstan": "1.11.10",
+        "phpstan/phpstan": "1.12.0",
         "phpstan/phpstan-phpunit": "1.4.0",
         "phpstan/phpstan-strict-rules": "^1.6",
         "phpunit/phpunit": "10.5.30",

diff --git a/src/Driver/AbstractMySQLDriver.php b/src/Driver/AbstractMySQLDriver.php
@@ -96,7 +96,7 @@ private function getMariaDbMysqlVersionNumber(string $versionString): string
                 '/^(?:5\.5\.5-)?(mariadb-)?(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)/i',
                 $versionString,
                 $versionParts,
-            ) === 0
+            ) !== 1
         ) {
             throw InvalidPlatformVersion::new(
                 $versionString,

diff --git a/src/Driver/AbstractPostgreSQLDriver.php b/src/Driver/AbstractPostgreSQLDriver.php
@@ -25,7 +25,7 @@ public function getDatabasePlatform(ServerVersionProvider $versionProvider): Pos
     {
         $version = $versionProvider->getServerVersion();
 
-        if (preg_match('/^(?P<major>\d+)(?:\.(?P<minor>\d+)(?:\.(?P<patch>\d+))?)?/', $version, $versionParts) === 0) {
+        if (preg_match('/^(?P<major>\d+)(?:\.(?P<minor>\d+)(?:\.(?P<patch>\d+))?)?/', $version, $versionParts) !== 1) {
             throw InvalidPlatformVersion::new(
                 $version,
                 '<major_version>.<minor_version>.<patch_version>',