Merge remote-tracking branch 'origin/2.10.x' into 2.11.x

.scrutinizer.yml

@@ -21,7 +21,7 @@ before_commands:
 tools:
     external_code_coverage:
         timeout: 3600
-        runs: 28 # 23x Travis (jobs with COVERAGE=yes) + 3x AppVeyor (jobs with coverage=yes) + 2x ContinuousPHP
+        runs: 27 # 23x Travis (jobs with COVERAGE=yes) + 3x AppVeyor (jobs with coverage=yes) + 1x ContinuousPHP
 
 filter:
     excluded_paths:

lib/Doctrine/DBAL/Driver/DriverException.php

@@ -24,13 +24,6 @@ interface DriverException extends Throwable
      */
     public function getErrorCode();
 
-    /**
-     * Returns the driver error message.
-     *
-     * @return string
-     */
-    public function getMessage();
-
     /**
      * Returns the SQLSTATE the driver was in at the time the error occurred.
      *

psalm.xml

 <?xml version="1.0"?>
 <psalm
     totallyTyped="false"
-    errorLevel="8"
+    errorLevel="7"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
@@ -23,6 +23,24 @@
         <file name="vendor/jetbrains/phpstorm-stubs/sqlsrv/sqlsrv.php" />
     </stubs>
     <issueHandlers>
+        <ConflictingReferenceConstraint>
+            <errorLevel type="suppress">
+                <!--
+                    This one is just too convoluted for Psalm to figure out, by
+                    its author's own admission
+                -->
+                <file name="lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php"/>
+            </errorLevel>
+        </ConflictingReferenceConstraint>
+        <MethodSignatureMismatch>
+            <errorLevel type="suppress">
+                <!--
+                    This one is clearly deliberate; it's a hack to adapt \PDO to
+                    Doctrine\DBAL\Driver\Connection
+                -->
+                <file name="lib/Doctrine/DBAL/Driver/PDOConnection.php"/>
+            </errorLevel>
+        </MethodSignatureMismatch>
         <TooFewArguments>
             <errorLevel type="suppress">
                 <!--