diff --git a/baseline.xml b/baseline.xml
index 6c485feaa0d..d60358e5360 100644
--- a/baseline.xml
+++ b/baseline.xml
@@ -5,11 +5,6 @@
int
-
-
- public function getMessage();
-
-
sasql_pconnect($dsn)
diff --git a/lib/Doctrine/DBAL/Driver/AbstractDriverException.php b/lib/Doctrine/DBAL/Driver/AbstractDriverException.php
index d9af92d1744..f57de38f09c 100644
--- a/lib/Doctrine/DBAL/Driver/AbstractDriverException.php
+++ b/lib/Doctrine/DBAL/Driver/AbstractDriverException.php
@@ -6,6 +6,8 @@
/**
* Abstract base implementation of the {@link DriverException} interface.
+ *
+ * @psalm-immutable
*/
abstract class AbstractDriverException extends Exception implements DriverException
{
diff --git a/lib/Doctrine/DBAL/Driver/DriverException.php b/lib/Doctrine/DBAL/Driver/DriverException.php
index 79480ac72be..14cd5186e4d 100644
--- a/lib/Doctrine/DBAL/Driver/DriverException.php
+++ b/lib/Doctrine/DBAL/Driver/DriverException.php
@@ -9,6 +9,8 @@
*
* Driver exceptions provide the SQLSTATE of the driver
* and the driver specific error code at the time the error occurred.
+ *
+ * @psalm-immutable
*/
interface DriverException extends Throwable
{
diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliException.php b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliException.php
index 1fa0c900fbd..8e8e697c4a3 100644
--- a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliException.php
+++ b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliException.php
@@ -6,6 +6,8 @@
/**
* Exception thrown in case the mysqli driver errors.
+ *
+ * @psalm-immutable
*/
class MysqliException extends AbstractDriverException
{
diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Exception.php b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Exception.php
index af3a9d1a7a9..42283e08a57 100644
--- a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Exception.php
+++ b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Exception.php
@@ -4,6 +4,9 @@
use Doctrine\DBAL\Driver\AbstractDriverException;
+/**
+ * @psalm-immutable
+ */
class OCI8Exception extends AbstractDriverException
{
/**
diff --git a/lib/Doctrine/DBAL/Driver/PDOException.php b/lib/Doctrine/DBAL/Driver/PDOException.php
index 277d7a62500..c2571032b80 100644
--- a/lib/Doctrine/DBAL/Driver/PDOException.php
+++ b/lib/Doctrine/DBAL/Driver/PDOException.php
@@ -4,6 +4,8 @@
/**
* Tiny wrapper for PDOException instances to implement the {@link DriverException} interface.
+ *
+ * @psalm-immutable
*/
class PDOException extends \PDOException implements DriverException
{
diff --git a/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereException.php b/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereException.php
index 0f8bc3e57e6..022cfe2dfa7 100644
--- a/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereException.php
+++ b/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereException.php
@@ -12,6 +12,8 @@
/**
* SAP Sybase SQL Anywhere driver exception.
+ *
+ * @psalm-immutable
*/
class SQLAnywhereException extends AbstractDriverException
{
diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvException.php b/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvException.php
index 1c1e8c472d7..5618ed73560 100644
--- a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvException.php
+++ b/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvException.php
@@ -7,6 +7,9 @@
use function rtrim;
use function sqlsrv_errors;
+/**
+ * @psalm-immutable
+ */
class SQLSrvException extends AbstractDriverException
{
/**