CS

Author: forrest79

benchmarks/run-benchmarks.php

@@ -3,6 +3,9 @@
 
 namespace Forrest79\PhPgSql\Benchmarks;
 
-foreach ((array) \glob(__DIR__ . '/*Benchmark.php') as $benchmarkFile) {
+$benchmarkFiles = \glob(__DIR__ . '/*Benchmark.php');
+assert(is_array($benchmarkFiles));
+
+foreach ($benchmarkFiles as $benchmarkFile) {
 	require $benchmarkFile;
 }

composer.json

@@ -15,12 +15,13 @@
 		"ext-pgsql": "^8.1"
 	},
 	"require-dev": {
-		"forrest79/phpcs": "^1.6",
+		"forrest79/phpcs": "^1.7",
 		"forrest79/phpcs-ignores": "^0.5",
 		"forrest79/phpgsql-phpstan": "^1.7",
 		"nette/tester": "^2.5",
 		"phpstan/phpstan": "^1.11",
-		"phpstan/phpstan-strict-rules": "^1.6"
+		"phpstan/phpstan-strict-rules": "^1.6",
+		"shipmonk/phpstan-rules": "^3.2"
 	},
 	"suggest": {
 		"ext-json": "Needed to support parse JSON types from PostgreSQL"

phpcs.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <ruleset name="PhpFpmRequest">
-	<rule ref="./vendor/forrest79/phpcs/Forrest79CodingStandard/ruleset.xml"/>
+	<rule ref="./vendor/forrest79/phpcs/Forrest79CodingStandard/ruleset.xml">
+		<exclude name="SlevomatCodingStandard.TypeHints.ClassConstantTypeHint.MissingNativeTypeHint"/><!-- PHP 8.3+ -->
+	</rule>
 
 	<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
 		<properties>

phpstan.neon

@@ -1,11 +1,26 @@
 includes:
 	- %rootDir%/conf/bleedingEdge.neon
 	- %rootDir%/../phpstan-strict-rules/rules.neon
+	- %rootDir%/../../../vendor/shipmonk/phpstan-rules/rules.neon
 	- %rootDir%/../../forrest79/phpgsql-phpstan/extension.neon
 
 parameters:
 	level: max
 
+	shipmonkRules:
+		forbidCheckedExceptionInCallable:
+			enabled: false
+		forbidCheckedExceptionInYieldingMethod:
+			enabled: false
+		forbidUnsafeArrayKey:
+			enabled: false
+		forbidUnsetClassField:
+			enabled: false
+		forbidVariableTypeOverwriting:
+			enabled: false
+		uselessPrivatePropertyNullability:
+			enabled: false
+
 	ignoreErrors:
 		# === This is OK ===
 
@@ -47,6 +62,11 @@ parameters:
 			path: %rootDir%/../../../tests/Integration/FetchMutatorTest.php
 			count: 28
 
+		-
+			message: '#^Using \+ over non-number \(mixed \+ int\)$#'
+			path: %rootDir%/../../../tests/Integration/FetchMutatorTest.php
+			count: 3
+
 		-
 			message: '#^Expression ".+" on a separate line does not do anything\.$#'
 			path: %rootDir%/../../../tests/Integration/FetchTest.php

src/Db/DataTypeParsers/Basic.php

@@ -33,11 +33,11 @@ public function parse(string $type, string|NULL $value): mixed
 				case '_date':
 					return $this->parseArray($value, [$this, 'parseDate']);
 				case '_timestamp':
-					return $this->parseArray($value, function ($value): \DateTimeImmutable {
+					return $this->parseArray($value, function (string $value): \DateTimeImmutable {
 						return $this->parseTimestamp(\trim($value, '"'));
 					});
 				case '_timestamptz':
-					return $this->parseArray($value, function ($value): \DateTimeImmutable {
+					return $this->parseArray($value, function (string $value): \DateTimeImmutable {
 						return $this->parseTimestampTz(\trim($value, '"'));
 					});
 				case '_time':

src/Db/PreparedStatementHelper.php

@@ -38,7 +38,7 @@ protected static function prepareQuery(string $query): string
 
 		return (string) \preg_replace_callback(
 			'/([\\\\]?)\?/',
-			static function ($matches) use (&$paramIndex): string {
+			static function (array $matches) use (&$paramIndex): string {
 				if ($matches[1] === '\\') {
 					return '?';
 				}
@@ -56,7 +56,7 @@ static function ($matches) use (&$paramIndex): string {
 	 */
 	protected static function prepareParams(array $params): array
 	{
-		return \array_map(static function ($value) {
+		return \array_map(static function (mixed $value): mixed {
 			if (\is_bool($value)) {
 				return $value ? 'TRUE' : 'FALSE';
 			}

src/Db/Sql/Query.php

@@ -62,7 +62,7 @@ private static function prepareQuery(string $sql, array $params, int $paramIndex
 
 		$sql = \preg_replace_callback(
 			'/([\\\\]?)\?/',
-			static function ($matches) use (&$params, &$parsedParams, &$origParamIndex, &$paramIndex): string {
+			static function (array $matches) use (&$params, &$parsedParams, &$origParamIndex, &$paramIndex): string {
 				if ($matches[1] === '\\') {
 					return '?';
 				}

tests/Integration/DocsTest.php

@@ -62,6 +62,8 @@ public function testDocs(string $filename, string $source): void
 				$source,
 			);
 
+			assert(is_string($source));
+
 			\file_put_contents($tempFile, '<?php declare(strict_types=1);' . \PHP_EOL . \PHP_EOL . $source);
 
 			echo 'Source file: ' . $tempFile . \PHP_EOL;

tests/Integration/PreparedStatementTest.php

@@ -88,7 +88,7 @@ public function testQueryEvent(): void
 		$preparedStatement = $this->connection->prepareStatement('SELECT pg_sleep(1)');
 		$preparedStatement->execute();
 
-		Tester\Assert::true($queryDuration > 0);
+		Tester\Assert::true(($queryDuration ?? 0) > 0);
 		Tester\Assert::same('phpgsql1', $queryPrapareStatementName);
 	}