diff --git a/UPGRADE.md b/UPGRADE.md index adb9ffd904e..a6d4c85004e 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,8 +1,16 @@ # Upgrade to 2.11 +## Deprecated `Connection::project()` + +The `Connection::project()` method is deprecated. Implement data transformation outside of DBAL. + +## Deprecated `Statement::errorCode()` and `errorInfo()` + +The `Statement::errorCode()` and `errorInfo()` methods are deprecated. The error information is available via exceptions. + ## Deprecated `EchoSQLLogger` -The `EchoSQLLogger` is has been deprecated. Implement your logger with the desired logic. +The `EchoSQLLogger` class is deprecated. Implement your logger with the desired logic. ## Deprecated database platforms: diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php index 4a9a8cd959c..f49ba0ba951 100644 --- a/lib/Doctrine/DBAL/Connection.php +++ b/lib/Doctrine/DBAL/Connection.php @@ -973,6 +973,8 @@ public function executeCacheQuery($query, $params, $types, QueryCacheProfile $qc * Executes an, optionally parametrized, SQL query and returns the result, * applying a given projection/transformation function on each row of the result. * + * @deprecated + * * @param string $query The SQL query to execute. * @param mixed[] $params The parameters, if any. * @param Closure $function The transformation function that is applied on each row. @@ -1123,6 +1125,8 @@ public function getTransactionNestingLevel() /** * Fetches the SQLSTATE associated with the last database operation. * + * @deprecated The error information is available via exceptions. + * * @return string|null The last error code. */ public function errorCode() @@ -1132,6 +1136,8 @@ public function errorCode() /** * {@inheritDoc} + * + * @deprecated The error information is available via exceptions. */ public function errorInfo() { diff --git a/lib/Doctrine/DBAL/Driver/Connection.php b/lib/Doctrine/DBAL/Driver/Connection.php index 1574581c2ad..5e7382d0b8c 100644 --- a/lib/Doctrine/DBAL/Driver/Connection.php +++ b/lib/Doctrine/DBAL/Driver/Connection.php @@ -80,6 +80,8 @@ public function rollBack(); /** * Returns the error code associated with the last operation on the database handle. * + * @deprecated The error information is available via exceptions. + * * @return string|null The error code, or null if no operation has been run on the database handle. */ public function errorCode(); @@ -87,6 +89,8 @@ public function errorCode(); /** * Returns extended error information associated with the last operation on the database handle. * + * @deprecated The error information is available via exceptions. + * * @return mixed[] */ public function errorInfo(); diff --git a/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php index 841ea4c9c61..533617b2c87 100644 --- a/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php +++ b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php @@ -180,6 +180,8 @@ public function rollBack() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorCode() { @@ -188,6 +190,8 @@ public function errorCode() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorInfo() { diff --git a/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php index 6222facf1e4..eb30651fc51 100644 --- a/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php +++ b/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Statement.php @@ -167,6 +167,8 @@ public function columnCount() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorCode() { @@ -175,6 +177,8 @@ public function errorCode() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorInfo() { diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php index f1b687aaec6..95e99f4aa1d 100644 --- a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php +++ b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php @@ -200,6 +200,8 @@ public function rollBack() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorCode() { @@ -208,6 +210,8 @@ public function errorCode() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorInfo() { diff --git a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php index 86e846af702..738bd8e1b4f 100644 --- a/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php +++ b/lib/Doctrine/DBAL/Driver/Mysqli/MysqliStatement.php @@ -393,6 +393,8 @@ public function fetchColumn($columnIndex = 0) /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorCode() { @@ -401,6 +403,8 @@ public function errorCode() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorInfo() { diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php index ae1b3599642..44e2e21a707 100644 --- a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php +++ b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php @@ -216,6 +216,8 @@ public function rollBack() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorCode() { @@ -229,6 +231,8 @@ public function errorCode() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorInfo() { diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php index 74607ddec76..d64f55919d1 100644 --- a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php +++ b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php @@ -352,6 +352,8 @@ public function columnCount() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorCode() { @@ -365,6 +367,8 @@ public function errorCode() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorInfo() { diff --git a/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereConnection.php b/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereConnection.php index d47782003e6..cca9df5fac0 100644 --- a/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereConnection.php +++ b/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereConnection.php @@ -90,6 +90,8 @@ public function commit() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorCode() { @@ -98,6 +100,8 @@ public function errorCode() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorInfo() { diff --git a/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php b/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php index bac9abf7850..c5d8e5d9eee 100644 --- a/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php +++ b/lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php @@ -152,6 +152,8 @@ public function columnCount() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorCode() { @@ -160,6 +162,8 @@ public function errorCode() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorInfo() { diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php b/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php index ca7ce0c9ad3..6c8864fa03a 100644 --- a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php +++ b/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php @@ -182,6 +182,8 @@ public function rollBack() /** * {@inheritDoc} + * + * @deprecated The error information is available via exceptions. */ public function errorCode() { @@ -195,6 +197,8 @@ public function errorCode() /** * {@inheritDoc} + * + * @deprecated The error information is available via exceptions. */ public function errorInfo() { diff --git a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php b/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php index e728575fa4f..956b497aa95 100644 --- a/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php +++ b/lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php @@ -216,6 +216,8 @@ public function columnCount() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorCode() { @@ -229,6 +231,8 @@ public function errorCode() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorInfo() { diff --git a/lib/Doctrine/DBAL/Driver/Statement.php b/lib/Doctrine/DBAL/Driver/Statement.php index 388983e46a6..2fc527b3b4e 100644 --- a/lib/Doctrine/DBAL/Driver/Statement.php +++ b/lib/Doctrine/DBAL/Driver/Statement.php @@ -61,6 +61,8 @@ public function bindParam($column, &$variable, $type = ParameterType::STRING, $l /** * Fetches the SQLSTATE associated with the last operation on the statement handle. * + * @deprecated The error information is available via exceptions. + * * @see Doctrine_Adapter_Interface::errorCode() * * @return string|int|bool The error code string. @@ -70,6 +72,8 @@ public function errorCode(); /** * Fetches extended error information associated with the last operation on the statement handle. * + * @deprecated The error information is available via exceptions. + * * @return mixed[] The error info array. */ public function errorInfo(); diff --git a/lib/Doctrine/DBAL/Portability/Statement.php b/lib/Doctrine/DBAL/Portability/Statement.php index 514b3be2d74..96727b2448a 100644 --- a/lib/Doctrine/DBAL/Portability/Statement.php +++ b/lib/Doctrine/DBAL/Portability/Statement.php @@ -81,6 +81,8 @@ public function columnCount() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorCode() { @@ -91,6 +93,8 @@ public function errorCode() /** * {@inheritdoc} + * + * @deprecated The error information is available via exceptions. */ public function errorInfo() { diff --git a/lib/Doctrine/DBAL/Statement.php b/lib/Doctrine/DBAL/Statement.php index ee8dcfcfceb..cb6fbde7a71 100644 --- a/lib/Doctrine/DBAL/Statement.php +++ b/lib/Doctrine/DBAL/Statement.php @@ -198,6 +198,8 @@ public function columnCount() /** * Fetches the SQLSTATE associated with the last operation on the statement. * + * @deprecated The error information is available via exceptions. + * * @return string|int|bool */ public function errorCode() @@ -207,6 +209,8 @@ public function errorCode() /** * {@inheritDoc} + * + * @deprecated The error information is available via exceptions. */ public function errorInfo() {