Fix bad merge for IterableAPICollection, fix tests to move to expectExceptionMessage

Author: SecondeJK

src/Entity/IterableAPICollection.php

@@ -73,16 +73,6 @@ class IterableAPICollection implements ClientAwareInterface, Iterator, Countable
      */
     protected int $current = 0;
 
-    /**
-     * This allows for override if the endpoint API uses a different query key
-     */
-    protected string $pageIndexKey = 'page_index';
-
-    /**
-     * This allows for override if the endpoint API uses a different query key
-     */
-    protected string $pageSizeKey = 'page_size';
-
     /**
      * Count the items in the response instead of returning the count parameter
      *
@@ -181,30 +171,6 @@ public function hydrateEntity($data, $id = null)
         return $data;
     }
 
-    public function getPageIndexKey(): string
-    {
-        return $this->pageIndexKey;
-    }
-
-    public function setPageIndexKey(string $pageIndexKey): IterableAPICollection
-    {
-        $this->pageIndexKey = $pageIndexKey;
-
-        return $this;
-    }
-
-    public function getPageSizeKey(): string
-    {
-        return $this->pageSizeKey;
-    }
-
-    public function setPageSizeKey(string $pageSizeKey): IterableAPICollection
-    {
-        $this->pageSizeKey = $pageSizeKey;
-
-        return $this;
-    }
-
     public function getResourceRoot(): array
     {
         // Handles issues where an API returns empty for no results, as opposed

test/Meetings/ClientTest.php

@@ -137,7 +137,7 @@ public function testClientWillHandleUnauthorizedRequests(): void
         }))->willReturn($this->getResponse('empty', 403));
 
         $this->expectException(Client\Exception\Credentials::class);
-        $this->expectErrorMessage('You are not authorised to perform this request');
+        $this->expectExceptionMessage('You are not authorised to perform this request');
         $response = $this->meetingsClient->createRoom('test-room');
     }
 
@@ -154,7 +154,7 @@ public function testClientWillHandleNotFoundResponse(): void
             return true;
         }))->willReturn($this->getResponse('empty', 404));
         $this->expectException(NotFound::class);
-        $this->expectErrorMessage('No resource found');
+        $this->expectExceptionMessage('No resource found');
         $response = $this->meetingsClient->getRoom('224d6219-dc05-4c09-9d42-96adce7fcb67');
     }
 
@@ -171,7 +171,7 @@ public function testClientWillHandleValidationError(): void
         }))->willReturn($this->getResponse('empty', 400));
 
         $this->expectException(Validation::class);
-        $this->expectErrorMessage('The request data was invalid');
+        $this->expectExceptionMessage('The request data was invalid');
 
         $response = $this->meetingsClient->createRoom('test-room');
     }
@@ -368,7 +368,7 @@ public function testWillHandleConflictErrorOnThemeCreation(): void
         }))->willReturn($this->getResponse('empty', 409));
 
         $this->expectException(Conflict::class);
-        $this->expectErrorMessage('Entity conflict');
+        $this->expectExceptionMessage('Entity conflict');
         $response = $this->meetingsClient->createApplicationTheme('My-Theme');
     }
 

test/Voice/NCCO/Action/PayTest.php

@@ -42,7 +42,7 @@ public function testCanAddToNCCO(): void
     public function testThrowsErrorWithNoAmount(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectErrorMessage('Amount is required for this action.');
+        $this->expectExceptionMessage('Amount is required for this action.');
         $payAction = Pay::factory(['currency' => 'eur']);
     }
 
@@ -76,7 +76,7 @@ public function testCannotAddCurrencyAsFloat(): void
     public function testCannotAddInvalidVoiceSetting()
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectErrorMessage('type did not fall under permitted voice settings');
+        $this->expectExceptionMessage('type did not fall under permitted voice settings');
 
         $payAction = Pay::factory([
             'amount' => 9.99,
@@ -131,7 +131,7 @@ public function testCanAddPrompts(): void
     public function testCannotAddPromptsWithWrongType(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectErrorMessage('invalid prompt type');
+        $this->expectExceptionMessage('invalid prompt type');
 
         $payAction = Pay::factory([
             'amount' => 9.99,
@@ -151,7 +151,7 @@ public function testCannotAddPromptsWithWrongType(): void
     public function testCannotAddPromptWithoutText(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectErrorMessage('text is required when setting error text prompts.');
+        $this->expectExceptionMessage('text is required when setting error text prompts.');
 
         $payAction = Pay::factory([
             'amount' => 9.99,