Merge #612

612: Fix "dynamic call to static method" phpstan error in tests r=norkunas a=aivchen # Pull Request ## What does this PR do? - replaces `$this->assertXXX` calls with `static::assertXXX` - replaces `assertEquals` calls with `assertSame` - ordered arguments in `assertSame` calls ## PR checklist Please check if your PR fulfills the following requirements: - [x] Does this PR fix an existing issue, or have you listed the changes applied in the PR description (and why they are needed)? - [x] Have you read the contributing guidelines? - [x] Have you made sure that the title is accurate and descriptive of the changes? Thank you so much for contributing to Meilisearch! Co-authored-by: andrew <[email protected]> Co-authored-by: Andrew Ivchenkov <[email protected]>
meilisearch · Jan 23, 2024 · 7586fc9 · 7586fc9
2 parents f07267b + c54be54
commit 7586fc9
Show file tree

Hide file tree

Showing 45 changed files with 850 additions and 863 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -12,6 +12,8 @@
     'declare_strict_types' => true,
     'void_return' => true,
     'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced'],
+    'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
+    'php_unit_strict' => true,
 ];
 
 $config = new PhpCsFixer\Config();

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -3,5 +3,3 @@ parameters:
     paths:
         - src
         - tests
-    ignoreErrors:
-        - '#Dynamic call to static method PHPUnit\\Framework\\.*#'
diff --git a/tests/Contracts/CancelTasksQueryTest.php b/tests/Contracts/CancelTasksQueryTest.php
@@ -13,25 +13,21 @@ public function testSetTypes(): void
     {
         $data = (new CancelTasksQuery())->setTypes(['abc', 'xyz']);
 
-        $this->assertEquals(['types' => 'abc,xyz'], $data->toArray());
+        self::assertSame(['types' => 'abc,xyz'], $data->toArray());
     }
 
     public function testSetAnyDateFilter(): void
     {
         $date = new \DateTime();
         $data = (new CancelTasksQuery())->setBeforeEnqueuedAt($date);
 
-        $this->assertEquals(['beforeEnqueuedAt' => $date->format(\DateTime::RFC3339)], $data->toArray());
+        self::assertSame(['beforeEnqueuedAt' => $date->format(\DateTime::RFC3339)], $data->toArray());
     }
 
     public function testToArrayWithDifferentSets(): void
     {
         $data = (new CancelTasksQuery())->setUids([1, 2, 3])->setStatuses(['enqueued']);
 
-        $this->assertEquals([
-                'uids' => '1,2,3', 'statuses' => 'enqueued',
-            ],
-            $data->toArray()
-        );
+        self::assertSame(['statuses' => 'enqueued', 'uids' => '1,2,3'], $data->toArray());
     }
 }
diff --git a/tests/Contracts/DeleteTasksQueryTest.php b/tests/Contracts/DeleteTasksQueryTest.php
@@ -13,24 +13,21 @@ public function testSetTypes(): void
     {
         $data = (new DeleteTasksQuery())->setTypes(['abc', 'xyz']);
 
-        $this->assertEquals(['types' => 'abc,xyz'], $data->toArray());
+        self::assertSame(['types' => 'abc,xyz'], $data->toArray());
     }
 
     public function testSetAnyDateFilter(): void
     {
         $date = new \DateTime();
         $data = (new DeleteTasksQuery())->setCanceledBy([null])->setBeforeEnqueuedAt($date);
 
-        $this->assertEquals(['beforeEnqueuedAt' => $date->format(\DateTime::RFC3339)], $data->toArray());
+        self::assertSame(['beforeEnqueuedAt' => $date->format(\DateTime::RFC3339)], $data->toArray());
     }
 
     public function testToArrayWithDifferentSets(): void
     {
         $data = (new DeleteTasksQuery())->setCanceledBy([1, 2])->setStatuses(['enqueued']);
 
-        $this->assertEquals([
-            'canceledBy' => '1,2', 'statuses' => 'enqueued',
-        ], $data->toArray()
-        );
+        self::assertSame(['statuses' => 'enqueued', 'canceledBy' => '1,2'], $data->toArray());
     }
 }
diff --git a/tests/Contracts/DocumentsQueryTest.php b/tests/Contracts/DocumentsQueryTest.php
@@ -13,27 +13,27 @@ public function testSetFields(): void
     {
         $data = (new DocumentsQuery())->setLimit(10)->setFields(['abc', 'xyz']);
 
-        $this->assertEquals(['limit' => 10, 'fields' => 'abc,xyz'], $data->toArray());
+        self::assertSame(['limit' => 10, 'fields' => 'abc,xyz'], $data->toArray());
     }
 
     public function testToArrayWithoutSetFields(): void
     {
         $data = (new DocumentsQuery())->setLimit(10);
 
-        $this->assertEquals(['limit' => 10], $data->toArray());
+        self::assertSame(['limit' => 10], $data->toArray());
     }
 
     public function testToArrayWithoutSetOffset(): void
     {
         $data = (new DocumentsQuery())->setOffset(10);
 
-        $this->assertEquals(['offset' => 10], $data->toArray());
+        self::assertSame(['offset' => 10], $data->toArray());
     }
 
     public function testToArrayWithZeros(): void
     {
         $data = (new DocumentsQuery())->setLimit(0)->setOffset(0);
 
-        $this->assertEquals(['limit' => 0, 'offset' => 0], $data->toArray());
+        self::assertSame(['offset' => 0, 'limit' => 0], $data->toArray());
     }
 }
