Merge branch '3.1.x' into 3.2.x

* 3.1.x:
  PHPStan 1.2.0, Psalm 4.13.0
  Fix getServerVersion for OCI8 when assertions are disabled

composer.json

@@ -41,14 +41,14 @@
     "require-dev": {
         "doctrine/coding-standard": "9.0.0",
         "jetbrains/phpstorm-stubs": "2021.1",
-        "phpstan/phpstan": "1.1.1",
-        "phpstan/phpstan-strict-rules": "^1",
+        "phpstan/phpstan": "1.2.0",
+        "phpstan/phpstan-strict-rules": "^1.1",
         "phpunit/phpunit": "9.5.10",
         "psalm/plugin-phpunit": "0.16.1",
         "squizlabs/php_codesniffer": "3.6.1",
         "symfony/cache": "^5.2|^6.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0|^6.0",
-        "vimeo/psalm": "4.12.0"
+        "vimeo/psalm": "4.13.0"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."

psalm.xml.dist

@@ -384,18 +384,6 @@
                 <file name="tests/Platforms/AbstractMySQLPlatformTestCase.php"/>
             </errorLevel>
         </TooManyArguments>
-        <TypeDoesNotContainType>
-            <errorLevel type="suppress">
-                <!-- See https://github.com/vimeo/psalm/issues/4274 -->
-                <file name="src/Schema/Index.php"/>
-            </errorLevel>
-        </TypeDoesNotContainType>
-        <UndefinedAttributeClass>
-            <errorLevel type="suppress">
-                <!-- This class has been added in PHP 8.1 -->
-                <referencedClass name="ReturnTypeWillChange"/>
-            </errorLevel>
-        </UndefinedAttributeClass>
         <UndefinedConstant>
             <errorLevel type="suppress">
                 <!--

src/Driver/OCI8/Connection.php

@@ -55,7 +55,8 @@ public function getServerVersion(): string
             throw Error::new($this->connection);
         }
 
-        assert(preg_match('/\s+(\d+\.\d+\.\d+\.\d+\.\d+)\s+/', $version, $matches) === 1);
+        $result = preg_match('/\s+(\d+\.\d+\.\d+\.\d+\.\d+)\s+/', $version, $matches);
+        assert($result === 1);
 
         return $matches[1];
     }