Merge branch '2.11.x' into 3.0.x

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,15 @@
         <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="src/Driver/OCI8/OCI8Statement.php"/>
+            </errorLevel>
+        </ConflictingReferenceConstraint>
         <TooFewArguments>
             <errorLevel type="suppress">
                 <!--

src/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.
      *