Fix issues indentifed by PHPStan 2

sebastianbergmann · Nov 17, 2024 · eb23806 · eb23806
1 parent 443a549
commit eb23806
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 16 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -3,7 +3,3 @@ parameters:
     paths:
         - src
         - tests
-    ignoreErrors:
-        -
-            message: '#Method SebastianBergmann\\Diff\\Differ::calculateEstimatedFootprint\(\) never returns float so it can be removed from the return type\.#'
-            path: src/Differ.php
diff --git a/src/Chunk.php b/src/Chunk.php
@@ -73,12 +73,6 @@ public function lines(): array
      */
     public function setLines(array $lines): void
     {
-        foreach ($lines as $line) {
-            if (!$line instanceof Line) {
-                throw new InvalidArgumentException;
-            }
-        }
-
         $this->lines = $lines;
     }
 

diff --git a/src/Differ.php b/src/Differ.php
@@ -137,7 +137,7 @@ private function selectLcsImplementation(array $from, array $to): LongestCommonS
         return new TimeEfficientLongestCommonSubsequenceCalculator;
     }
 
-    private function calculateEstimatedFootprint(array $from, array $to): float|int
+    private function calculateEstimatedFootprint(array $from, array $to): int
     {
         $itemSize = PHP_INT_SIZE === 4 ? 76 : 144;
 

diff --git a/tests/LongestCommonSubsequenceTestCase.php b/tests/LongestCommonSubsequenceTestCase.php
@@ -173,7 +173,6 @@ public function testStrictTypeCalculate(): void
     {
         $diff = $this->implementation->calculate(['5'], ['05']);
 
-        $this->assertIsArray($diff);
         $this->assertCount(0, $diff);
     }
 

diff --git a/tests/Output/Integration/UnifiedDiffOutputBuilderIntegrationTest.php b/tests/Output/Integration/UnifiedDiffOutputBuilderIntegrationTest.php
@@ -17,7 +17,6 @@
 use function file_put_contents;
 use function implode;
 use function is_array;
-use function is_string;
 use function preg_replace;
 use function preg_split;
 use function realpath;
@@ -58,9 +57,9 @@ public static function provideDiffWithLineNumbers(): array
     {
         return array_filter(
             UnifiedDiffOutputBuilderDataProvider::provideDiffWithLineNumbers(),
-            static function ($key)
+            static function (string $key)
             {
-                return !is_string($key) || !str_contains($key, 'non_patch_compat');
+                return !str_contains($key, 'non_patch_compat');
             },
             ARRAY_FILTER_USE_KEY,
         );

diff --git a/tests/Utils/UnifiedDiffAssertTrait.php b/tests/Utils/UnifiedDiffAssertTrait.php
@@ -247,7 +247,7 @@ private function unifiedDiffAssertHeaderDate(string $date, string $message): voi
             $matches,
         );
 
-        if (1 !== $match || count($matches) < 4) {
+        if (1 !== $match) {
             throw new UnexpectedValueException(sprintf('Date of header line does not match expected pattern, got "%s". %s', $date, $message));
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -173,7 +173,6 @@ public function testStrictTypeCalculate(): void @@
         {
             $diff = $this->implementation->calculate(['5'], ['05']);
-            $this->assertIsArray($diff);
             $this->assertCount(0, $diff);
         }
@@ Expand Down @@