- Fixed some issues reported by phpstan

Author: rkrx

src/Builder/Insert.php

@@ -243,9 +243,9 @@ private function addTo(array $fields, string $field, $value): array {
 	 * @param array<string, mixed> $data
 	 * @param array<int, string>|null $mask
 	 * @param array<int, string>|null $excludeFields
-	 * @param null|callable(string, mixed): void $fn
+	 * @param callable(string, mixed): void $fn
 	 */
-	private function addAllTo(array $data, ?array $mask = null, ?array $excludeFields = null, $fn = null): void {
+	private function addAllTo(array $data, ?array $mask, ?array $excludeFields, $fn): void {
 		if($mask !== null) {
 			$data = array_intersect_key($data, array_combine($mask, $mask));
 		}

src/Builder/RunnableSelect.php

@@ -118,86 +118,7 @@ public function fetchValue($default = null, ?callable $fn = null);
 	public function getFoundRows(): int;
 
 	/**
-	 * @return Traversable|array[]
-	 */
-	public function getIterator() {
-		/** @var Traversable|array[] $result */
-		$result = $this->fetchRowsLazy();
-		return $result;
-	}
-
-	/**
-	 * @param Closure|null $callback
-	 * @param int $mode
-	 * @param mixed $arg0
-	 * @return mixed
-	 */
-	private function fetchAll(Closure $callback = null, int $mode = 0, $arg0 = null) {
-		return $this->createTempStatement(function (QueryStatement $statement) use ($callback, $mode, $arg0) {
-			$statement->setFetchMode($mode, $arg0);
-			$data = $statement->fetchAll();
-			if($this->preserveTypes) {
-				$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
-				$data = array_map(static function ($row) use ($columnDefinitions) {
-					return FieldValueConverter::convertValues($row, $columnDefinitions);
-				}, $data);
-			}
-			if($callback !== null) {
-				return call_user_func(static function ($resultData = []) use ($data, $callback) {
-					foreach($data as $row) {
-						$result = $callback($row);
-						if($result !== null && !($result instanceof DBIgnoreRow)) {
-							$resultData[] = $result;
-						} else {
-							$resultData[] = $row;
-						}
-					}
-					return $resultData;
-				});
-			}
-			return $data;
-		});
-	}
-
-	/**
-	 * @param Closure|null $callback
-	 * @param int $mode
-	 * @param mixed $arg0
-	 * @return Traversable|mixed[]
-	 */
-	private function fetchLazy(Closure $callback = null, int $mode = PDO::FETCH_ASSOC, $arg0 = null) {
-		$statement = $this->createStatement();
-		$statement->setFetchMode($mode, $arg0);
-		$generator = new LazyRowGenerator($this->preserveTypes);
-		return $generator->generate($statement, $callback);
-	}
-
-	/**
-	 * @param Closure|null $callback
-	 * @param int $mode
-	 * @param mixed $arg0
-	 * @param Closure|null $resultValidator
-	 * @return mixed
-	 */
-	private function fetch(Closure $callback = null, int $mode = PDO::FETCH_ASSOC, $arg0 = null, Closure $resultValidator = null) {
-		return $this->createTempStatement(function (QueryStatement $statement) use ($callback, $mode, $arg0, $resultValidator) {
-			$statement->setFetchMode($mode, $arg0);
-			$row = $statement->fetch();
-			$result = $resultValidator($row);
-			if(!$result['valid']) {
-				return $result['default'];
-			}
-			if($this->preserveTypes) {
-				$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
-				$row = FieldValueConverter::convertValues($row, $columnDefinitions);
-			}
-			if($callback !== null) {
-				$result = $callback($row);
-				if($result !== null) {
-					$row = $result;
-				}
-			}
-			return $row;
-		});
-	}
+	 * @return Generator<int, array<string, mixed>>
+	 */
+	public function getIterator();
 }

src/Builder/Traits/AbstractDB.php

@@ -7,5 +7,5 @@ trait AbstractDB {
 	/**
 	 * @return Database
 	 */
-	abstract protected function db(): Database;
+	abstract protected function db();
 }

src/Builder/Traits/TableNameBuilder.php

@@ -50,5 +50,5 @@ protected function buildTableName(?string $alias, $name): string {
 	/**
 	 * @return Database
 	 */
-	abstract protected function db(): MySQL;
+	abstract protected function db();
 }

tests/Builder/SelectTest.php

@@ -441,9 +441,6 @@ public function testOptionalExpressions(): void {
 
 		self::assertEquals("SELECT\n\tt.field\nFROM\n\ttest t\nWHERE\n\t(t.field IN (1, 2, 3))\n", $query);
 
-	}
-
-	public function testOptionalExpressions2() {
 		$filter = ['filter' => ['name' => 'aaa', 'ids' => [1, 2, 3]]];
 		$opt = new OptionalDBFilterMap($filter);