From b01d97ac86bd2189b97e28f52107e793cf64f226 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Wed, 9 Aug 2023 16:11:51 +0200 Subject: [PATCH] removed Dibi\Strict --- src/Dibi/Bridges/Tracy/Panel.php | 2 - src/Dibi/Connection.php | 2 - src/Dibi/DataSource.php | 2 - src/Dibi/DateTime.php | 2 - src/Dibi/Drivers/DummyDriver.php | 2 - src/Dibi/Drivers/FirebirdDriver.php | 2 - src/Dibi/Drivers/FirebirdReflector.php | 2 - src/Dibi/Drivers/FirebirdResult.php | 2 - src/Dibi/Drivers/MySqlReflector.php | 2 - src/Dibi/Drivers/MySqliDriver.php | 2 - src/Dibi/Drivers/MySqliResult.php | 2 - src/Dibi/Drivers/NoDataResult.php | 2 - src/Dibi/Drivers/OdbcDriver.php | 2 - src/Dibi/Drivers/OdbcReflector.php | 2 - src/Dibi/Drivers/OdbcResult.php | 2 - src/Dibi/Drivers/OracleDriver.php | 2 - src/Dibi/Drivers/OracleReflector.php | 2 - src/Dibi/Drivers/OracleResult.php | 2 - src/Dibi/Drivers/PdoDriver.php | 2 - src/Dibi/Drivers/PdoResult.php | 2 - src/Dibi/Drivers/PostgreDriver.php | 2 - src/Dibi/Drivers/PostgreReflector.php | 2 - src/Dibi/Drivers/PostgreResult.php | 2 - src/Dibi/Drivers/SqliteDriver.php | 2 - src/Dibi/Drivers/SqliteReflector.php | 2 - src/Dibi/Drivers/SqliteResult.php | 2 - src/Dibi/Drivers/SqlsrvDriver.php | 2 - src/Dibi/Drivers/SqlsrvReflector.php | 2 - src/Dibi/Drivers/SqlsrvResult.php | 2 - src/Dibi/Event.php | 2 - src/Dibi/Expression.php | 2 - src/Dibi/Fluent.php | 2 - src/Dibi/Helpers.php | 2 - src/Dibi/Literal.php | 2 - src/Dibi/Loggers/FileLogger.php | 2 - src/Dibi/Reflection/Column.php | 2 - src/Dibi/Reflection/Database.php | 2 - src/Dibi/Reflection/ForeignKey.php | 3 - src/Dibi/Reflection/Index.php | 3 - src/Dibi/Reflection/Result.php | 2 - src/Dibi/Reflection/Table.php | 2 - src/Dibi/Result.php | 2 - src/Dibi/ResultIterator.php | 2 - src/Dibi/Strict.php | 112 ------------------ src/Dibi/Translator.php | 2 - src/Dibi/dibi.php | 2 - tests/dibi/Strict.phpt | 151 ------------------------- 47 files changed, 355 deletions(-) delete mode 100644 src/Dibi/Strict.php delete mode 100644 tests/dibi/Strict.phpt diff --git a/src/Dibi/Bridges/Tracy/Panel.php b/src/Dibi/Bridges/Tracy/Panel.php index fa89b17c..9e43df65 100644 --- a/src/Dibi/Bridges/Tracy/Panel.php +++ b/src/Dibi/Bridges/Tracy/Panel.php @@ -20,8 +20,6 @@ use Tracy; */ class Panel implements Tracy\IBarPanel { - use Dibi\Strict; - /** @var int maximum SQL length */ public static $maxLength = 1000; diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php index ba51e18a..cf81edb3 100644 --- a/src/Dibi/Connection.php +++ b/src/Dibi/Connection.php @@ -20,8 +20,6 @@ use Traversable; */ class Connection implements IConnection { - use Strict; - /** @var array of function (Event $event); Occurs after query is executed */ public $onEvent = []; diff --git a/src/Dibi/DataSource.php b/src/Dibi/DataSource.php index c743d3ad..c179dba0 100644 --- a/src/Dibi/DataSource.php +++ b/src/Dibi/DataSource.php @@ -15,8 +15,6 @@ namespace Dibi; */ class DataSource implements IDataSource { - use Strict; - /** @var Connection */ private $connection; diff --git a/src/Dibi/DateTime.php b/src/Dibi/DateTime.php index 01a83f98..849e6a2d 100644 --- a/src/Dibi/DateTime.php +++ b/src/Dibi/DateTime.php @@ -15,8 +15,6 @@ namespace Dibi; */ class DateTime extends \DateTimeImmutable { - use Strict; - /** * @param string|int $time */ diff --git a/src/Dibi/Drivers/DummyDriver.php b/src/Dibi/Drivers/DummyDriver.php index ea14595c..9dac7d62 100644 --- a/src/Dibi/Drivers/DummyDriver.php +++ b/src/Dibi/Drivers/DummyDriver.php @@ -17,8 +17,6 @@ use Dibi; */ class DummyDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector { - use Dibi\Strict; - public function disconnect(): void { } diff --git a/src/Dibi/Drivers/FirebirdDriver.php b/src/Dibi/Drivers/FirebirdDriver.php index 9569c96d..d5bbd00b 100644 --- a/src/Dibi/Drivers/FirebirdDriver.php +++ b/src/Dibi/Drivers/FirebirdDriver.php @@ -26,8 +26,6 @@ use Dibi\Helpers; */ class FirebirdDriver implements Dibi\Driver { - use Dibi\Strict; - public const ERROR_EXCEPTION_THROWN = -836; /** @var resource */ diff --git a/src/Dibi/Drivers/FirebirdReflector.php b/src/Dibi/Drivers/FirebirdReflector.php index 88e1e145..6ba5ef47 100644 --- a/src/Dibi/Drivers/FirebirdReflector.php +++ b/src/Dibi/Drivers/FirebirdReflector.php @@ -17,8 +17,6 @@ use Dibi; */ class FirebirdReflector implements Dibi\Reflector { - use Dibi\Strict; - /** @var Dibi\Driver */ private $driver; diff --git a/src/Dibi/Drivers/FirebirdResult.php b/src/Dibi/Drivers/FirebirdResult.php index 840f60d9..e40dd48c 100644 --- a/src/Dibi/Drivers/FirebirdResult.php +++ b/src/Dibi/Drivers/FirebirdResult.php @@ -18,8 +18,6 @@ use Dibi\Helpers; */ class FirebirdResult implements Dibi\ResultDriver { - use Dibi\Strict; - /** @var resource */ private $resultSet; diff --git a/src/Dibi/Drivers/MySqlReflector.php b/src/Dibi/Drivers/MySqlReflector.php index 336baaae..8d4017b3 100644 --- a/src/Dibi/Drivers/MySqlReflector.php +++ b/src/Dibi/Drivers/MySqlReflector.php @@ -18,8 +18,6 @@ use Dibi; */ class MySqlReflector implements Dibi\Reflector { - use Dibi\Strict; - /** @var Dibi\Driver */ private $driver; diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySqliDriver.php index f9d42ecc..0f13349b 100644 --- a/src/Dibi/Drivers/MySqliDriver.php +++ b/src/Dibi/Drivers/MySqliDriver.php @@ -32,8 +32,6 @@ use Dibi; */ class MySqliDriver implements Dibi\Driver { - use Dibi\Strict; - public const ERROR_ACCESS_DENIED = 1045; public const ERROR_DUPLICATE_ENTRY = 1062; diff --git a/src/Dibi/Drivers/MySqliResult.php b/src/Dibi/Drivers/MySqliResult.php index 369ccd03..196dfd84 100644 --- a/src/Dibi/Drivers/MySqliResult.php +++ b/src/Dibi/Drivers/MySqliResult.php @@ -17,8 +17,6 @@ use Dibi; */ class MySqliResult implements Dibi\ResultDriver { - use Dibi\Strict; - /** @var \mysqli_result */ private $resultSet; diff --git a/src/Dibi/Drivers/NoDataResult.php b/src/Dibi/Drivers/NoDataResult.php index 00a5f358..ebc782cc 100644 --- a/src/Dibi/Drivers/NoDataResult.php +++ b/src/Dibi/Drivers/NoDataResult.php @@ -17,8 +17,6 @@ use Dibi; */ class NoDataResult implements Dibi\ResultDriver { - use Dibi\Strict; - /** @var int */ private $rows; diff --git a/src/Dibi/Drivers/OdbcDriver.php b/src/Dibi/Drivers/OdbcDriver.php index 9869c7c9..1ce9e8d7 100644 --- a/src/Dibi/Drivers/OdbcDriver.php +++ b/src/Dibi/Drivers/OdbcDriver.php @@ -25,8 +25,6 @@ use Dibi; */ class OdbcDriver implements Dibi\Driver { - use Dibi\Strict; - /** @var resource */ private $connection; diff --git a/src/Dibi/Drivers/OdbcReflector.php b/src/Dibi/Drivers/OdbcReflector.php index d59dccb0..3fd51560 100644 --- a/src/Dibi/Drivers/OdbcReflector.php +++ b/src/Dibi/Drivers/OdbcReflector.php @@ -17,8 +17,6 @@ use Dibi; */ class OdbcReflector implements Dibi\Reflector { - use Dibi\Strict; - /** @var Dibi\Driver */ private $driver; diff --git a/src/Dibi/Drivers/OdbcResult.php b/src/Dibi/Drivers/OdbcResult.php index cfae6efc..e9c6c294 100644 --- a/src/Dibi/Drivers/OdbcResult.php +++ b/src/Dibi/Drivers/OdbcResult.php @@ -17,8 +17,6 @@ use Dibi; */ class OdbcResult implements Dibi\ResultDriver { - use Dibi\Strict; - /** @var resource */ private $resultSet; diff --git a/src/Dibi/Drivers/OracleDriver.php b/src/Dibi/Drivers/OracleDriver.php index 81177efb..ca4fcefb 100644 --- a/src/Dibi/Drivers/OracleDriver.php +++ b/src/Dibi/Drivers/OracleDriver.php @@ -27,8 +27,6 @@ use Dibi; */ class OracleDriver implements Dibi\Driver { - use Dibi\Strict; - /** @var resource */ private $connection; diff --git a/src/Dibi/Drivers/OracleReflector.php b/src/Dibi/Drivers/OracleReflector.php index 90609ec2..d035e888 100644 --- a/src/Dibi/Drivers/OracleReflector.php +++ b/src/Dibi/Drivers/OracleReflector.php @@ -17,8 +17,6 @@ use Dibi; */ class OracleReflector implements Dibi\Reflector { - use Dibi\Strict; - /** @var Dibi\Driver */ private $driver; diff --git a/src/Dibi/Drivers/OracleResult.php b/src/Dibi/Drivers/OracleResult.php index 2d05b289..8c5adff7 100644 --- a/src/Dibi/Drivers/OracleResult.php +++ b/src/Dibi/Drivers/OracleResult.php @@ -17,8 +17,6 @@ use Dibi; */ class OracleResult implements Dibi\ResultDriver { - use Dibi\Strict; - /** @var resource */ private $resultSet; diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PdoDriver.php index 784c1e38..4b889a45 100644 --- a/src/Dibi/Drivers/PdoDriver.php +++ b/src/Dibi/Drivers/PdoDriver.php @@ -27,8 +27,6 @@ use PDO; */ class PdoDriver implements Dibi\Driver { - use Dibi\Strict; - /** @var PDO|null Connection resource */ private $connection; diff --git a/src/Dibi/Drivers/PdoResult.php b/src/Dibi/Drivers/PdoResult.php index 73bad23c..3cd7bd61 100644 --- a/src/Dibi/Drivers/PdoResult.php +++ b/src/Dibi/Drivers/PdoResult.php @@ -19,8 +19,6 @@ use PDO; */ class PdoResult implements Dibi\ResultDriver { - use Dibi\Strict; - /** @var \PDOStatement|null */ private $resultSet; diff --git a/src/Dibi/Drivers/PostgreDriver.php b/src/Dibi/Drivers/PostgreDriver.php index 5c34ae14..c1c3401d 100644 --- a/src/Dibi/Drivers/PostgreDriver.php +++ b/src/Dibi/Drivers/PostgreDriver.php @@ -28,8 +28,6 @@ use PgSql; */ class PostgreDriver implements Dibi\Driver { - use Dibi\Strict; - /** @var resource|PgSql\Connection */ private $connection; diff --git a/src/Dibi/Drivers/PostgreReflector.php b/src/Dibi/Drivers/PostgreReflector.php index d7bcb15b..2893718f 100644 --- a/src/Dibi/Drivers/PostgreReflector.php +++ b/src/Dibi/Drivers/PostgreReflector.php @@ -17,8 +17,6 @@ use Dibi; */ class PostgreReflector implements Dibi\Reflector { - use Dibi\Strict; - /** @var Dibi\Driver */ private $driver; diff --git a/src/Dibi/Drivers/PostgreResult.php b/src/Dibi/Drivers/PostgreResult.php index 29d0be3d..1594e31b 100644 --- a/src/Dibi/Drivers/PostgreResult.php +++ b/src/Dibi/Drivers/PostgreResult.php @@ -19,8 +19,6 @@ use PgSql; */ class PostgreResult implements Dibi\ResultDriver { - use Dibi\Strict; - /** @var resource|PgSql\Result */ private $resultSet; diff --git a/src/Dibi/Drivers/SqliteDriver.php b/src/Dibi/Drivers/SqliteDriver.php index 9b1cad77..af54e3f3 100644 --- a/src/Dibi/Drivers/SqliteDriver.php +++ b/src/Dibi/Drivers/SqliteDriver.php @@ -25,8 +25,6 @@ use SQLite3; */ class SqliteDriver implements Dibi\Driver { - use Dibi\Strict; - /** @var SQLite3 */ private $connection; diff --git a/src/Dibi/Drivers/SqliteReflector.php b/src/Dibi/Drivers/SqliteReflector.php index da2a36f4..b8dbbc7e 100644 --- a/src/Dibi/Drivers/SqliteReflector.php +++ b/src/Dibi/Drivers/SqliteReflector.php @@ -17,8 +17,6 @@ use Dibi; */ class SqliteReflector implements Dibi\Reflector { - use Dibi\Strict; - /** @var Dibi\Driver */ private $driver; diff --git a/src/Dibi/Drivers/SqliteResult.php b/src/Dibi/Drivers/SqliteResult.php index e09e610a..b39f7e51 100644 --- a/src/Dibi/Drivers/SqliteResult.php +++ b/src/Dibi/Drivers/SqliteResult.php @@ -18,8 +18,6 @@ use Dibi\Helpers; */ class SqliteResult implements Dibi\ResultDriver { - use Dibi\Strict; - /** @var \SQLite3Result */ private $resultSet; diff --git a/src/Dibi/Drivers/SqlsrvDriver.php b/src/Dibi/Drivers/SqlsrvDriver.php index 9f13f5e0..888898c8 100644 --- a/src/Dibi/Drivers/SqlsrvDriver.php +++ b/src/Dibi/Drivers/SqlsrvDriver.php @@ -27,8 +27,6 @@ use Dibi\Helpers; */ class SqlsrvDriver implements Dibi\Driver { - use Dibi\Strict; - /** @var resource */ private $connection; diff --git a/src/Dibi/Drivers/SqlsrvReflector.php b/src/Dibi/Drivers/SqlsrvReflector.php index b7b78f46..07a4f7e2 100644 --- a/src/Dibi/Drivers/SqlsrvReflector.php +++ b/src/Dibi/Drivers/SqlsrvReflector.php @@ -17,8 +17,6 @@ use Dibi; */ class SqlsrvReflector implements Dibi\Reflector { - use Dibi\Strict; - /** @var Dibi\Driver */ private $driver; diff --git a/src/Dibi/Drivers/SqlsrvResult.php b/src/Dibi/Drivers/SqlsrvResult.php index d9fabe88..c9b7dbc5 100644 --- a/src/Dibi/Drivers/SqlsrvResult.php +++ b/src/Dibi/Drivers/SqlsrvResult.php @@ -17,8 +17,6 @@ use Dibi; */ class SqlsrvResult implements Dibi\ResultDriver { - use Dibi\Strict; - /** @var resource */ private $resultSet; diff --git a/src/Dibi/Event.php b/src/Dibi/Event.php index ae4d307b..15317da4 100644 --- a/src/Dibi/Event.php +++ b/src/Dibi/Event.php @@ -15,8 +15,6 @@ namespace Dibi; */ class Event { - use Strict; - /** event type */ public const CONNECT = 1, diff --git a/src/Dibi/Expression.php b/src/Dibi/Expression.php index 969345f5..fba5d317 100644 --- a/src/Dibi/Expression.php +++ b/src/Dibi/Expression.php @@ -15,8 +15,6 @@ namespace Dibi; */ class Expression { - use Strict; - /** @var array */ private $values; diff --git a/src/Dibi/Fluent.php b/src/Dibi/Fluent.php index 81f7f6a6..56608575 100644 --- a/src/Dibi/Fluent.php +++ b/src/Dibi/Fluent.php @@ -45,8 +45,6 @@ namespace Dibi; */ class Fluent implements IDataSource { - use Strict; - public const REMOVE = false; /** @var array */ diff --git a/src/Dibi/Helpers.php b/src/Dibi/Helpers.php index ffe3ed07..d9f5607a 100644 --- a/src/Dibi/Helpers.php +++ b/src/Dibi/Helpers.php @@ -12,8 +12,6 @@ namespace Dibi; class Helpers { - use Strict; - /** @var HashMap */ private static $types; diff --git a/src/Dibi/Literal.php b/src/Dibi/Literal.php index e81c4632..2fb74140 100644 --- a/src/Dibi/Literal.php +++ b/src/Dibi/Literal.php @@ -15,8 +15,6 @@ namespace Dibi; */ class Literal { - use Strict; - /** @var string */ private $value; diff --git a/src/Dibi/Loggers/FileLogger.php b/src/Dibi/Loggers/FileLogger.php index 5c53c387..723d9537 100644 --- a/src/Dibi/Loggers/FileLogger.php +++ b/src/Dibi/Loggers/FileLogger.php @@ -17,8 +17,6 @@ use Dibi; */ class FileLogger { - use Dibi\Strict; - /** @var string Name of the file where SQL errors should be logged */ public $file; diff --git a/src/Dibi/Reflection/Column.php b/src/Dibi/Reflection/Column.php index 174faeb1..9be29598 100644 --- a/src/Dibi/Reflection/Column.php +++ b/src/Dibi/Reflection/Column.php @@ -27,8 +27,6 @@ use Dibi; */ class Column { - use Dibi\Strict; - /** @var Dibi\Reflector|null when created by Result */ private $reflector; diff --git a/src/Dibi/Reflection/Database.php b/src/Dibi/Reflection/Database.php index b46ad18f..67beb1d2 100644 --- a/src/Dibi/Reflection/Database.php +++ b/src/Dibi/Reflection/Database.php @@ -21,8 +21,6 @@ use Dibi; */ class Database { - use Dibi\Strict; - /** @var Dibi\Reflector */ private $reflector; diff --git a/src/Dibi/Reflection/ForeignKey.php b/src/Dibi/Reflection/ForeignKey.php index 040d3325..20ee6a4f 100644 --- a/src/Dibi/Reflection/ForeignKey.php +++ b/src/Dibi/Reflection/ForeignKey.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace Dibi\Reflection; -use Dibi; /** @@ -20,8 +19,6 @@ use Dibi; */ class ForeignKey { - use Dibi\Strict; - /** @var string */ private $name; diff --git a/src/Dibi/Reflection/Index.php b/src/Dibi/Reflection/Index.php index 27287bae..2c23214c 100644 --- a/src/Dibi/Reflection/Index.php +++ b/src/Dibi/Reflection/Index.php @@ -9,7 +9,6 @@ declare(strict_types=1); namespace Dibi\Reflection; -use Dibi; /** @@ -22,8 +21,6 @@ use Dibi; */ class Index { - use Dibi\Strict; - /** @var array (name, columns, [unique], [primary]) */ private $info; diff --git a/src/Dibi/Reflection/Result.php b/src/Dibi/Reflection/Result.php index a843de50..41b364fe 100644 --- a/src/Dibi/Reflection/Result.php +++ b/src/Dibi/Reflection/Result.php @@ -20,8 +20,6 @@ use Dibi; */ class Result { - use Dibi\Strict; - /** @var Dibi\ResultDriver */ private $driver; diff --git a/src/Dibi/Reflection/Table.php b/src/Dibi/Reflection/Table.php index a0e28f8e..e8b06435 100644 --- a/src/Dibi/Reflection/Table.php +++ b/src/Dibi/Reflection/Table.php @@ -25,8 +25,6 @@ use Dibi; */ class Table { - use Dibi\Strict; - /** @var Dibi\Reflector */ private $reflector; diff --git a/src/Dibi/Result.php b/src/Dibi/Result.php index 076c2ea3..3b2d9812 100644 --- a/src/Dibi/Result.php +++ b/src/Dibi/Result.php @@ -17,8 +17,6 @@ namespace Dibi; */ class Result implements IDataSource { - use Strict; - /** @var ResultDriver|null */ private $driver; diff --git a/src/Dibi/ResultIterator.php b/src/Dibi/ResultIterator.php index a23fb017..d33b9f59 100644 --- a/src/Dibi/ResultIterator.php +++ b/src/Dibi/ResultIterator.php @@ -15,8 +15,6 @@ namespace Dibi; */ class ResultIterator implements \Iterator, \Countable { - use Strict; - /** @var Result */ private $result; diff --git a/src/Dibi/Strict.php b/src/Dibi/Strict.php deleted file mode 100644 index 4d307c39..00000000 --- a/src/Dibi/Strict.php +++ /dev/null @@ -1,112 +0,0 @@ - [type => callback]] */ - private static $extMethods; - - - /** - * Call to undefined method. - * @throws \LogicException - */ - public function __call(string $name, array $args) - { - $class = method_exists($this, $name) ? 'parent' : static::class; - $items = (new ReflectionClass($this))->getMethods(ReflectionMethod::IS_PUBLIC); - $items = array_map(fn($item) => $item->getName(), $items); - $hint = ($t = Helpers::getSuggestion($items, $name)) - ? ", did you mean $t()?" - : '.'; - throw new \LogicException("Call to undefined method $class::$name()$hint"); - } - - - /** - * Call to undefined static method. - * @throws \LogicException - */ - public static function __callStatic(string $name, array $args) - { - $rc = new ReflectionClass(static::class); - $items = array_filter($rc->getMethods(\ReflectionMethod::IS_STATIC), fn($m) => $m->isPublic()); - $items = array_map(fn($item) => $item->getName(), $items); - $hint = ($t = Helpers::getSuggestion($items, $name)) - ? ", did you mean $t()?" - : '.'; - throw new \LogicException("Call to undefined static method {$rc->getName()}::$name()$hint"); - } - - - /** - * Access to undeclared property. - * @throws \LogicException - */ - public function &__get(string $name) - { - if ((method_exists($this, $m = 'get' . $name) || method_exists($this, $m = 'is' . $name)) - && (new ReflectionMethod($this, $m))->isPublic() - ) { // back compatiblity - $ret = $this->$m(); - return $ret; - } - - $rc = new ReflectionClass($this); - $items = array_filter($rc->getProperties(ReflectionProperty::IS_PUBLIC), fn($p) => !$p->isStatic()); - $items = array_map(fn($item) => $item->getName(), $items); - $hint = ($t = Helpers::getSuggestion($items, $name)) - ? ", did you mean $$t?" - : '.'; - throw new \LogicException("Attempt to read undeclared property {$rc->getName()}::$$name$hint"); - } - - - /** - * Access to undeclared property. - * @throws \LogicException - */ - public function __set(string $name, $value) - { - $rc = new ReflectionClass($this); - $items = array_filter($rc->getProperties(ReflectionProperty::IS_PUBLIC), fn($p) => !$p->isStatic()); - $items = array_map(fn($item) => $item->getName(), $items); - $hint = ($t = Helpers::getSuggestion($items, $name)) - ? ", did you mean $$t?" - : '.'; - throw new \LogicException("Attempt to write to undeclared property {$rc->getName()}::$$name$hint"); - } - - - public function __isset(string $name): bool - { - return false; - } - - - /** - * Access to undeclared property. - * @throws \LogicException - */ - public function __unset(string $name) - { - $class = static::class; - throw new \LogicException("Attempt to unset undeclared property $class::$$name."); - } -} diff --git a/src/Dibi/Translator.php b/src/Dibi/Translator.php index ce72a08b..e99aa945 100644 --- a/src/Dibi/Translator.php +++ b/src/Dibi/Translator.php @@ -15,8 +15,6 @@ namespace Dibi; */ final class Translator { - use Strict; - /** @var Connection */ private $connection; diff --git a/src/Dibi/dibi.php b/src/Dibi/dibi.php index 3de24939..37aaaf6a 100644 --- a/src/Dibi/dibi.php +++ b/src/Dibi/dibi.php @@ -37,8 +37,6 @@ declare(strict_types=1); */ class dibi { - use Dibi\Strict; - public const AFFECTED_ROWS = 'a', IDENTIFIER = 'n'; diff --git a/tests/dibi/Strict.phpt b/tests/dibi/Strict.phpt deleted file mode 100644 index 9d19cadd..00000000 --- a/tests/dibi/Strict.phpt +++ /dev/null @@ -1,151 +0,0 @@ -undeclared(); -}, LogicException::class, 'Call to undefined method TestClass::undeclared().'); - -Assert::exception(function () { - TestClass::undeclared(); -}, LogicException::class, 'Call to undefined static method TestClass::undeclared().'); - -Assert::exception(function () { - $obj = new TestChild; - $obj->callParent(); -}, LogicException::class, 'Call to undefined method parent::callParent().'); - -Assert::exception(function () { - $obj = new TestClass; - $obj->publicMethodX(); -}, LogicException::class, 'Call to undefined method TestClass::publicMethodX(), did you mean publicMethod()?'); - -Assert::exception(function () { // suggest static method - $obj = new TestClass; - $obj->publicMethodStaticX(); -}, LogicException::class, 'Call to undefined method TestClass::publicMethodStaticX(), did you mean publicMethodStatic()?'); - -Assert::exception(function () { // suggest only public method - $obj = new TestClass; - $obj->protectedMethodX(); -}, LogicException::class, 'Call to undefined method TestClass::protectedMethodX().'); - - -// writing -Assert::exception(function () { - $obj = new TestClass; - $obj->undeclared = 'value'; -}, LogicException::class, 'Attempt to write to undeclared property TestClass::$undeclared.'); - -Assert::exception(function () { - $obj = new TestClass; - $obj->publicX = 'value'; -}, LogicException::class, 'Attempt to write to undeclared property TestClass::$publicX, did you mean $public?'); - -Assert::exception(function () { // suggest only non-static property - $obj = new TestClass; - $obj->publicStaticX = 'value'; -}, LogicException::class, 'Attempt to write to undeclared property TestClass::$publicStaticX.'); - -Assert::exception(function () { // suggest only public property - $obj = new TestClass; - $obj->protectedX = 'value'; -}, LogicException::class, 'Attempt to write to undeclared property TestClass::$protectedX.'); - - -// property getter -$obj = new TestClass; -Assert::false(isset($obj->bar)); -Assert::same(123, $obj->bar); -Assert::false(isset($obj->foo)); -Assert::same(456, $obj->foo); - - -// reading -Assert::exception(function () { - $obj = new TestClass; - $val = $obj->undeclared; -}, LogicException::class, 'Attempt to read undeclared property TestClass::$undeclared.'); - -Assert::exception(function () { - $obj = new TestClass; - $val = $obj->publicX; -}, LogicException::class, 'Attempt to read undeclared property TestClass::$publicX, did you mean $public?'); - -Assert::exception(function () { // suggest only non-static property - $obj = new TestClass; - $val = $obj->publicStaticX; -}, LogicException::class, 'Attempt to read undeclared property TestClass::$publicStaticX.'); - -Assert::exception(function () { // suggest only public property - $obj = new TestClass; - $val = $obj->protectedX; -}, LogicException::class, 'Attempt to read undeclared property TestClass::$protectedX.'); - - -// unset/isset -Assert::exception(function () { - $obj = new TestClass; - unset($obj->undeclared); -}, LogicException::class, 'Attempt to unset undeclared property TestClass::$undeclared.'); - -Assert::false(isset($obj->undeclared));