Fixed some issues reported by phpstan

rkrx · rkrx · commit e680d4a7846a · 2021-12-19T12:04:06.000+01:00
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,5 @@
 parameters:
-    level: max
+    level: 6
     paths:
         - src
         - tests
diff --git a/src/Builder/Expr/DBExprFilter.php b/src/Builder/Expr/DBExprFilter.php
@@ -87,18 +87,4 @@ private function buildKey($keyPath): array {
 		}
 		return $keyPath;
 	}
-
-	/**
-	 * @param array<string, mixed> $array
-	 * @return bool
-	 */
-	private function isValidArray(array $array): bool {
-		$data = array_filter($array, function ($value) {
-			if(is_array($value)) {
-				return $this->isValidArray($value);
-			}
-			return (string) $value !== '';
-		});
-		return count($data) > 0;
-	}
 }
diff --git a/src/Builder/Helpers/RecursiveStructureAccess.php b/src/Builder/Helpers/RecursiveStructureAccess.php
@@ -24,7 +24,7 @@ public static function recursiveHas($structure, $path): bool {
 	public static function recursiveGet($structure, $path, $default) {
 		$arrayPath = self::getArrayPath($path);
 		$data = self::ensureArrayIsArray($structure);
-		$count = count($arrayPath ?? []);
+		$count = count($arrayPath);
 		if (!$count) {
 			return $default;
 		}
diff --git a/src/Builder/QueryStatement.php b/src/Builder/QueryStatement.php
@@ -79,12 +79,16 @@ public function execute(array $params = []) {
 	 * @return array<mixed, mixed>
 	 */
 	public function fetchAll($fetchStyle = PDO::FETCH_ASSOC, $fetchArgument = null, array $ctorArgs = []): array {
-		return $this->exceptionHandler($this->query, function() use ($fetchStyle, $fetchArgument, $ctorArgs) {
+		$result = $this->exceptionHandler($this->query, function() use ($fetchStyle, $fetchArgument, $ctorArgs) {
 			if($fetchArgument !== null) {
 				return $this->statement->fetchAll($fetchStyle, $fetchArgument, ...$ctorArgs);
 			}
 			return $this->statement->fetchAll($fetchStyle);
 		});
+		if(is_bool($result)) {
+			return [];
+		}
+		return $result;
 	}
 
 	/**
diff --git a/src/Builder/Traits/CreateDDLRunnable.php b/src/Builder/Traits/CreateDDLRunnable.php
@@ -9,7 +9,6 @@
  */
 trait CreateDDLRunnable {
 	/**
-	 * @template I
 	 * @template T
 	 * @param DatabaseStatement $query
 	 * @param callable(scalar=): T $callbackFn
diff --git a/src/Databases/MySQL.php b/src/Databases/MySQL.php
@@ -313,6 +313,7 @@ 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();
 				}
diff --git a/tests/Databases/MySQLTest.php b/tests/Databases/MySQLTest.php
@@ -61,6 +61,7 @@ public function testNestedTransactionWithException(): void {
 				self::assertEquals(101, $this->getDB()->query('SELECT field1 FROM test1 WHERE id=1')->fetchColumn(0));
 			}
 		});
+		// @phpstan-ignore-next-line - "Unreachable statement - code above always terminates."
 		self::assertEquals(100, $this->getDB()->query('SELECT field1 FROM test1 WHERE id=1')->fetchColumn(0));
 	}
 
@@ -166,7 +167,7 @@ public function testFetchValue(): void {
 		self::assertEquals('1', $value);
 	}
 
-	public function testInfoLoggingFromQuery() {
+	public function testInfoLoggingFromQuery(): void {
 		$log = (object) ['queries' => []];
 		$db = $this->getDB();
 		$db->getQueryLoggers()->add(new ClosureQueryLogger(function (string $query, float $duration, string $severity) use ($log) {
@@ -177,21 +178,21 @@ public function testInfoLoggingFromQuery() {
 		self::assertEquals($query, $log->queries[0]['query'] ?? null);
 	}
 
-	public function testErrorLoggingFromQuery() {
+	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, ?PDOException $e) use ($log) {
 			$log->queries[] = ['query' => $query, 'durection' => $duration, 'exception' => $e];
 		}));
 		$query = 'SELECT COUNT(*) FROM test1_';
 		try {
 			$db->query($query)->fetchColumn(0);
 		} catch (PDOException $e) {}
 		self::assertEquals($query, $log->queries[0]['query'] ?? null);
-		self::assertContains('SQLSTATE[42S02]', ($log->queries[0]['exception'] ?? null)->getMessage());
+		self::assertStringContainsString('SQLSTATE[42S02]', ($log->queries[0]['exception'] ?? null)->getMessage());
 	}
 
-	public function testInfoLoggingFromExec() {
+	public function testInfoLoggingFromExec(): void {
 		$log = (object) ['queries' => []];
 		$db = $this->getDB();
 		$db->getQueryLoggers()->add(new ClosureQueryLogger(function (string $query, float $duration) use ($log) {
@@ -202,21 +203,21 @@ public function testInfoLoggingFromExec() {
 		self::assertEquals($query, $log->queries[0]['query'] ?? null);
 	}
 
-	public function testErrorLoggingFromExec() {
+	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, ?PDOException $e) use ($log) {
 			$log->queries[] = ['query' => $query, 'durection' => $duration, 'exception' => $e];
 		}));
 		$query = 'UPDATE x SET y=1';
 		try {
 			$db->exec($query);
 		} catch (PDOException $e) {}
 		self::assertEquals($query, $log->queries[0]['query'] ?? null);
-		self::assertContains('SQLSTATE[42S02]', ($log->queries[0]['exception'] ?? null)->getMessage());
+		self::assertStringContainsString('SQLSTATE[42S02]', ($log->queries[0]['exception'] ?? null)->getMessage());
 	}
 
-	public function testInfoLoggingFromGetTableFields() {
+	public function testInfoLoggingFromGetTableFields(): void {
 		$log = (object) ['queries' => []];
 		$db = $this->getDB();
 		$db->getQueryLoggers()->add(new ClosureQueryLogger(function (string $query, float $duration) use ($log) {
@@ -227,17 +228,17 @@ public function testInfoLoggingFromGetTableFields() {
 		self::assertEquals($query, $log->queries[0]['query'] ?? null);
 	}
 
-	public function testErrorLoggingFromGetTableFields() {
+	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, ?PDOException $e) use ($log) {
 			$log->queries[] = ['query' => $query, 'durection' => $duration, 'exception' => $e];
 		}));
 		$query = 'DESCRIBE test1_';
 		try {
 			$db->getTableFields('test1_');
 		} catch (PDOException $e) {}
 		self::assertEquals($query, $log->queries[0]['query'] ?? null);
-		self::assertContains('SQLSTATE[42S02]', ($log->queries[0]['exception'] ?? null)->getMessage());
+		self::assertStringContainsString('SQLSTATE[42S02]', ($log->queries[0]['exception'] ?? null)->getMessage());
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -87,18 +87,4 @@ private function buildKey($keyPath): array {`
`87`	`87`	`}`
`88`	`88`	`return $keyPath;`
`89`	`89`	`}`
`90`		`-`
`91`		`- /**`
`92`		`- * @param array<string, mixed> $array`
`93`		`- * @return bool`
`94`		`- */`
`95`		`- private function isValidArray(array $array): bool {`
`96`		`- $data = array_filter($array, function ($value) {`
`97`		`- if(is_array($value)) {`
`98`		`- return $this->isValidArray($value);`
`99`		`- }`
`100`		`- return (string) $value !== '';`
`101`		`- });`
`102`		`- return count($data) > 0;`
`103`		`- }`
`104`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static function recursiveHas($structure, $path): bool {`
`24`	`24`	`public static function recursiveGet($structure, $path, $default) {`
`25`	`25`	`$arrayPath = self::getArrayPath($path);`
`26`	`26`	`$data = self::ensureArrayIsArray($structure);`
`27`		`- $count = count($arrayPath ?? []);`
	`27`	`+ $count = count($arrayPath);`
`28`	`28`	`if (!$count) {`
`29`	`29`	`return $default;`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,7 @@ public function transaction(callable $callback) {`
`313`	`313`	`$this->transactionCommit();`
`314`	`314`	`return $result;`
`315`	`315`	`} catch (Throwable $e) {`
	`316`	`+ // @phpstan-ignore-next-line; If condition is always false as it is not.`
`316`	`317`	`if($this->pdo->inTransaction()) {`
`317`	`318`	`$this->transactionRollback();`
`318`	`319`	`}`