Increase PHPStan rule level to 10

sebastianbergmann · Nov 17, 2024 · 4445658 · 4445658
1 parent c3d954c
commit 4445658
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 15 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,5 @@
 parameters:
-    level: 9
+    level: 10
     paths:
         - src
         - tests/unit
diff --git a/src/Factory.php b/src/Factory.php
@@ -16,7 +16,7 @@ final class Factory
     private static ?Factory $instance = null;
 
     /**
-     * @var list<Comparator>
+     * @var array<non-negative-int, Comparator>
      */
     private array $customComparators = [];
 

diff --git a/src/NumericComparator.php b/src/NumericComparator.php
@@ -10,6 +10,7 @@
 namespace SebastianBergmann\Comparator;
 
 use function abs;
+use function assert;
 use function is_float;
 use function is_infinite;
 use function is_nan;
@@ -32,6 +33,9 @@ public function accepts(mixed $expected, mixed $actual): bool
      */
     public function assertEquals(mixed $expected, mixed $actual, float $delta = 0.0, bool $canonicalize = false, bool $ignoreCase = false): void
     {
+        assert(is_numeric($expected));
+        assert(is_numeric($actual));
+
         if ($this->isInfinite($actual) && $this->isInfinite($expected)) {
             return;
         }

diff --git a/tests/_fixture/Author.php b/tests/_fixture/Author.php
@@ -15,10 +15,10 @@
 class Author
 {
     // the order of properties is important for testing the cycle!
-    public $books = [];
-    private $name = '';
+    public array $books = [];
+    private string $name;
 
-    public function __construct($name)
+    public function __construct(string $name)
     {
         $this->name = $name;
     }

diff --git a/tests/_fixture/Book.php b/tests/_fixture/Book.php
@@ -15,5 +15,5 @@
 class Book
 {
     // the order of properties is important for testing the cycle!
-    public $author;
+    public Author $author;
 }
diff --git a/tests/unit/ArrayComparatorTest.php b/tests/unit/ArrayComparatorTest.php
@@ -23,7 +23,7 @@ final class ArrayComparatorTest extends TestCase
     private ArrayComparator $comparator;
 
     /**
-     * @return non-empty-list<array{0: ?array, 1: ?array}>
+     * @return non-empty-list<array{0: ?array<null>, 1: ?array<null>}>
      */
     public static function acceptsFailsProvider(): array
     {
@@ -35,7 +35,7 @@ public static function acceptsFailsProvider(): array
     }
 
     /**
-     * @return non-empty-list<array{0: array, 1: array, 2?: float, 3?: bool}>
+     * @return non-empty-list<array{0: array<mixed>, 1: array<mixed>, 2?: float, 3?: bool}>
      */
     public static function assertEqualsSucceedsProvider(): array
     {
@@ -77,7 +77,7 @@ public static function assertEqualsSucceedsProvider(): array
     }
 
     /**
-     * @return non-empty-list<array{0: array, 1: array, 2?: float, 3?: bool}>
+     * @return non-empty-list<array{0: array<mixed>, 1: array<mixed>, 2?: float, 3?: bool}>
      */
     public static function assertEqualsFailsProvider(): array
     {
@@ -125,7 +125,7 @@ public static function assertEqualsFailsProvider(): array
     }
 
     /**
-     * @return non-empty-list<array{0: string, 1: array, 2: array, 3?: float, 4?: bool}>
+     * @return non-empty-list<array{0: string, 1: array<string>, 2: array<string>, 3?: float, 4?: bool}>
      */
     public static function assertEqualsFailsWithDiffProvider(): array
     {

diff --git a/tests/unit/MockObjectComparatorTest.php b/tests/unit/MockObjectComparatorTest.php
@@ -101,9 +101,9 @@ public static function assertEqualsFailsProvider(): array
         $book2->author->books[] = $book2;
 
         $book3         = self::createMockForComparatorTest(Book::class);
-        $book3->author = 'Terry Pratchett';
+        $book3->author = new Author('Terry Pratchett');
         $book4         = self::createMockForComparatorTest(stdClass::class);
-        $book4->author = 'Terry Pratchett';
+        $book4->author = new Author('Terry Pratchett');
 
         $object1 = self::createMockForComparatorTest(SampleClass::class, [4, 8, 15]);
         $object2 = self::createMockForComparatorTest(SampleClass::class, [16, 23, 42]);
@@ -174,7 +174,7 @@ public function testAssertEqualsFails(MockObject $expected, MockObject $actual,
      * @template RealInstanceType of object
      *
      * @param class-string<RealInstanceType> $type
-     * @param array<mixed>                   $constructorArguments
+     * @param list<mixed>                    $constructorArguments
      *
      * @return MockObject&RealInstanceType
      */

diff --git a/tests/unit/ObjectComparatorTest.php b/tests/unit/ObjectComparatorTest.php
@@ -89,9 +89,9 @@ public static function assertEqualsFailsProvider(): array
         $book2->author->books[] = $book2;
 
         $book3         = new Book;
-        $book3->author = 'Terry Pratchett';
+        $book3->author = new Author('Terry Pratchett');
         $book4         = new stdClass;
-        $book4->author = 'Terry Pratchett';
+        $book4->author = new Author('Terry Pratchett');
 
         $object1 = new SampleClass(4, 8, 15);
         $object2 = new SampleClass(16, 23, 42);