PHPStan level 5.

Author: dereuromark

PSR2R/Sniffs/Commenting/InlineDocBlockSniff.php

@@ -165,7 +165,7 @@ protected function checkInlineComments(File $phpCsFile, $startIndex, $endIndex)
 	 * @param array $tokens
 	 * @param int $from
 	 * @param int $to
-	 * @param int $tagType
+	 * @param string $tagType
 	 *
 	 * @return int|null
 	 */

PSR2R/Sniffs/ControlStructures/ConditionalExpressionOrderSniff.php

@@ -185,7 +185,7 @@ protected function applyFix(File $phpCsFile,
 	/**
 	 * @param array $token
 	 *
-	 * @return int
+	 * @return string
 	 */
 	protected function getComparisonValue(array $token) {
 		$comparisonIndexValue = $token['content'];
@@ -200,7 +200,7 @@ protected function getComparisonValue(array $token) {
 			$comparisonIndexValue = $mapping[$token['code']];
 		}
 
-		return (int)$comparisonIndexValue;
+		return $comparisonIndexValue;
 	}
 
 }

PSR2R/Sniffs/ControlStructures/ControlStructureSpacingSniff.php

@@ -101,7 +101,7 @@ public function process(File $phpcsFile, $stackPtr) {
 				$spaceBeforeClose = strlen(ltrim($tokens[$parenCloser - 1]['content'], $phpcsFile->eolChar));
 			}
 
-			$phpcsFile->recordMetric($stackPtr, 'Spaces before control structure close parenthesis', $spaceBeforeClose);
+			$phpcsFile->recordMetric($stackPtr, 'Spaces before control structure close parenthesis', (string)$spaceBeforeClose);
 
 			if ($spaceBeforeClose !== $this->requiredSpacesBeforeClose) {
 				$error = 'Expected %s spaces before closing bracket; %s found';

PSR2R/Sniffs/Files/EndFileNewlineSniff.php

@@ -68,7 +68,7 @@ public function process(File $phpcsFile, $stackPtr) {
 
 		$lastCodeLine = $tokens[$lastCode]['line'];
 		$blankLines = ($lastLine - $lastCodeLine + 1);
-		$phpcsFile->recordMetric($stackPtr, 'Number of newlines at EOF', $blankLines);
+		$phpcsFile->recordMetric($stackPtr, 'Number of newlines at EOF', (string)$blankLines);
 
 		if ($blankLines > 1) {
 			$error = 'Expected 1 blank line at end of file; %s found';

PSR2R/Sniffs/Namespaces/NoInlineFullyQualifiedClassNameSniff.php

@@ -374,7 +374,7 @@ protected function generateUniqueAlias($shortName, $fullName) {
 			$alias = $shortName;
 
 			/** @noinspection PhpParamsInspection */
-			if (count($pieces) - 1 < $count && !in_array($pieces, 'Php', true)) {
+			if (count($pieces) - 1 < $count && !in_array('Php', $pieces, true)) {
 				$pieces[] = 'Php';
 			}
 			if (count($pieces) - 1 < $count) {

PSR2R/Tools/AbstractSniff.php

@@ -18,7 +18,7 @@ abstract class AbstractSniff implements Sniff {
 	 * Checks if the given token scope contains a single or multiple token codes/types.
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile
-	 * @param string|array $search
+	 * @param string|int|array $search
 	 * @param int $start
 	 * @param int $end
 	 * @param bool $skipNested

composer.json

@@ -39,7 +39,7 @@
 		"test-setup": "[ ! -f phpunit.phar ] && wget https://phar.phpunit.de/phpunit-5.7.phar && mv phpunit-5.7.phar phpunit.phar || true",
 		"test-setup-mac": "[ ! -f phpunit.phar ] && curl -OL https://phar.phpunit.de/phpunit-5.7.phar && mv phpunit-5.7.phar phpunit.phar || true",
 		"test-coverage": "php phpunit.phar --log-junit tmp/coverage/unitreport.xml --coverage-html tmp/coverage --coverage-clover tmp/coverage/coverage.xml",
-		"phpstan": "phpstan analyse -c tests/phpstan.neon -l 4 PSR2R/",
+		"phpstan": "phpstan analyse -c tests/phpstan.neon -l 5 PSR2R/",
 		"phpstan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan-shim:^0.11 && mv composer.backup composer.json"
 	}
 }