PHP 8.4 specific changes

Author: rkrx

src/Builder/Expr/OptionalDBFilterMap.php

@@ -3,7 +3,7 @@
 
 class OptionalDBFilterMap {
 	/** @var array<string, mixed> */
-	private $map;
+	private array $map;
 
 	/**
 	 * @param array<string, mixed> $map
@@ -33,7 +33,7 @@ protected function getMap(): array {
 	 * @param null|callable(mixed): bool $validator
 	 * @return DBExprFilter
 	 */
-	public function __invoke(string $expression, $keyPath, callable $validator = null): DBExprFilter {
+	public function __invoke(string $expression, $keyPath, ?callable $validator = null): DBExprFilter {
 		return new DBExprFilter($expression, $this->map, $keyPath, $validator);
 	}
 }

src/Builder/Insert.php

@@ -133,7 +133,7 @@ public function addOrUpdateExpr(string $expr, ...$args) {
 	 * @param array<int, string>|null $excludeFields
 	 * @return $this
 	 */
-	public function addAll(array $data, array $mask = null, array $excludeFields = null) {
+	public function addAll(array $data, ?array $mask = null, ?array $excludeFields = null) {
 		$this->addAllTo($data, $mask, $excludeFields, function ($field, $value) {
 			$this->add($field, $value);
 		});
@@ -146,7 +146,7 @@ public function addAll(array $data, array $mask = null, array $excludeFields = n
 	 * @param array<int, string>|null $excludeFields
 	 * @return $this
 	 */
-	public function updateAll(array $data, array $mask = null, array $excludeFields = null) {
+	public function updateAll(array $data, ?array $mask = null, ?array $excludeFields = null) {
 		$this->addAllTo($data, $mask, $excludeFields, function ($field, $value) {
 			if($field !== $this->keyField) {
 				$this->update($field, $value);
@@ -161,7 +161,7 @@ public function updateAll(array $data, array $mask = null, array $excludeFields
 	 * @param array<int, string>|null $excludeFields
 	 * @return $this
 	 */
-	public function addOrUpdateAll(array $data, array $mask = null, array $excludeFields = null) {
+	public function addOrUpdateAll(array $data, ?array $mask = null, ?array $excludeFields = null) {
 		$this->addAll($data, $mask, $excludeFields);
 		$this->updateAll($data, $mask, $excludeFields);
 		return $this;
@@ -177,10 +177,10 @@ public function from(Select $select) {
 	}
 
 	/**
-	 * @param array<int, array<string, mixed>>|Traversable<int, array<string, mixed>> $rows
+	 * @param iterable<int, array<string, mixed>>|Traversable<int, array<string, mixed>> $rows
 	 * @return int[] Insert IDs
 	 */
-	abstract public function insertRows($rows);
+	abstract public function insertRows(iterable $rows);
 
 	/**
 	 * @param array<string, mixed> $params
@@ -226,7 +226,7 @@ public function __toString(): string {
 	/**
 	 * @param array<string|int, mixed> $fields
 	 * @param string $field
-	 * @param null|bool|int|float|string $value
+	 * @param null|bool|int|float|string|DateTimeInterface $value
 	 * @return array<string|int, mixed>
 	 */
 	private function addTo(array $fields, string $field, $value): array {

src/Builder/RunnableInsert.php

@@ -16,7 +16,7 @@ class RunnableInsert extends Insert implements DDLPreparable {
 	/**
 	 * @inheritDoc
 	 */
-	public function insertRows($rows) {
+	public function insertRows(iterable $rows) {
 		if (!is_iterable($rows)) {
 			throw new BadMethodCallException('Expected $rows to by an iterable');
 		}

src/Builder/Update.php

@@ -21,7 +21,7 @@ abstract class Update extends InsertUpdateStatement {
 	use OffsetBuilder;
 
 	/** @var mixed[] */
-	private $fields = [];
+	private array $fields = [];
 
 	/**
 	 * @param string $alias
@@ -77,7 +77,7 @@ public function setExpr(string $expr, ...$args): self {
 	 * @param array<int, string>|null $allowedFields
 	 * @return $this
 	 */
-	public function setAll(array $data, array $allowedFields = null): self {
+	public function setAll(array $data, ?array $allowedFields = null): self {
 		if($allowedFields !== null) {
 			foreach($data as $fieldName => $value) {
 				if(in_array($fieldName, $allowedFields)) {

src/Database.php

@@ -50,9 +50,9 @@ public function exec(
 
 	/**
 	 * @param string|null $name
-	 * @return string
+	 * @return string|null
 	 */
-	public function getLastInsertId(?string $name = null): string;
+	public function getLastInsertId(?string $name = null): ?string;
 
 	/**
 	 * @param string $table

src/Databases/MySQL.php

@@ -18,6 +18,7 @@
 use Kir\MySQL\Tools\VirtualTables;
 use PDO;
 use PDOException;
+use PDOStatement;
 use RuntimeException;
 use Stringable;
 use Throwable;
@@ -149,10 +150,14 @@ public function exec(
 
 	/**
 	 * @param string|null $name
-	 * @return string
+	 * @return string|null
 	 */
-	public function getLastInsertId(?string $name = null): string {
-		return $this->pdo->lastInsertId();
+	public function getLastInsertId(?string $name = null): ?string {
+		$result = $this->pdo->lastInsertId();
+		if($result === false) {
+			return null;
+		}
+		return $result;
 	}
 
 	/**
@@ -177,7 +182,9 @@ public function getTableFields(string $table): array {
 					return $this->tableFields[$fqTable];
 				} finally {
 					try {
-						$stmt->closeCursor();
+						if($stmt instanceof PDOStatement) {
+							$stmt->closeCursor();
+						}
 					} catch (Throwable $e) {}
 				}
 			})
@@ -213,7 +220,7 @@ public function quoteField(string $field): string {
 	 * @param array<string|int, string>|null $fields
 	 * @return MySQLRunnableSelect
 	 */
-	public function select(array $fields = null): Builder\RunnableSelect {
+	public function select(?array $fields = null): Builder\RunnableSelect {
 		$select = array_key_exists('select-factory', $this->options)
 			? call_user_func($this->options['select-factory'], $this, $this->options['select-options'])
 			: new MySQL\MySQLRunnableSelect($this, $this->options['select-options']);
@@ -227,7 +234,7 @@ public function select(array $fields = null): Builder\RunnableSelect {
 	 * @param null|array<string|int, string> $fields
 	 * @return Builder\RunnableInsert
 	 */
-	public function insert(array $fields = null): Builder\RunnableInsert {
+	public function insert(?array $fields = null): Builder\RunnableInsert {
 		$insert = array_key_exists('insert-factory', $this->options)
 			? call_user_func($this->options['insert-factory'], $this, $this->options['insert-options'])
 			: new Builder\RunnableInsert($this, $this->options['insert-options']);
@@ -241,7 +248,7 @@ public function insert(array $fields = null): Builder\RunnableInsert {
 	 * @param array<string|int, string>|null $fields
 	 * @return Builder\RunnableUpdate
 	 */
-	public function update(array $fields = null): Builder\RunnableUpdate {
+	public function update(?array $fields = null): Builder\RunnableUpdate {
 		$update = array_key_exists('update-factory', $this->options)
 			? call_user_func($this->options['update-factory'], $this, $this->options['update-options'])
 			: new Builder\RunnableUpdate($this, $this->options['update-options']);
@@ -331,7 +338,6 @@ public function transaction(callable $callback) {
 				$this->transactionCommit();
 				return $result;
 			} catch (Throwable $e) {
-				// @phpstan-ignore-next-line; If condition is always false as it is not.
 				if($this->pdo->inTransaction()) {
 					$this->transactionRollback();
 				}

tests/Builder/InsertTest/TestInsert.php

@@ -16,7 +16,7 @@ public static function create(): TestInsert {
 	/**
 	 * @inheritDoc
 	 */
-	public function insertRows($rows) {
+	public function insertRows(iterable $rows) {
 		return [];
 	}