diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php index a812a31c..5d506418 100644 --- a/src/Dibi/Connection.php +++ b/src/Dibi/Connection.php @@ -198,14 +198,6 @@ 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); - } - - /** * Returns the driver and connects to a database in lazy mode. * @return Driver diff --git a/src/Dibi/Drivers/FirebirdDriver.php b/src/Dibi/Drivers/FirebirdDriver.php index 58e1afea..f2ab2f37 100644 --- a/src/Dibi/Drivers/FirebirdDriver.php +++ b/src/Dibi/Drivers/FirebirdDriver.php @@ -340,14 +340,6 @@ 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); - } - - /** * Injects LIMIT/OFFSET to the SQL query. * @param string diff --git a/src/Dibi/Drivers/MsSqlDriver.php b/src/Dibi/Drivers/MsSqlDriver.php index 62545bc8..0ad1c16b 100644 --- a/src/Dibi/Drivers/MsSqlDriver.php +++ b/src/Dibi/Drivers/MsSqlDriver.php @@ -291,14 +291,6 @@ 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); - } - - /** * Injects LIMIT/OFFSET to the SQL query. * @param string diff --git a/src/Dibi/Drivers/MySqlDriver.php b/src/Dibi/Drivers/MySqlDriver.php index 93ab512f..f4d5f655 100644 --- a/src/Dibi/Drivers/MySqlDriver.php +++ b/src/Dibi/Drivers/MySqlDriver.php @@ -375,14 +375,6 @@ 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); - } - - /** * Injects LIMIT/OFFSET to the SQL query. * @param string diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySqliDriver.php index 5b19e4bf..5b96c2a7 100644 --- a/src/Dibi/Drivers/MySqliDriver.php +++ b/src/Dibi/Drivers/MySqliDriver.php @@ -383,14 +383,6 @@ 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); - } - - /** * Injects LIMIT/OFFSET to the SQL query. * @param string diff --git a/src/Dibi/Drivers/OdbcDriver.php b/src/Dibi/Drivers/OdbcDriver.php index bc5d5f37..9bc54124 100644 --- a/src/Dibi/Drivers/OdbcDriver.php +++ b/src/Dibi/Drivers/OdbcDriver.php @@ -315,14 +315,6 @@ 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); - } - - /** * Injects LIMIT/OFFSET to the SQL query. * @param string diff --git a/src/Dibi/Drivers/OracleDriver.php b/src/Dibi/Drivers/OracleDriver.php index 16476f48..ba107287 100644 --- a/src/Dibi/Drivers/OracleDriver.php +++ b/src/Dibi/Drivers/OracleDriver.php @@ -67,9 +67,6 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector { $foo = &$config['charset']; - if (isset($config['formatDate']) || isset($config['formatDateTime'])) { - trigger_error('OracleDriver: options formatDate and formatDateTime are deprecated.', E_USER_DEPRECATED); - } if (empty($config['nativeDate'])) { $this->fmtDate = isset($config['formatDate']) ? $config['formatDate'] : 'U'; $this->fmtDateTime = isset($config['formatDateTime']) ? $config['formatDateTime'] : 'U'; @@ -349,14 +346,6 @@ 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); - } - - /** * Injects LIMIT/OFFSET to the SQL query. * @param string diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PdoDriver.php index 1f7b0a26..7ddf29b0 100644 --- a/src/Dibi/Drivers/PdoDriver.php +++ b/src/Dibi/Drivers/PdoDriver.php @@ -404,14 +404,6 @@ 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); - } - - /** * Injects LIMIT/OFFSET to the SQL query. * @param string diff --git a/src/Dibi/Drivers/PostgreDriver.php b/src/Dibi/Drivers/PostgreDriver.php index 4ad48caa..ddf386ff 100644 --- a/src/Dibi/Drivers/PostgreDriver.php +++ b/src/Dibi/Drivers/PostgreDriver.php @@ -391,14 +391,6 @@ 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); - } - - /** * Injects LIMIT/OFFSET to the SQL query. * @param string diff --git a/src/Dibi/Drivers/Sqlite3Driver.php b/src/Dibi/Drivers/Sqlite3Driver.php index a8a1d180..6fae30e8 100644 --- a/src/Dibi/Drivers/Sqlite3Driver.php +++ b/src/Dibi/Drivers/Sqlite3Driver.php @@ -335,14 +335,6 @@ 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); - } - - /** * Injects LIMIT/OFFSET to the SQL query. * @param string diff --git a/src/Dibi/Drivers/SqlsrvDriver.php b/src/Dibi/Drivers/SqlsrvDriver.php index ef154ba7..b6e39a95 100644 --- a/src/Dibi/Drivers/SqlsrvDriver.php +++ b/src/Dibi/Drivers/SqlsrvDriver.php @@ -315,14 +315,6 @@ 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); - } - - /** * Injects LIMIT/OFFSET to the SQL query. * @param string diff --git a/src/Dibi/Result.php b/src/Dibi/Result.php index 6019b589..a37cc716 100644 --- a/src/Dibi/Result.php +++ b/src/Dibi/Result.php @@ -62,16 +62,6 @@ class Result implements IDataSource } - /** - * @deprecated - */ - final public function getResource() - { - trigger_error(__METHOD__ . '() is deprecated, use getResultDriver()->getResultResource().', E_USER_DEPRECATED); - return $this->getResultDriver()->getResultResource(); - } - - /** * Frees the resources allocated for this result set. * @return void diff --git a/src/Dibi/Strict.php b/src/Dibi/Strict.php index e3a4329c..8e4b7bdc 100644 --- a/src/Dibi/Strict.php +++ b/src/Dibi/Strict.php @@ -117,18 +117,6 @@ trait Strict $class = (new ReflectionClass($class))->getName(); } - if (self::$extMethods === NULL) { // for backwards compatibility - $list = get_defined_functions(); - foreach ($list['user'] as $fce) { - $pair = explode('_prototype_', $fce); - if (count($pair) === 2) { - trigger_error("Extension method defined as $fce() is deprecated, use $class::extensionMethod('$name', ...).", E_USER_DEPRECATED); - self::$extMethods[$pair[1]][(new ReflectionClass($pair[0]))->getName()] = $fce; - self::$extMethods[$pair[1]][''] = NULL; - } - } - } - $list = & self::$extMethods[strtolower($name)]; if ($callback === NULL) { // getter $cache = &$list[''][$class]; diff --git a/src/Dibi/Translator.php b/src/Dibi/Translator.php index ce08e0ea..9e0ab10e 100644 --- a/src/Dibi/Translator.php +++ b/src/Dibi/Translator.php @@ -338,10 +338,6 @@ final class Translator case 'sn': return $value == '' ? 'NULL' : $this->driver->escapeText((string) $value); // notice two equal signs - 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; @@ -354,9 +350,6 @@ final class Translator return 'NULL'; } elseif (is_string($value) && preg_match('#[+-]?\d++(?:e\d+)?\z#A', $value)) { return $value; // support for long numbers - keep them unchanged - } elseif (is_string($value) && substr($value, 1, 1) === 'x' && is_numeric($value)) { - trigger_error('Support for hex strings has been deprecated.', E_USER_DEPRECATED); - return (string) hexdec($value); } else { return (string) (int) $value; } diff --git a/src/Dibi/dibi.php b/src/Dibi/dibi.php index 23a7b8c2..4e1a9d8e 100644 --- a/src/Dibi/dibi.php +++ b/src/Dibi/dibi.php @@ -22,33 +22,13 @@ class dibi /** version */ const - VERSION = '4.0-dev', - REVISION = 'released on 2017-06-09'; + VERSION = '4.0-dev'; /** sorting order */ const ASC = 'ASC', DESC = 'DESC'; - /** @deprecated */ - const - TEXT = Type::TEXT, - BINARY = Type::BINARY, - BOOL = Type::BOOL, - INTEGER = Type::INTEGER, - FLOAT = Type::FLOAT, - DATE = Type::DATE, - DATETIME = Type::DATETIME, - TIME = Type::TIME, - FIELD_TEXT = Type::TEXT, - FIELD_BINARY = Type::BINARY, - FIELD_BOOL = Type::BOOL, - FIELD_INTEGER = Type::INTEGER, - FIELD_FLOAT = Type::FLOAT, - FIELD_DATE = Type::DATE, - FIELD_DATETIME = Type::DATETIME, - FIELD_TIME = Type::TIME; - /** @var Dibi\Connection[] Connection registry storage for DibiConnection objects */ private static $registry = []; @@ -151,16 +131,6 @@ class dibi } - /** - * @deprecated - */ - public static function activate($name) - { - trigger_error(__METHOD__ . '() is deprecated.', E_USER_DEPRECATED); - self::$connection = self::getConnection($name); - } - - /********************* monostate for active connection ****************d*g**/