Added php_unit_strict to php-cs-fixer config

meilisearch · Jan 22, 2024 · 9dc6cb7 · 9dc6cb7
1 parent d49d322
commit 9dc6cb7
Show file tree

Hide file tree

Showing 36 changed files with 193 additions and 193 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -13,6 +13,7 @@
     '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/tests/Contracts/CancelTasksQueryTest.php b/tests/Contracts/CancelTasksQueryTest.php
@@ -13,24 +13,24 @@ public function testSetTypes(): void
     {
         $data = (new CancelTasksQuery())->setTypes(['abc', 'xyz']);
 
-        self::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);
 
-        self::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']);
 
-        self::assertEquals([
-                'uids' => '1,2,3', 'statuses' => 'enqueued',
-            ],
+        self::assertSame([
+            'statuses' => 'enqueued', 'uids' => '1,2,3',
+        ],
             $data->toArray()
         );
     }

diff --git a/tests/Contracts/DeleteTasksQueryTest.php b/tests/Contracts/DeleteTasksQueryTest.php
@@ -13,23 +13,23 @@ public function testSetTypes(): void
     {
         $data = (new DeleteTasksQuery())->setTypes(['abc', 'xyz']);
 
-        self::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);
 
-        self::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']);
 
-        self::assertEquals([
-            'canceledBy' => '1,2', 'statuses' => 'enqueued',
+        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']);
 
-        self::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);
 
-        self::assertEquals(['limit' => 10], $data->toArray());
+        self::assertSame(['limit' => 10], $data->toArray());
     }
 
     public function testToArrayWithoutSetOffset(): void
     {
         $data = (new DocumentsQuery())->setOffset(10);
 
-        self::assertEquals(['offset' => 10], $data->toArray());
+        self::assertSame(['offset' => 10], $data->toArray());
     }
 
     public function testToArrayWithZeros(): void
     {
         $data = (new DocumentsQuery())->setLimit(0)->setOffset(0);
 
-        self::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,14 +13,14 @@ public function testToArrayWithSetOffsetAndSetLimit(): void
     {
         $data = (new IndexesQuery())->setLimit(10)->setOffset(18);
 
-        self::assertEquals(['limit' => 10, 'offset' => 18], $data->toArray());
+        self::assertSame(['offset' => 18, 'limit' => 10], $data->toArray());
     }
 
     public function testToArrayWithSetOffset(): void
     {
         $data = (new IndexesQuery())->setOffset(5);
 
-        self::assertEquals(['offset' => 5], $data->toArray());
+        self::assertSame(['offset' => 5], $data->toArray());
     }
 
     public function testToArrayWithoutSet(): void
@@ -34,6 +34,6 @@ public function testToArrayWithZeros(): void
     {
         $data = (new IndexesQuery())->setLimit(0)->setOffset(0);
 
-        self::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,14 +13,14 @@ public function testToArrayWithSetOffsetAndSetLimit(): void
     {
         $data = (new KeysQuery())->setLimit(10)->setOffset(18);
 
-        self::assertEquals(['limit' => 10, 'offset' => 18], $data->toArray());
+        self::assertSame(['offset' => 18, 'limit' => 10], $data->toArray());
     }
 
     public function testToArrayWithSetOffset(): void
     {
         $data = (new KeysQuery())->setOffset(5);
 
-        self::assertEquals(['offset' => 5], $data->toArray());
+        self::assertSame(['offset' => 5], $data->toArray());
     }
 
     public function testToArrayWithoutSet(): void
@@ -34,6 +34,6 @@ public function testToArrayWithZeros(): void
     {
         $data = (new KeysQuery())->setLimit(0)->setOffset(0);
 
-        self::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,37 @@ public function testSetTypes(): void
     {
         $data = (new TasksQuery())->setTypes(['abc', 'xyz']);
 
-        self::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);
 
-        self::assertEquals($data->toArray(), ['beforeEnqueuedAt' => $date->format(\DateTime::RFC3339)]);
+        self::assertSame($data->toArray(), ['beforeEnqueuedAt' => $date->format(\DateTime::RFC3339)]);
     }
 
     public function testToArrayWithSetLimit(): void
     {
         $data = (new TasksQuery())->setLimit(10);
 
-        self::assertEquals(['limit' => 10], $data->toArray());
+        self::assertSame(['limit' => 10], $data->toArray());
     }
 
     public function testToArrayWithSetLimitWithZero(): void
     {
         $data = (new TasksQuery())->setLimit(0);
 
-        self::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']);
 
-        self::assertEquals([
-            'limit' => 9, 'from' => 10, 'statuses' => 'enqueued', 'canceledBy' => '1,4',
+        self::assertSame([
+            'statuses' => 'enqueued', 'from' => 10, 'limit' => 9, 'canceledBy' => '1,4',
         ], $data->toArray());
     }
 }
diff --git a/tests/Endpoints/ClientTest.php b/tests/Endpoints/ClientTest.php
@@ -184,7 +184,7 @@ public function testHealth(): void
     {
         $response = $this->client->health();
 
-        self::assertEquals('available', $response['status']);
+        self::assertSame('available', $response['status']);
     }
 
     public function testIsHealthyIsTrue(): void
@@ -233,7 +233,7 @@ public function testHeaderWithoutApiKey(): void
 
         $response = $client->health();
 
-        self::assertEquals('available', $response['status']);
+        self::assertSame('available', $response['status']);
         $this->expectException(ApiException::class);
         $response = $client->stats();
     }

diff --git a/tests/Endpoints/DocumentsTest.php b/tests/Endpoints/DocumentsTest.php
@@ -81,8 +81,8 @@ public function testAddDocumentsCsv(): void
 
         $update = $index->waitForTask($promise['taskUid']);
 
-        self::assertEquals('succeeded', $update['status']);
-        self::assertNotEquals(0, $update['details']['receivedDocuments']);
+        self::assertSame('succeeded', $update['status']);
+        self::assertNotSame(0, $update['details']['receivedDocuments']);
 
         $response = $index->getDocuments();
         self::assertCount(20, $response);
@@ -100,12 +100,12 @@ public function testAddDocumentsCsvWithCustomSeparator(): void
 
         $update = $index->waitForTask($promise['taskUid']);
 
-        self::assertEquals($update['status'], 'succeeded');
-        self::assertEquals($update['details']['receivedDocuments'], 6);
+        self::assertSame($update['status'], 'succeeded');
+        self::assertSame($update['details']['receivedDocuments'], 6);
 
         $documents = $index->getDocuments()->getResults();
-        self::assertEquals('Teenage Neon Jungle', $documents[4]['album']);
-        self::assertEquals('631152000', $documents[5]['released-timestamp']);
+        self::assertSame('Teenage Neon Jungle', $documents[4]['album']);
+        self::assertSame('631152000', $documents[5]['released-timestamp']);
     }
 
     public function testAddDocumentsJson(): void
@@ -122,8 +122,8 @@ public function testAddDocumentsJson(): void
 
         $update = $index->waitForTask($promise['taskUid']);
 
-        self::assertEquals('succeeded', $update['status']);
-        self::assertNotEquals(0, $update['details']['receivedDocuments']);
+        self::assertSame('succeeded', $update['status']);
+        self::assertNotSame(0, $update['details']['receivedDocuments']);
 
         $response = $index->getDocuments();
         self::assertCount(20, $response);
@@ -143,8 +143,8 @@ public function testAddDocumentsNdJson(): void
 
         $update = $index->waitForTask($promise['taskUid']);
 
-        self::assertEquals('succeeded', $update['status']);
-        self::assertNotEquals(0, $update['details']['receivedDocuments']);
+        self::assertSame('succeeded', $update['status']);
+        self::assertNotSame(0, $update['details']['receivedDocuments']);
 
         $response = $index->getDocuments();
         self::assertCount(20, $response);
@@ -323,10 +323,10 @@ public function testAddDocumentsCsvInBatchesWithDelimiter(): void
                   // withConsecutive has no replacement https://github.com/sebastianbergmann/phpunit/issues/4026
                   switch (++$invocation) {
                       case 1:
-                          static::assertSame(["id;title\n888221515;Young folks", null, ';'], [$documents, $primaryKey, $delimiter]);
+                          self::assertSame(["id;title\n888221515;Young folks", null, ';'], [$documents, $primaryKey, $delimiter]);
                           break;
                       case 2:
-                          static::assertSame(["id;title\n235115704;Mister Klein", null, ';'], [$documents, $primaryKey, $delimiter]);
+                          self::assertSame(["id;title\n235115704;Mister Klein", null, ';'], [$documents, $primaryKey, $delimiter]);
                           break;
                       default:
                           self::fail();
@@ -607,7 +607,7 @@ public function testGetDocumentsWithFilterCorrectFieldFormat(): void
             ->setFilter(['id > 100'])
             ->toArray()['fields'];
 
-        self::assertEquals($fields, $queryFields);
+        self::assertSame($fields, $queryFields);
     }
 
     public function testGetDocumentsWithoutFilterCorrectFieldsFormat(): void
@@ -618,7 +618,7 @@ public function testGetDocumentsWithoutFilterCorrectFieldsFormat(): void
             ->setFields($fields)
             ->toArray()['fields'];
 
-        self::assertEquals(
+        self::assertSame(
             implode(',', $fields),
             $queryFields
         );
@@ -786,7 +786,6 @@ public function testUpdateDocumentsCsvInBatches(): void
 
     public function testUpdateDocumentsCsvInBatchesWithDelimiter(): void
     {
-        $matcher = self::atLeastOnce();
         $replacement = 'id;title'.PHP_EOL;
         $replacement .= '888221515;Young folks'.PHP_EOL;
         $replacement .= '235115704;Mister Klein'.PHP_EOL;
@@ -797,22 +796,22 @@ public function testUpdateDocumentsCsvInBatchesWithDelimiter(): void
             ->disableOriginalConstructor()
             ->getMock();
 
-        $index->expects($matcher)
+        $index->expects(self::atLeastOnce())
               ->method('updateDocumentsCsv')
-              ->willReturnCallback(function (string $param) use ($matcher): void {
+              ->willReturnCallback(function (string $documents, $primaryKey, $delimiter): void {
+                  static $invocation = 0;
                   // withConsecutive has no replacement https://github.com/sebastianbergmann/phpunit/issues/4026
-                  switch ($matcher->numberOfInvocations()) {
+                  switch (++$invocation) {
                       case 1:
-                          self::assertEquals($param, ["id;title\n888221515;Young folks", null, ';']);
+                          self::assertSame(["id;title\n888221515;Young folks", null, ';'], [$documents, $primaryKey, $delimiter]);
                           break;
                       case 2:
-                          self::assertEquals($param, ["id;title\n235115704;Mister Klein", null, ';']);
+                          self::assertSame(["id;title\n235115704;Mister Klein", null, ';'], [$documents, $primaryKey, $delimiter]);
                           break;
                       default:
                           self::fail();
                   }
-              })
-              ->willReturn([], []);
+              });
 
         $index->updateDocumentsCsvInBatches($replacement, 1, null, ';');
     }

diff --git a/tests/Endpoints/DumpTest.php b/tests/Endpoints/DumpTest.php
@@ -14,6 +14,6 @@ public function testCreateDump(): void
 
         $task = $this->client->createDump();
 
-        self::assertEquals($expectedKeys, array_keys($task));
+        self::assertSame($expectedKeys, array_keys($task));
     }
 }
diff --git a/tests/Endpoints/IndexTest.php b/tests/Endpoints/IndexTest.php
@@ -128,7 +128,7 @@ public function testIndexStats(): void
         $stats = $this->index->stats();
 
         self::assertArrayHasKey('numberOfDocuments', $stats);
-        self::assertEquals(0, $stats['numberOfDocuments']);
+        self::assertSame(0, $stats['numberOfDocuments']);
         self::assertArrayHasKey('isIndexing', $stats);
         self::assertArrayHasKey('fieldDistribution', $stats);
     }

