Various PHP 8 related changes

Author: rkrx

.gitignore

@@ -8,6 +8,7 @@
 !/.travis.yml
 !/.scrutinizer.yml
 !/composer.json
+!/INSTRUCTIONS.md
 !/phpstan.neon
 !/README.md
 !/rector.php

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-    level: 6
+    level: 7
     paths:
         - src
         - tests

src/Databases/MySQL.php

@@ -65,7 +65,7 @@ public function __construct(PDO $pdo, array $options = []) {
 			'delete-options' => [],
 		];
 		$this->options = array_merge($defaultOptions, $options);
-		$this->options['timezone'] = $this->options['timezone'] ?? date_default_timezone_get();
+		$this->options['timezone'] ??= date_default_timezone_get();
 		if(!($this->options['timezone'] instanceof DateTimeZone)) {
 			$this->options['timezone'] = new DateTimeZone((string) $this->options['timezone']);
 		}

src/Databases/MySQL/MySQLQuoter.php

@@ -1,22 +1,18 @@
 <?php
 namespace Kir\MySQL\Databases\MySQL;
 
+use DateTimeImmutable;
 use DateTimeInterface;
 use DateTimeZone;
 use Kir\MySQL\Builder\DBExpr;
 use Kir\MySQL\Builder\Select;
 use PDO;
 
 class MySQLQuoter {
-	/** @var PDO */
-	private $pdo;
-	/** @var DateTimeZone */
-	private $timeZone;
-
-	public function __construct(PDO $pdo, DateTimeZone $timeZone) {
-		$this->timeZone = $timeZone;
-		$this->pdo = $pdo;
-	}
+	public function __construct(
+		private PDO $pdo,
+		private DateTimeZone $timeZone
+	) {}
 
 	/**
 	 * @param null|scalar|array<int, null|scalar>|DBExpr|Select|DateTimeInterface $value
@@ -48,7 +44,7 @@ public function quote($value): string {
 		}
 
 		if($value instanceof DateTimeInterface) {
-			$value = date_create_immutable($value->format('c'))->setTimezone($this->timeZone)->format('Y-m-d H:i:s');
+			$value = (new DateTimeImmutable($value->format('c')))->setTimezone($this->timeZone)->format('Y-m-d H:i:s');
 		}
 
 		return $this->pdo->quote($value);

src/Databases/MySQL/MySQLRunnableSelect.php

@@ -17,13 +17,10 @@
  */
 class MySQLRunnableSelect extends MySQLSelect {
 	/** @var array<string, mixed> */
-	private $values = [];
-	/** @var bool */
-	private $preserveTypes;
-	/** @var string */
-	private $defaultClassName;
-	/** @var int */
-	private $foundRows = 0;
+	private array $values = [];
+	private bool $preserveTypes;
+	private string $defaultClassName;
+	private int $foundRows = 0;
 
 	/**
 	 * @param MySQL $db
@@ -245,19 +242,18 @@ private function createStatement(): QueryStatement {
 	}
 
 	/**
-	 * @return Traversable<int, array<string, mixed>>
+	 * @return Traversable<int, array<string, bool|float|int|string|null>>
 	 */
 	public function getIterator(): Traversable {
 		yield from $this->fetchRowsLazy();
 	}
 
 	/**
-	 * @template TFnParamType of array<string, null|scalar>
 	 * @template TFnReturnType of array<string, null|scalar>
-	 * @param null|callable(TFnParamType): (TFnReturnType|DBIgnoreRow|null|void) $callback
+	 * @param null|(callable(array<string, null|scalar>): (TFnReturnType|DBIgnoreRow|null|void)) $callback
 	 * @param int $mode
 	 * @param mixed $arg0
-	 * @return ($callback is null ? array<int, ($mode is PDO::FETCH_NUM ? array<int, null|scalar> : array<string, null|scalar>)> : array<int, TFnReturnType|TFnParamType>)
+	 * @return ($callback is null ? array<int, ($mode is PDO::FETCH_NUM ? array<int, null|scalar> : array<string, null|scalar>)> : array<int, TFnReturnType>)
 	 */
 	private function fetchAll($callback = null, int $mode = 0, $arg0 = null) {
 		return $this->createTempStatement(function (QueryStatement $statement) use ($callback, $mode, $arg0) {
@@ -283,7 +279,6 @@ private function fetchAll($callback = null, int $mode = 0, $arg0 = null) {
 					return $resultData;
 				});
 			}
-			return $data;
 		});
 	}
 

