From dbbf0ca673ef76045684984a71286e92d0dc3e4c Mon Sep 17 00:00:00 2001 From: David Grudl Date: Thu, 7 May 2020 21:42:36 +0200 Subject: [PATCH] Revert "PhpStan fixes (#363)" This reverts commit 68f9d0981f194931e475e2c93730d8e8785c20e4. --- composer.json | 1 - src/Dibi/Drivers/MySqliDriver.php | 3 --- src/Dibi/Fluent.php | 6 ------ src/Dibi/Result.php | 3 +-- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/composer.json b/composer.json index aece27b4..c0947cbe 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,6 @@ "require-dev": { "tracy/tracy": "~2.2", "nette/tester": "~2.0", - "nette/di": "^3.0", "phpstan/phpstan": "^0.12" }, "replace": { diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySqliDriver.php index 4d830ded..847fc24a 100644 --- a/src/Dibi/Drivers/MySqliDriver.php +++ b/src/Dibi/Drivers/MySqliDriver.php @@ -148,9 +148,6 @@ class MySqliDriver implements Dibi\Driver } - /** - * @param int|string $code - */ public static function createException(string $message, $code, string $sql): Dibi\DriverException { if (in_array($code, [1216, 1217, 1451, 1452, 1701], true)) { diff --git a/src/Dibi/Fluent.php b/src/Dibi/Fluent.php index 4cb80908..fc8c0d6f 100644 --- a/src/Dibi/Fluent.php +++ b/src/Dibi/Fluent.php @@ -32,12 +32,6 @@ namespace Dibi; * @method Fluent and(...$cond) * @method Fluent or(...$cond) * @method Fluent using(...$cond) - * @method Fluent update(...$cond) - * @method Fluent insert(...$cond) - * @method Fluent delete(...$cond) - * @method Fluent into(...$cond) - * @method Fluent values(...$cond) - * @method Fluent set(...$args) * @method Fluent asc() * @method Fluent desc() */ diff --git a/src/Dibi/Result.php b/src/Dibi/Result.php index 827e9053..2db4aa01 100644 --- a/src/Dibi/Result.php +++ b/src/Dibi/Result.php @@ -19,7 +19,7 @@ class Result implements IDataSource { use Strict; - /** @var ResultDriver|null */ + /** @var ResultDriver */ private $driver; /** @var array Translate table */ @@ -295,7 +295,6 @@ class Result implements IDataSource } while ($row = $this->fetch()); unset($x); - /** @var mixed[] $data */ return $data; }