phsptan fixes

Author: TomasVotruba

composer.json

@@ -16,7 +16,7 @@
         "clue/ndjson-react": "^1.3",
         "composer/pcre": "^3.4",
         "composer/xdebug-handler": "^3.0.5",
-        "entropy/entropy": "^0.4",
+        "entropy/entropy": "^0.4.6",
         "fidry/cpu-core-counter": "^1.3",
         "friendsofphp/php-cs-fixer": "^3.95.10",
         "nette/utils": "^4.1",
@@ -37,7 +37,7 @@
         "rector/jack": "^1.0",
         "rector/rector": "^2.4",
         "rector/type-perfect": "^2.1",
-        "symplify/phpstan-rules": "^14.11",
+        "symplify/phpstan-rules": "^14.12",
         "symplify/vendor-patches": "^11.5",
         "tomasvotruba/class-leak": "^2.1.7",
         "tomasvotruba/type-coverage": "^2.2",

packages/coding-standard/src/Fixer/LineLength/LineLengthFixer.php

@@ -26,6 +26,18 @@
 /**
  * @see \Symplify\CodingStandard\Tests\Fixer\LineLength\LineLengthFixer\LineLengthFixerTest
  * @see \Symplify\CodingStandard\Tests\Fixer\LineLength\LineLengthFixer\ConfiguredLineLengthFixerTest
+ *
+ * @implements ConfigurableFixerInterface<
+ *     array{
+ *         self::LINE_LENGTH?: int,
+ *         self::BREAK_LONG_LINES?: bool,
+ *         self::INLINE_SHORT_LINES?: bool
+ *    }, array{
+ *         self::LINE_LENGTH: int,
+ *         self::BREAK_LONG_LINES: bool,
+ *         self::INLINE_SHORT_LINES: bool
+ *    }
+ *  >
  */
 final class LineLengthFixer extends AbstractSymplifyFixer implements ConfigurableFixerInterface
 {

phpstan.neon

@@ -33,9 +33,13 @@ parameters:
     bootstrapFiles:
         - tests/bootstrap.php
 
+    errorFormat: symplify
     treatPhpDocTypesAsCertain: false
 
     ignoreErrors:
+        # @todo revisit: split return into typed file_diffs/coding_standard_errors buckets
+        - '#Method Symplify\\EasyCodingStandard\\Application\\SingleFileProcessor\:\:processFilePath\(\) should return array\{file_diffs\?\: array<Symplify\\EasyCodingStandard\\ValueObject\\Error\\FileDiff>, coding_standard_errors\?\: array<Symplify\\EasyCodingStandard\\SniffRunner\\ValueObject\\Error\\CodingStandardError>\} but returns array<(.*?), array<Symplify\\EasyCodingStandard\\SniffRunner\\ValueObject\\Error\\CodingStandardError\|Symplify\\EasyCodingStandard\\ValueObject\\Error\\FileDiff>>#'
+
         # on purpose to override a config
         -
             message: '#Missing call to parent\:\:setUp\(\) method#'
@@ -45,29 +49,16 @@ parameters:
                  - tests/Skipper/SkipCriteriaResolver/SkippedPathsResolver/SkippedPathsResolverTest.php
                  - src/Testing/PHPUnit/AbstractCheckerTestCase.php
 
-        # testing instance of on purpose
-        -
-            message: '#Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf#'
-            path: tests/*
-
-        # overly detailed
-        - '#PHPDoc tag @var with type string\|false is not subtype of native type non\-empty\-string\|false#'
-
-        # hack to autoload contants
+        # intentional: hack to autoload contants
         - '#Call to new PHP_CodeSniffer\\Util\\Tokens\(\) on a separate line has no effect#'
 
-        # php version condition
-        -
-            identifier: smaller.alwaysFalse
-            path: src/Configuration/ConfigInitializer.php
-
         # coding-standard: runtime-defined PHP_CodeSniffer/php-cs-fixer token constants
         - '#Constant T_OPEN_CURLY_BRACKET|T_START_NOWDOC not found#'
 
-        # coding-standard: php-cs-fixer interface generics intentionally left unspecified
-        - '#Class (.*?) implements generic interface PhpCsFixer\\Fixer\\ConfigurableFixerInterface but does not specify its types\: TFixerInputConfig, TFixerComputedConfig#'
-
         # coding-standard: intentional cross-version condition
         -
             message: '#Comparison operation ">\=" between int<\d+, \d+> and (.*?) is always true#'
             path: packages/coding-standard/src/TokenAnalyzer/DocblockRelatedParamNamesResolver.php
+        -
+            identifier: smaller.alwaysFalse
+            path: src/Configuration/ConfigInitializer.php

src/Application/SingleFileProcessor.php

@@ -28,8 +28,7 @@ public function processFilePath(string $filePath, Configuration $configuration):
             return [];
         }
 
-        $fileDiffs = [];
-        $codingStandardErrors = [];
+        $errorsAndDiffs = [];
 
         $this->changedFilesDetector->addFilePath($filePath);
         $fileProcessors = $this->fileProcessorCollector->getFileProcessors();
@@ -44,27 +43,14 @@ public function processFilePath(string $filePath, Configuration $configuration):
                 continue;
             }
 
-            $fileDiffs = [...$fileDiffs, ...($currentErrorsAndFileDiffs['file_diffs'] ?? [])];
-            $codingStandardErrors = [
-                ...$codingStandardErrors,
-                ...($currentErrorsAndFileDiffs['coding_standard_errors'] ?? []),
-            ];
+            $errorsAndDiffs = [...$errorsAndDiffs, ...$currentErrorsAndFileDiffs];
         }
 
         // invalidate broken file, to analyse in next run too
-        if ($fileDiffs !== [] || $codingStandardErrors !== []) {
+        if ($errorsAndDiffs !== []) {
             $this->changedFilesDetector->invalidateFilePath($filePath);
         }
 
-        $errorsAndDiffs = [];
-        if ($fileDiffs !== []) {
-            $errorsAndDiffs['file_diffs'] = $fileDiffs;
-        }
-
-        if ($codingStandardErrors !== []) {
-            $errorsAndDiffs['coding_standard_errors'] = $codingStandardErrors;
-        }
-
         return $errorsAndDiffs;
     }
 }

src/Skipper/FileSystem/FnMatchPathNormalizer.php

@@ -16,7 +16,6 @@ public function normalizeForFnmatch(string $path): string
         }
 
         if (\str_contains($path, '..')) {
-            /** @var string|false $realPath */
             $realPath = realpath($path);
             if ($realPath === false) {
                 return '';

src/Skipper/RealpathMatcher.php

@@ -8,13 +8,12 @@ final class RealpathMatcher
 {
     public function match(string $matchingPath, string $filePath): bool
     {
-        /** @var string|false $realPathMatchingPath */
+        /** @var non-empty-string|false $realPathMatchingPath */
         $realPathMatchingPath = realpath($matchingPath);
         if ($realPathMatchingPath === false) {
             return false;
         }
 
-        /** @var string|false $realpathFilePath */
         $realpathFilePath = realpath($filePath);
         if ($realpathFilePath === false) {
             return false;

tests/SniffRunner/File/FileFactoryTest.php

@@ -4,7 +4,6 @@
 
 namespace Symplify\EasyCodingStandard\Tests\SniffRunner\File;
 
-use PHP_CodeSniffer\Files\File as PhpCodeSnifferFile;
 use PHP_CodeSniffer\Fixer;
 use Symplify\EasyCodingStandard\SniffRunner\File\FileFactory;
 use Symplify\EasyCodingStandard\SniffRunner\ValueObject\File;
@@ -20,7 +19,6 @@ public function test(): void
         $file = $fileFactory->createFromFile($filePath);
 
         $this->assertInstanceOf(File::class, $file);
-        $this->assertInstanceOf(PhpCodeSnifferFile::class, $file);
         $this->assertInstanceOf(Fixer::class, $file->fixer);
         $this->assertSame($filePath, $file->getFilename());
     }