diff --git a/tests/Contracts/IndexesQueryTest.php b/tests/Contracts/IndexesQueryTest.php
@@ -13,27 +13,27 @@ public function testToArrayWithSetOffsetAndSetLimit(): void
     {
         $data = (new IndexesQuery())->setLimit(10)->setOffset(18);
 
-        $this->assertEquals(['limit' => 10, 'offset' => 18], $data->toArray());
+        self::assertSame(['offset' => 18, 'limit' => 10], $data->toArray());
     }
 
     public function testToArrayWithSetOffset(): void
     {
         $data = (new IndexesQuery())->setOffset(5);
 
-        $this->assertEquals(['offset' => 5], $data->toArray());
+        self::assertSame(['offset' => 5], $data->toArray());
     }
 
     public function testToArrayWithoutSet(): void
     {
         $data = new IndexesQuery();
 
-        $this->assertEmpty($data->toArray());
+        self::assertEmpty($data->toArray());
     }
 
     public function testToArrayWithZeros(): void
     {
         $data = (new IndexesQuery())->setLimit(0)->setOffset(0);
 
-        $this->assertEquals(['limit' => 0, 'offset' => 0], $data->toArray());
+        self::assertSame(['offset' => 0, 'limit' => 0], $data->toArray());
     }
 }
diff --git a/tests/Contracts/KeysQueryTest.php b/tests/Contracts/KeysQueryTest.php
@@ -13,27 +13,27 @@ public function testToArrayWithSetOffsetAndSetLimit(): void
     {
         $data = (new KeysQuery())->setLimit(10)->setOffset(18);
 
-        $this->assertEquals(['limit' => 10, 'offset' => 18], $data->toArray());
+        self::assertSame(['offset' => 18, 'limit' => 10], $data->toArray());
     }
 
     public function testToArrayWithSetOffset(): void
     {
         $data = (new KeysQuery())->setOffset(5);
 
-        $this->assertEquals(['offset' => 5], $data->toArray());
+        self::assertSame(['offset' => 5], $data->toArray());
     }
 
     public function testToArrayWithoutSet(): void
     {
         $data = new KeysQuery();
 
-        $this->assertEmpty($data->toArray());
+        self::assertEmpty($data->toArray());
     }
 
     public function testToArrayWithZeros(): void
     {
         $data = (new KeysQuery())->setLimit(0)->setOffset(0);
 
-        $this->assertEquals(['limit' => 0, 'offset' => 0], $data->toArray());
+        self::assertSame(['offset' => 0, 'limit' => 0], $data->toArray());
     }
 }
diff --git a/tests/Contracts/TasksQueryTest.php b/tests/Contracts/TasksQueryTest.php
@@ -13,37 +13,35 @@ public function testSetTypes(): void
     {
         $data = (new TasksQuery())->setTypes(['abc', 'xyz']);
 
-        $this->assertEquals(['types' => 'abc,xyz'], $data->toArray());
+        self::assertSame(['types' => 'abc,xyz'], $data->toArray());
     }
 
     public function testSetAnyDateFilter(): void
     {
         $date = new \DateTime();
         $data = (new TasksQuery())->setBeforeEnqueuedAt($date);
 
-        $this->assertEquals($data->toArray(), ['beforeEnqueuedAt' => $date->format(\DateTime::RFC3339)]);
+        self::assertSame(['beforeEnqueuedAt' => $date->format(\DateTime::RFC3339)], $data->toArray());
     }
 
     public function testToArrayWithSetLimit(): void
     {
         $data = (new TasksQuery())->setLimit(10);
 
-        $this->assertEquals(['limit' => 10], $data->toArray());
+        self::assertSame(['limit' => 10], $data->toArray());
     }
 
     public function testToArrayWithSetLimitWithZero(): void
     {
         $data = (new TasksQuery())->setLimit(0);
 
-        $this->assertEquals(['limit' => 0], $data->toArray());
+        self::assertSame(['limit' => 0], $data->toArray());
     }
 
     public function testToArrayWithDifferentSets(): void
     {
         $data = (new TasksQuery())->setFrom(10)->setLimit(9)->setCanceledBy([1, 4])->setStatuses(['enqueued']);
 
-        $this->assertEquals([
-            'limit' => 9, 'from' => 10, 'statuses' => 'enqueued', 'canceledBy' => '1,4',
-        ], $data->toArray());
+        self::assertSame(['statuses' => 'enqueued', 'from' => 10, 'limit' => 9, 'canceledBy' => '1,4'], $data->toArray());
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,3 @@ parameters: @@
         paths:
             - src
             - tests
-        ignoreErrors:
-            - '#Dynamic call to static method PHPUnit\\Framework\\.*#'