From a3325cac4d56041b1514b263ef12291e3a42753c Mon Sep 17 00:00:00 2001 From: David Grudl Date: Mon, 26 Oct 2015 19:47:24 +0100 Subject: [PATCH] added deprecation notices --- src/Dibi/Connection.php | 1 + src/Dibi/Drivers/FirebirdDriver.php | 1 + src/Dibi/Drivers/MsSqlDriver.php | 1 + src/Dibi/Drivers/MySqlDriver.php | 1 + src/Dibi/Drivers/MySqliDriver.php | 1 + src/Dibi/Drivers/OdbcDriver.php | 1 + src/Dibi/Drivers/OracleDriver.php | 1 + src/Dibi/Drivers/PdoDriver.php | 1 + src/Dibi/Drivers/PostgreDriver.php | 1 + src/Dibi/Drivers/Sqlite3Driver.php | 1 + src/Dibi/Drivers/SqlsrvDriver.php | 1 + src/Dibi/Result.php | 3 ++- src/Dibi/Translator.php | 5 ++++- 13 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php index 0fd2fae7..9e332c26 100644 --- a/src/Dibi/Connection.php +++ b/src/Dibi/Connection.php @@ -207,6 +207,7 @@ class Connection /** @deprecated */ public static function alias(& $config, $key, $alias) { + trigger_error(__METHOD__ . '() is deprecated, use Helpers::alias().', E_USER_DEPRECATED); Helpers::alias($config, $key, $alias); } diff --git a/src/Dibi/Drivers/FirebirdDriver.php b/src/Dibi/Drivers/FirebirdDriver.php index 20c7370f..052cd5ea 100644 --- a/src/Dibi/Drivers/FirebirdDriver.php +++ b/src/Dibi/Drivers/FirebirdDriver.php @@ -322,6 +322,7 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector /** @deprecated */ public function escape($value, $type) { + trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED); return Dibi\Helpers::escape($this, $value, $type); } diff --git a/src/Dibi/Drivers/MsSqlDriver.php b/src/Dibi/Drivers/MsSqlDriver.php index cd600efd..daf2b3f9 100644 --- a/src/Dibi/Drivers/MsSqlDriver.php +++ b/src/Dibi/Drivers/MsSqlDriver.php @@ -273,6 +273,7 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver /** @deprecated */ public function escape($value, $type) { + trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED); return Dibi\Helpers::escape($this, $value, $type); } diff --git a/src/Dibi/Drivers/MySqlDriver.php b/src/Dibi/Drivers/MySqlDriver.php index 7fd1b345..4b812ebd 100644 --- a/src/Dibi/Drivers/MySqlDriver.php +++ b/src/Dibi/Drivers/MySqlDriver.php @@ -358,6 +358,7 @@ class MySqlDriver implements Dibi\Driver, Dibi\ResultDriver /** @deprecated */ public function escape($value, $type) { + trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED); return Dibi\Helpers::escape($this, $value, $type); } diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySqliDriver.php index 71f1a3de..cc045a7e 100644 --- a/src/Dibi/Drivers/MySqliDriver.php +++ b/src/Dibi/Drivers/MySqliDriver.php @@ -369,6 +369,7 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver /** @deprecated */ public function escape($value, $type) { + trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED); return Dibi\Helpers::escape($this, $value, $type); } diff --git a/src/Dibi/Drivers/OdbcDriver.php b/src/Dibi/Drivers/OdbcDriver.php index bb82dd82..85f46c6b 100644 --- a/src/Dibi/Drivers/OdbcDriver.php +++ b/src/Dibi/Drivers/OdbcDriver.php @@ -297,6 +297,7 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector /** @deprecated */ public function escape($value, $type) { + trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED); return Dibi\Helpers::escape($this, $value, $type); } diff --git a/src/Dibi/Drivers/OracleDriver.php b/src/Dibi/Drivers/OracleDriver.php index 24a25ddb..20b16dbc 100644 --- a/src/Dibi/Drivers/OracleDriver.php +++ b/src/Dibi/Drivers/OracleDriver.php @@ -317,6 +317,7 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector /** @deprecated */ public function escape($value, $type) { + trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED); return Dibi\Helpers::escape($this, $value, $type); } diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PdoDriver.php index 249e3a57..c70fc05a 100644 --- a/src/Dibi/Drivers/PdoDriver.php +++ b/src/Dibi/Drivers/PdoDriver.php @@ -387,6 +387,7 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver /** @deprecated */ public function escape($value, $type) { + trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED); return Dibi\Helpers::escape($this, $value, $type); } diff --git a/src/Dibi/Drivers/PostgreDriver.php b/src/Dibi/Drivers/PostgreDriver.php index 9efac39f..95a6c34e 100644 --- a/src/Dibi/Drivers/PostgreDriver.php +++ b/src/Dibi/Drivers/PostgreDriver.php @@ -373,6 +373,7 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector /** @deprecated */ public function escape($value, $type) { + trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED); return Dibi\Helpers::escape($this, $value, $type); } diff --git a/src/Dibi/Drivers/Sqlite3Driver.php b/src/Dibi/Drivers/Sqlite3Driver.php index 71c43dda..98e80aae 100644 --- a/src/Dibi/Drivers/Sqlite3Driver.php +++ b/src/Dibi/Drivers/Sqlite3Driver.php @@ -317,6 +317,7 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver /** @deprecated */ public function escape($value, $type) { + trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED); return Dibi\Helpers::escape($this, $value, $type); } diff --git a/src/Dibi/Drivers/SqlsrvDriver.php b/src/Dibi/Drivers/SqlsrvDriver.php index d8138b22..f96d8a8a 100644 --- a/src/Dibi/Drivers/SqlsrvDriver.php +++ b/src/Dibi/Drivers/SqlsrvDriver.php @@ -292,6 +292,7 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver /** @deprecated */ public function escape($value, $type) { + trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED); return Helpers::escape($this, $value, $type); } diff --git a/src/Dibi/Result.php b/src/Dibi/Result.php index 3ceb9fe0..d98f7906 100644 --- a/src/Dibi/Result.php +++ b/src/Dibi/Result.php @@ -67,6 +67,7 @@ class Result implements IDataSource */ final public function getResource() { + trigger_error(__METHOD__ . '() is deprecated, use getResultDriver()->getResultResource().', E_USER_DEPRECATED); return $this->getResultDriver()->getResultResource(); } @@ -597,7 +598,7 @@ class Result implements IDataSource /** - * @deprecated + * @return Reflection\Column[] */ final public function getColumns() { diff --git a/src/Dibi/Translator.php b/src/Dibi/Translator.php index b425dd94..8893fe26 100644 --- a/src/Dibi/Translator.php +++ b/src/Dibi/Translator.php @@ -353,8 +353,11 @@ final class Translator case 'sn': return $value == '' ? 'NULL' : $this->driver->escapeText($value); // notice two equal signs - case 'iN': // signed int or NULL case 'in': // deprecated + trigger_error('Modifier %in is deprecated, use %iN.', E_USER_DEPRECATED); + // intentionally break omitted + + case 'iN': // signed int or NULL if ($value == '') { $value = NULL; }