src/Databases/MySQL/MySQLSelect.php

@@ -32,13 +32,10 @@ abstract class MySQLSelect extends Statement implements RunnableSelect {
 	use UnionBuilder;
 
 	/** @var array<int|string, string> */
-	private $fields = [];
-	/** @var bool */
-	private $calcFoundRows = false;
-	/** @var bool */
-	private $forUpdate = false;
-	/** @var bool */
-	private $distinct = false;
+	private array $fields = [];
+	private bool $calcFoundRows = false;
+	private bool $forUpdate = false;
+	private bool $distinct = false;
 
 	/**
 	 * @param bool $distinct

src/QueryLogger/ClosureQueryLogger.php

@@ -8,7 +8,7 @@ class ClosureQueryLogger implements QueryLogger {
 	private $fn;
 
 	/**
-	 * @param callable(string, float, string, Throwable|null): void $fn
+	 * @param callable(string, float, string, Throwable|null):void $fn
 	 */
 	public function __construct(callable $fn) {
 		$this->fn = $fn;

tests/Databases/MySQLTest.php

@@ -5,6 +5,7 @@
 use Kir\MySQL\Common\DBTestCase;
 use Kir\MySQL\QueryLogger\ClosureQueryLogger;
 use PDOException;
+use Throwable;
 use RuntimeException;
 
 class MySQLTest extends DBTestCase {
@@ -182,7 +183,7 @@ public function testInfoLoggingFromQuery(): void {
 	public function testErrorLoggingFromQuery(): void {
 		$log = (object) ['queries' => []];
 		$db = $this->getDB();
-		$db->getQueryLoggers()->add(new ClosureQueryLogger(function (string $query, float $duration, string $severity, ?PDOException $e) use ($log) {
+		$db->getQueryLoggers()->add(new ClosureQueryLogger(function (string $query, float $duration, string $severity, ?Throwable $e) use ($log) {
 			$log->queries[] = ['query' => $query, 'durection' => $duration, 'exception' => $e];
 		}));
 		$query = 'SELECT COUNT(*) FROM test1_';
@@ -210,7 +211,7 @@ public function testInfoLoggingFromExec(): void {
 	public function testErrorLoggingFromExec(): void {
 		$log = (object) ['queries' => []];
 		$db = $this->getDB();
-		$db->getQueryLoggers()->add(new ClosureQueryLogger(function (string $query, float $duration, string $severity, ?PDOException $e) use ($log) {
+		$db->getQueryLoggers()->add(new ClosureQueryLogger(function (string $query, float $duration, string $severity, ?Throwable $e) use ($log) {
 			$log->queries[] = ['query' => $query, 'durection' => $duration, 'exception' => $e];
 		}));
 		$query = 'UPDATE x SET y=1';
@@ -238,7 +239,7 @@ public function testInfoLoggingFromGetTableFields(): void {
 	public function testErrorLoggingFromGetTableFields(): void {
 		$log = (object) ['queries' => []];
 		$db = $this->getDB();
-		$db->getQueryLoggers()->add(new ClosureQueryLogger(function (string $query, float $duration, string $severity, ?PDOException $e) use ($log) {
+		$db->getQueryLoggers()->add(new ClosureQueryLogger(function (string $query, float $duration, string $severity, ?Throwable $e) use ($log) {
 			$log->queries[] = ['query' => $query, 'durection' => $duration, 'exception' => $e];
 		}));
 		$query = 'DESCRIBE test1_';