Increase PHPStan level

Author: ondrejmirtes

Makefile

@@ -25,6 +25,10 @@ cs-fix:
 phpstan:
 	php vendor/bin/phpstan
 
+.PHONY: phpstan-generate-baseline
+phpstan-generate-baseline:
+	php vendor/bin/phpstan --generate-baseline
+
 .PHONY: build-abnfgen
 build-abnfgen:
 	./build-abnfgen.sh

phpstan-baseline.neon

@@ -0,0 +1,11 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Method PHPStan\\\\PhpDocParser\\\\Ast\\\\ConstExpr\\\\QuoteAwareConstExprStringNode\\:\\:escapeDoubleQuotedString\\(\\) should return string but returns string\\|null\\.$#"
+			count: 1
+			path: src/Ast/ConstExpr/QuoteAwareConstExprStringNode.php
+
+		-
+			message: "#^Method PHPStan\\\\PhpDocParser\\\\Parser\\\\StringUnescaper\\:\\:parseEscapeSequences\\(\\) should return string but returns string\\|null\\.$#"
+			count: 1
+			path: src/Parser/StringUnescaper.php

phpstan.neon

@@ -1,7 +1,10 @@
+includes:
+	- phpstan-baseline.neon
+
 parameters:
 	paths:
 		- src
 		- tests
-	level: 5
+	level: 8
 	ignoreErrors:
 		- '#^Dynamic call to static method PHPUnit\\Framework\\Assert#'

src/Parser/StringUnescaper.php

@@ -53,13 +53,13 @@ static function ($matches) {
 					return self::REPLACEMENTS[$str];
 				}
 				if ($str[0] === 'x' || $str[0] === 'X') {
-					return chr(hexdec(substr($str, 1)));
+					return chr((int) hexdec(substr($str, 1)));
 				}
 				if ($str[0] === 'u') {
-					return self::codePointToUtf8(hexdec($matches[2]));
+					return self::codePointToUtf8((int) hexdec($matches[2]));
 				}
 
-				return chr(octdec($str));
+				return chr((int) octdec($str));
 			},
 			$str
 		);

tests/PHPStan/Parser/FuzzyTest.php

@@ -78,8 +78,12 @@ private function provideFuzzyInputsData(string $startSymbol): Iterator
 		$inputsDirectory = sprintf('%s/fuzzy/%s', __DIR__ . '/../../../temp', $startSymbol);
 
 		if (is_dir($inputsDirectory)) {
-			foreach (glob(sprintf('%s/*.tst', $inputsDirectory)) as $file) {
-				unlink($file);
+			$glob = glob(sprintf('%s/*.tst', $inputsDirectory));
+
+			if ($glob !== false) {
+				foreach ($glob as $file) {
+					unlink($file);
+				}
 			}
 
 		} else {
@@ -100,7 +104,13 @@ private function provideFuzzyInputsData(string $startSymbol): Iterator
 
 		$process->mustRun();
 
-		foreach (glob(sprintf('%s/*.tst', $inputsDirectory)) as $file) {
+		$glob = glob(sprintf('%s/*.tst', $inputsDirectory));
+
+		if ($glob === false) {
+			return;
+		}
+
+		foreach ($glob as $file) {
 			$input = file_get_contents($file);
 			yield [$input];
 		}