From f9997f9b529494572d437f8f7aab0e4b6ab7b037 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Sat, 10 Jun 2017 02:37:50 +0200 Subject: [PATCH] removed useless type juggling and checking --- src/Dibi/Bridges/Tracy/Panel.php | 2 +- src/Dibi/Connection.php | 2 +- src/Dibi/Drivers/Sqlite3Driver.php | 2 +- src/Dibi/Loggers/FileLogger.php | 2 +- src/Dibi/Loggers/FirePhpLogger.php | 2 +- src/Dibi/Result.php | 4 ++-- src/Dibi/exceptions.php | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Dibi/Bridges/Tracy/Panel.php b/src/Dibi/Bridges/Tracy/Panel.php index 5090c21e..4bcbab38 100644 --- a/src/Dibi/Bridges/Tracy/Panel.php +++ b/src/Dibi/Bridges/Tracy/Panel.php @@ -35,7 +35,7 @@ class Panel implements Tracy\IBarPanel public function __construct(bool $explain = TRUE, int $filter = NULL) { - $this->filter = $filter ? (int) $filter : Event::QUERY; + $this->filter = $filter ?: Event::QUERY; $this->explain = $explain; } diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php index 18799a7d..6e53d2d7 100644 --- a/src/Dibi/Connection.php +++ b/src/Dibi/Connection.php @@ -331,7 +331,7 @@ class Connection if ($id < 1) { throw new Exception('Cannot retrieve last generated ID.'); } - return (int) $id; + return $id; } diff --git a/src/Dibi/Drivers/Sqlite3Driver.php b/src/Dibi/Drivers/Sqlite3Driver.php index 9fc9cb26..5c95e570 100644 --- a/src/Dibi/Drivers/Sqlite3Driver.php +++ b/src/Dibi/Drivers/Sqlite3Driver.php @@ -236,7 +236,7 @@ class Sqlite3Driver implements Dibi\Driver, Dibi\ResultDriver public function escapeBinary(string $value): string { - return "X'" . bin2hex((string) $value) . "'"; + return "X'" . bin2hex($value) . "'"; } diff --git a/src/Dibi/Loggers/FileLogger.php b/src/Dibi/Loggers/FileLogger.php index 5740a9a8..23103d1f 100644 --- a/src/Dibi/Loggers/FileLogger.php +++ b/src/Dibi/Loggers/FileLogger.php @@ -27,7 +27,7 @@ class FileLogger public function __construct(string $file, int $filter = NULL) { $this->file = $file; - $this->filter = $filter ? (int) $filter : Dibi\Event::QUERY; + $this->filter = $filter ?: Dibi\Event::QUERY; } diff --git a/src/Dibi/Loggers/FirePhpLogger.php b/src/Dibi/Loggers/FirePhpLogger.php index f3d6e37b..deb13fd8 100644 --- a/src/Dibi/Loggers/FirePhpLogger.php +++ b/src/Dibi/Loggers/FirePhpLogger.php @@ -47,7 +47,7 @@ class FirePhpLogger public function __construct(int $filter = NULL) { - $this->filter = $filter ? (int) $filter : Dibi\Event::QUERY; + $this->filter = $filter ?: Dibi\Event::QUERY; } diff --git a/src/Dibi/Result.php b/src/Dibi/Result.php index 0e7fad19..5458eeb9 100644 --- a/src/Dibi/Result.php +++ b/src/Dibi/Result.php @@ -200,8 +200,8 @@ class Result implements IDataSource */ final public function fetchAll(int $offset = NULL, int $limit = NULL): array { - $limit = $limit === NULL ? -1 : (int) $limit; - $this->seek((int) $offset); + $limit = $limit === NULL ? -1 : $limit; + $this->seek($offset ?: 0); $row = $this->fetch(); if (!$row) { return []; // empty result set diff --git a/src/Dibi/exceptions.php b/src/Dibi/exceptions.php index b810ca4b..a3ba981e 100644 --- a/src/Dibi/exceptions.php +++ b/src/Dibi/exceptions.php @@ -95,7 +95,7 @@ class ProcedureException extends Exception */ public function __construct(string $message = NULL, int $code = 0, string $severity = NULL, $sql = NULL) { - parent::__construct($message, (int) $code, $sql); + parent::__construct($message, $code, $sql); $this->severity = $severity; }