From 24180c76bd27a8fab670467270b7edb6d50c3143 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Fri, 9 Jun 2017 17:19:02 +0200 Subject: [PATCH] uses only DateTimeInterface & Throwable --- src/Dibi/DataSource.php | 2 +- src/Dibi/Drivers/FirebirdDriver.php | 8 ++++---- src/Dibi/Drivers/MsSqlDriver.php | 8 ++++---- src/Dibi/Drivers/MySqliDriver.php | 8 ++++---- src/Dibi/Drivers/OdbcDriver.php | 8 ++++---- src/Dibi/Drivers/OracleDriver.php | 8 ++++---- src/Dibi/Drivers/PdoDriver.php | 8 ++++---- src/Dibi/Drivers/PostgreDriver.php | 8 ++++---- src/Dibi/Drivers/Sqlite3Driver.php | 8 ++++---- src/Dibi/Drivers/SqlsrvDriver.php | 8 ++++---- src/Dibi/Fluent.php | 2 +- src/Dibi/Translator.php | 4 ++-- src/Dibi/interfaces.php | 4 ++-- 13 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/Dibi/DataSource.php b/src/Dibi/DataSource.php index 1511506f..eb9d227f 100644 --- a/src/Dibi/DataSource.php +++ b/src/Dibi/DataSource.php @@ -266,7 +266,7 @@ FROM %SQL', $this->sql, ' %ex', $this->sorting ? ['ORDER BY %by', $this->sorting] : NULL, ' %ofs %lmt', $this->offset, $this->limit ); - } catch (\Exception $e) { + } catch (\Throwable $e) { trigger_error($e->getMessage(), E_USER_ERROR); } } diff --git a/src/Dibi/Drivers/FirebirdDriver.php b/src/Dibi/Drivers/FirebirdDriver.php index f2ab2f37..e1ec7abb 100644 --- a/src/Dibi/Drivers/FirebirdDriver.php +++ b/src/Dibi/Drivers/FirebirdDriver.php @@ -292,12 +292,12 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDate($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format("'Y-m-d'"); @@ -305,12 +305,12 @@ class FirebirdDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDateTime($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format("'Y-m-d H:i:s.u'"); diff --git a/src/Dibi/Drivers/MsSqlDriver.php b/src/Dibi/Drivers/MsSqlDriver.php index 0ad1c16b..f6bcd4e6 100644 --- a/src/Dibi/Drivers/MsSqlDriver.php +++ b/src/Dibi/Drivers/MsSqlDriver.php @@ -242,12 +242,12 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDate($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format("'Y-m-d'"); @@ -255,12 +255,12 @@ class MsSqlDriver implements Dibi\Driver, Dibi\ResultDriver /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDateTime($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format("'Y-m-d H:i:s.u'"); diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySqliDriver.php index 66f4b166..72af7c8e 100644 --- a/src/Dibi/Drivers/MySqliDriver.php +++ b/src/Dibi/Drivers/MySqliDriver.php @@ -334,12 +334,12 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDate($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format("'Y-m-d'"); @@ -347,12 +347,12 @@ class MySqliDriver implements Dibi\Driver, Dibi\ResultDriver /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDateTime($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format("'Y-m-d H:i:s.u'"); diff --git a/src/Dibi/Drivers/OdbcDriver.php b/src/Dibi/Drivers/OdbcDriver.php index 9bc54124..10cbcc66 100644 --- a/src/Dibi/Drivers/OdbcDriver.php +++ b/src/Dibi/Drivers/OdbcDriver.php @@ -266,12 +266,12 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDate($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format("#m/d/Y#"); @@ -279,12 +279,12 @@ class OdbcDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDateTime($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format("#m/d/Y H:i:s.u#"); diff --git a/src/Dibi/Drivers/OracleDriver.php b/src/Dibi/Drivers/OracleDriver.php index 0f6187fb..319cb327 100644 --- a/src/Dibi/Drivers/OracleDriver.php +++ b/src/Dibi/Drivers/OracleDriver.php @@ -292,12 +292,12 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDate($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $this->fmtDate @@ -307,12 +307,12 @@ class OracleDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDateTime($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $this->fmtDateTime diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PdoDriver.php index ae277f61..5ebb130a 100644 --- a/src/Dibi/Drivers/PdoDriver.php +++ b/src/Dibi/Drivers/PdoDriver.php @@ -326,12 +326,12 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDate($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format($this->driverName === 'odbc' ? '#m/d/Y#' : "'Y-m-d'"); @@ -339,12 +339,12 @@ class PdoDriver implements Dibi\Driver, Dibi\ResultDriver /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDateTime($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format($this->driverName === 'odbc' ? "#m/d/Y H:i:s.u#" : "'Y-m-d H:i:s.u'"); diff --git a/src/Dibi/Drivers/PostgreDriver.php b/src/Dibi/Drivers/PostgreDriver.php index ddf386ff..a07e866c 100644 --- a/src/Dibi/Drivers/PostgreDriver.php +++ b/src/Dibi/Drivers/PostgreDriver.php @@ -340,12 +340,12 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDate($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format("'Y-m-d'"); @@ -353,12 +353,12 @@ class PostgreDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDateTime($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format("'Y-m-d H:i:s.u'"); diff --git a/src/Dibi/Drivers/Sqlite3Driver.php b/src/Dibi/Drivers/Sqlite3Driver.php index 69561169..083fc99b 100644 --- a/src/Dibi/Drivers/Sqlite3Driver.php +++ b/src/Dibi/Drivers/Sqlite3Driver.php @@ -286,12 +286,12 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDate($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format($this->fmtDate); @@ -299,12 +299,12 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDateTime($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format($this->fmtDateTime); diff --git a/src/Dibi/Drivers/SqlsrvDriver.php b/src/Dibi/Drivers/SqlsrvDriver.php index fd0ec491..96847d99 100644 --- a/src/Dibi/Drivers/SqlsrvDriver.php +++ b/src/Dibi/Drivers/SqlsrvDriver.php @@ -264,12 +264,12 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDate($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format("'Y-m-d'"); @@ -277,12 +277,12 @@ class SqlsrvDriver implements Dibi\Driver, Dibi\ResultDriver /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ public function escapeDateTime($value) { - if (!$value instanceof \DateTime && !$value instanceof \DateTimeInterface) { + if (!$value instanceof \DateTimeInterface) { $value = new Dibi\DateTime($value); } return $value->format("'Y-m-d H:i:s.u'"); diff --git a/src/Dibi/Fluent.php b/src/Dibi/Fluent.php index a3f96655..ad4fcd93 100644 --- a/src/Dibi/Fluent.php +++ b/src/Dibi/Fluent.php @@ -448,7 +448,7 @@ class Fluent implements IDataSource { try { return $this->connection->translate($this->_export()); - } catch (\Exception $e) { + } catch (\Throwable $e) { trigger_error($e->getMessage(), E_USER_ERROR); } } diff --git a/src/Dibi/Translator.php b/src/Dibi/Translator.php index e9b810a3..049915a5 100644 --- a/src/Dibi/Translator.php +++ b/src/Dibi/Translator.php @@ -316,7 +316,7 @@ final class Translator if ($value !== NULL && !is_scalar($value)) { // array is already processed if ($value instanceof Literal && ($modifier === 'sql' || $modifier === 'SQL')) { $modifier = 'SQL'; - } elseif (($value instanceof \DateTime || $value instanceof \DateTimeInterface) && ($modifier === 'd' || $modifier === 't')) { + } elseif ($value instanceof \DateTimeInterface && ($modifier === 'd' || $modifier === 't')) { // continue } else { $type = is_object($value) ? get_class($value) : gettype($value); @@ -439,7 +439,7 @@ final class Translator } elseif ($value === NULL) { return 'NULL'; - } elseif ($value instanceof \DateTime || $value instanceof \DateTimeInterface) { + } elseif ($value instanceof \DateTimeInterface) { return $this->driver->escapeDateTime($value); } elseif ($value instanceof Literal) { diff --git a/src/Dibi/interfaces.php b/src/Dibi/interfaces.php index f7292274..99318027 100644 --- a/src/Dibi/interfaces.php +++ b/src/Dibi/interfaces.php @@ -121,13 +121,13 @@ interface Driver function escapeBool($value); /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ function escapeDate($value); /** - * @param \DateTime|\DateTimeInterface|string|int + * @param \DateTimeInterface|string|int * @return string */ function escapeDateTime($value);