Connection::errorCode() cannot return FALSE

52a91a37 · Sergei Morozov · 32dd9090 · 52a91a37 · 52a91a37
Unverified Commit 52a91a37 authored Jun 19, 2020 by Sergei Morozov
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

OCI8Connection.php lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php +3 -2

SQLSrvConnection.php lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php +1 -1

No files found.
--- a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php
+++ b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php
@@ -222,11 +222,12 @@ class OCI8Connection implements Connection, ServerInfoAwareConnection
    public function errorCode()
    {
        $error = oci_error($this->dbh);
+
        if ($error !== false) {
-            $error = $error['code'];
+            return $error['code'];
        }

-        return $error;
+        return null;
    }

    /**

--- a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
+++ b/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
@@ -190,7 +190,7 @@ class SQLSrvConnection implements Connection, ServerInfoAwareConnection
            return $errors[0]['code'];
        }

-        return false;
+        return null;
    }

    /**