diff --git a/tests/Endpoints/KeysAndPermissionsTest.php b/tests/Endpoints/KeysAndPermissionsTest.php
@@ -60,7 +60,7 @@ public function testExceptionIfBadKeyProvidedToGetSettings(): void
         $index = $this->safeIndexName();
         $this->createEmptyIndex($index);
         $response = $this->client->index($index)->getSettings();
-        self::assertEquals(['*'], $response['searchableAttributes']);
+        self::assertSame(['*'], $response['searchableAttributes']);
 
         $newClient = new Client($this->host, 'bad-key');
 
@@ -231,7 +231,7 @@ public function testCreateKeyWithUid(): void
         ]);
 
         self::assertNotNull($key->getKey());
-        self::assertEquals('acab6d06-5385-47a2-a534-1ed4fd7f6402', $key->getUid());
+        self::assertSame('acab6d06-5385-47a2-a534-1ed4fd7f6402', $key->getUid());
 
         $this->client->deleteKey($key->getKey());
     }

diff --git a/tests/Endpoints/MultiSearchTest.php b/tests/Endpoints/MultiSearchTest.php
@@ -35,7 +35,7 @@ public function testSearchQueryData(): void
     {
         $data = (new SearchQuery())->setIndexUid($this->booksIndex->getUid())->setQuery('butler')->setSort(['author:desc']);
 
-        self::assertEquals([
+        self::assertSame([
             'indexUid' => $this->booksIndex->getUid(),
             'q' => 'butler',
             'sort' => ['author:desc'],
@@ -85,9 +85,9 @@ public function testSupportedQueryParams(): void
 
         $result = $query->toArray();
 
-        self::assertEquals([1, 0.9, [0.9874]], $result['vector']);
-        self::assertEquals(['comment'], $result['attributesToSearchOn']);
-        self::assertEquals(true, $result['showRankingScore']);
-        self::assertEquals(true, $result['showRankingScoreDetails']);
+        self::assertSame([1, 0.9, [0.9874]], $result['vector']);
+        self::assertSame(['comment'], $result['attributesToSearchOn']);
+        self::assertTrue($result['showRankingScore']);
+        self::assertTrue($result['showRankingScoreDetails']);
     }
 }