use subset of phpstan-strict-rules

composer.json

@@ -29,7 +29,8 @@
 		"squizlabs/php_codesniffer": "^3.7",
 		"slevomat/coding-standard": "~8.11.0",
 		"phpstan/phpstan-phpunit": "^1.1",
-		"phpstan/phpstan-deprecation-rules": "^1.1"
+		"phpstan/phpstan-deprecation-rules": "^1.1",
+		"phpstan/phpstan-strict-rules": "^1.5"
 	},
 	"config": {
 		"allow-plugins": {

phpstan.neon.dist

@@ -1,6 +1,7 @@
 includes:
 	- vendor/phpstan/phpstan-phpunit/extension.neon
 	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
+	- vendor/phpstan/phpstan-strict-rules/rules.neon
 	- phpstan-baseline.neon
 parameters:
 	phpVersion: 80100
@@ -19,6 +20,13 @@ parameters:
 			- 'MariaStan\Ast\Exception\InvalidArgumentException'
 			- 'InvalidArgumentException'
 			- 'ReflectionException'
+	strictRules:
+		# Ignore Dynamic call to static method PHPUnit\Framework\Assert::assertSame(). etc
+		strictCalls: false
+		# Ignore: Only booleans are allowed in an if condition, MariaStan\Parser\Token|null given etc
+		booleansInConditions: false
+		# Allow short ternary operator
+		disallowedConstructs: false
 	ignoreErrors:
 		-
 			message: '#.*throws checked exception.*#'

src/Analyser/AnalyserState.php

@@ -1298,10 +1298,10 @@ private function resolveExprType(Expr\Expr $expr, ?AnalyserConditionTypeEnum $co
 
 				$subresults = [];
 
-				foreach ($expr->conditions as $condition) {
-					$field = $this->resolveExprType($condition->when);
+				foreach ($expr->conditions as $caseCondition) {
+					$field = $this->resolveExprType($caseCondition->when);
 					$this->checkNotTuple($field->type);
-					$subresults[] = $field = $this->resolveExprType($condition->then);
+					$subresults[] = $field = $this->resolveExprType($caseCondition->then);
 					$this->checkNotTuple($field->type);
 				}
 

src/Analyser/ColumnResolver.php

@@ -593,8 +593,8 @@ public function resolveAllColumns(?string $table): array
 				$fields[] = new QueryResultField($column, $exprType);
 			}
 		} else {
-			foreach ($this->allColumns as ['column' => $column, 'table' => $table]) {
-				$exprType = $this->findColumnExprType($table, $column);
+			foreach ($this->allColumns as ['column' => $column, 'table' => $columnTable]) {
+				$exprType = $this->findColumnExprType($columnTable, $column);
 
 				// This would have already been reported previously, so let's ignore it.
 				if ($exprType === null) {

src/PHPStan/Helper/MySQLi/PHPStanMySQLiHelper.php

@@ -117,8 +117,8 @@ public function execute(AnalyserResultPHPStanParams $params, array $executeParam
 		$supportedPlaceholderTxt = implode(', ', array_keys($supportedPlaceholderCounts));
 		$errors = [];
 
-		foreach ($executeParamTypes as $params) {
-			$count = count($params);
+		foreach ($executeParamTypes as $executeParams) {
+			$count = count($executeParams);
 
 			if (isset($supportedPlaceholderCounts[$count])) {
 				continue;

src/Parser/Position.php

@@ -4,6 +4,7 @@
 
 namespace MariaStan\Parser;
 
+use function assert;
 use function max;
 use function mb_substr;
 use function min;
@@ -28,9 +29,13 @@ public function advance(string $str): self
 		$lines = substr_count($str, "\n");
 
 		if ($lines) {
+			$newLinePos = strrpos($str, "\n");
+			// implied by if ($lines)
+			assert($newLinePos !== false);
+
 			return new self(
 				$this->line + $lines,
-				strlen($str) - strrpos($str, "\n"),
+				strlen($str) - $newLinePos,
 				$this->offset + strlen($str),
 			);
 		}

src/Parser/TokenTypeEnum.php

@@ -8,6 +8,7 @@
 use function array_map;
 use function array_search;
 use function array_slice;
+use function assert;
 
 enum TokenTypeEnum: string
 {
@@ -325,6 +326,7 @@ public static function getKeywordsMap(): array
 			/** @phpstan-var array<int, TokenTypeEnum> $result Analysis is needlessly slow without this. */
 			$result = self::cases();
 			$eoiIdx = array_search(self::END_OF_INPUT, $result, true);
+			assert($eoiIdx !== false);
 			$result = array_slice($result, $eoiIdx + 1);
 			$result = array_combine(
 				array_map(static fn (self $e) => $e->value, $result),

tests/DbReflection/DbReflectionTest.php

@@ -123,7 +123,6 @@ public function test(DbReflection $reflection): void
 		$valDefaultExpr = $parser->parseSingleExpression('(abs(`val_mediumint`) + 5)');
 		$nullExpr = $parser->parseSingleExpression('NULL');
 
-		$this->assertNotNull($schema);
 		$this->assertSame($tableName, $schema->name);
 		$this->assertEquals([
 			'id' => new Column('id', new IntType(), false, null, true),

tests/Parser/CodeTestParser.php

@@ -101,7 +101,7 @@ private function extractMode(string $expected): array
 			return [$expected, null];
 		}
 
-		$expected = (string) substr($expected, $firstNewLine + 1);
+		$expected = substr($expected, $firstNewLine + 1);
 
 		return [$expected, substr($firstLine, 2)];
 	}