added PHP 8 typehints

Author: dg

src/Database/Connection.php

@@ -179,10 +179,7 @@ public function rollBack(): void
 	}
 
 
-	/**
-	 * @return mixed
-	 */
-	public function transaction(callable $callback)
+	public function transaction(callable $callback): mixed
 	{
 		if ($this->transactionDepth === 0) {
 			$this->beginTransaction();
@@ -263,9 +260,8 @@ public function fetch(string $sql, ...$params): ?Row
 
 	/**
 	 * Shortcut for query()->fetchField()
-	 * @return mixed
 	 */
-	public function fetchField(string $sql, ...$params)
+	public function fetchField(string $sql, ...$params): mixed
 	{
 		return $this->query($sql, ...$params)->fetchField();
 	}

src/Database/Conventions.php

@@ -16,9 +16,8 @@ interface Conventions
 {
 	/**
 	 * Returns primary key for table.
-	 * @return string|string[]|null
 	 */
-	function getPrimary(string $table);
+	function getPrimary(string $table): string|array|null;
 
 	/**
 	 * Returns referenced table & referenced column.

src/Database/Conventions/DiscoveredConventions.php

@@ -27,7 +27,7 @@ public function __construct(IStructure $structure)
 	}
 
 
-	public function getPrimary(string $table)
+	public function getPrimary(string $table): string|array|null
 	{
 		return $this->structure->getPrimaryKey($table);
 	}

src/Database/Driver.php

@@ -55,7 +55,6 @@ function formatLike(string $value, int $pos): string;
 
 	/**
 	 * Injects LIMIT/OFFSET to the SQL query.
-	 * @param  string  $sql query that will be modified.
 	 */
 	function applyLimit(string &$sql, ?int $limit, ?int $offset): void;
 

src/Database/DriverException.php

@@ -20,10 +20,7 @@ class DriverException extends \PDOException
 	public ?array $params = null;
 
 
-	/**
-	 * @return static
-	 */
-	public static function from(\PDOException $src)
+	public static function from(\PDOException $src): static
 	{
 		$e = new static($src->message, 0, $src);
 		$e->file = $src->file;
@@ -41,10 +38,7 @@ public static function from(\PDOException $src)
 	}
 
 
-	/**
-	 * @return int|string|null  Driver-specific error code
-	 */
-	public function getDriverCode()
+	public function getDriverCode(): int|string|null
 	{
 		return $this->errorInfo[1] ?? null;
 	}

src/Database/Explorer.php

@@ -60,10 +60,7 @@ public function rollBack(): void
 	}
 
 
-	/**
-	 * @return mixed
-	 */
-	public function transaction(callable $callback)
+	public function transaction(callable $callback): mixed
 	{
 		return $this->connection->transaction(fn() => $callback($this));
 	}
@@ -128,9 +125,8 @@ public function fetch(string $sql, ...$params): ?Row
 
 	/**
 	 * Shortcut for query()->fetchField()
-	 * @return mixed
 	 */
-	public function fetchField(string $sql, ...$params)
+	public function fetchField(string $sql, ...$params): mixed
 	{
 		return $this->connection->query($sql, ...$params)->fetchField();
 	}

src/Database/IStructure.php

@@ -41,7 +41,7 @@ function getColumns(string $table): array;
 	 * Returns table primary key.
 	 * @return string|string[]|null
 	 */
-	function getPrimaryKey(string $table);
+	function getPrimaryKey(string $table): string|array|null;
 
 	/**
 	 * Returns autoincrement primary key name.

src/Database/ResultSet.php

@@ -161,15 +161,13 @@ public function rewind(): void
 	}
 
 
-	#[\ReturnTypeWillChange]
-	public function current()
+	public function current(): mixed
 	{
 		return $this->result;
 	}
 
 
-	#[\ReturnTypeWillChange]
-	public function key()
+	public function key(): mixed
 	{
 		return $this->resultKey;
 	}
@@ -220,9 +218,8 @@ public function fetch(): ?Row
 
 	/**
 	 * Fetches single field.
-	 * @return mixed
 	 */
-	public function fetchField($column = 0)
+	public function fetchField(int $column = 0): mixed
 	{
 		if (func_num_args()) {
 			trigger_error(__METHOD__ . '() argument is deprecated.', E_USER_DEPRECATED);
@@ -247,7 +244,7 @@ public function fetchFields(): ?array
 	 * @param  string|int  $key  column name used for an array key or null for numeric index
 	 * @param  string|int  $value  column name used for an array value or null for the whole row
 	 */
-	public function fetchPairs($key = null, $value = null): array
+	public function fetchPairs(string|int $key = null, string|int $value = null): array
 	{
 		return Helpers::toPairs($this->fetchAll(), $key, $value);
 	}
@@ -268,7 +265,6 @@ public function fetchAll(): array
 
 	/**
 	 * Fetches all rows and returns associative tree.
-	 * @param  string  $path  associative descriptor
 	 */
 	public function fetchAssoc(string $path): array
 	{

src/Database/Row.php

@@ -30,13 +30,11 @@ public function __isset($key)
 	}
 
 
-	#[\ReturnTypeWillChange]
 	/**
 	 * Returns a item.
 	 * @param  string|int  $key  key or index
-	 * @return mixed
 	 */
-	public function offsetGet($key)
+	public function offsetGet($key): mixed
 	{
 		if (is_int($key)) {
 			$arr = array_slice((array) $this, $key, 1);

src/Database/Structure.php

@@ -54,7 +54,7 @@ public function getColumns(string $table): array
 	/**
 	 * @return string|string[]|null
 	 */
-	public function getPrimaryKey(string $table)
+	public function getPrimaryKey(string $table): string|array|null
 	{
 		$this->needStructure();
 		$table = $this->resolveFQTableName($table);