From 1bdf6e93d0c8ea1fabf45654daacc69a317b46b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Bar=C3=A1=C5=A1ek?= Date: Thu, 7 May 2020 21:30:57 +0200 Subject: [PATCH] PhpStan fixes (#363) --- composer.json | 1 + src/Dibi/Drivers/MySqliDriver.php | 3 +++ src/Dibi/Fluent.php | 6 ++++++ src/Dibi/Result.php | 6 +++++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c0947cbe..aece27b4 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,7 @@ "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 847fc24a..4d830ded 100644 --- a/src/Dibi/Drivers/MySqliDriver.php +++ b/src/Dibi/Drivers/MySqliDriver.php @@ -148,6 +148,9 @@ 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 fc8c0d6f..4cb80908 100644 --- a/src/Dibi/Fluent.php +++ b/src/Dibi/Fluent.php @@ -32,6 +32,12 @@ 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 c7a66f74..827e9053 100644 --- a/src/Dibi/Result.php +++ b/src/Dibi/Result.php @@ -19,7 +19,7 @@ class Result implements IDataSource { use Strict; - /** @var ResultDriver */ + /** @var ResultDriver|null */ private $driver; /** @var array Translate table */ @@ -242,6 +242,9 @@ class Result implements IDataSource $data = null; $assoc = preg_split('#(\[\]|->|=|\|)#', $assoc, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); + if (!$assoc) { + throw new \InvalidArgumentException("Invalid descriptor '$assoc'."); + } // check columns foreach ($assoc as $as) { @@ -292,6 +295,7 @@ class Result implements IDataSource } while ($row = $this->fetch()); unset($x); + /** @var mixed[] $data */ return $data; }