refactor: upgrade test suite to current standards withing the constraints of phpunit version

Author: DannyvdSluijs

tests/ConnectionTest.php

@@ -89,12 +89,11 @@ public function testResponseIsLoggedIfAcquiringTokensFailed(): void
         $connection->get('crm/Accounts');
     }
 
-    public function endpointsThatDontUseDivisionInUrl(): array
+    public function endpointsThatDontUseDivisionInUrl(): \Generator
     {
-        return [
-            'System users endpoint' => ['system/Users'],
-            'Me endpoint'           => ['current/Me'],
-        ];
+
+        yield 'System users endpoint' => ['system/Users'];
+        yield 'Me endpoint'           => ['current/Me'];
     }
 
     private function createMockHandler(): MockHandler

tests/ModelTest.php

@@ -12,7 +12,7 @@ class ModelTest extends TestCase
 {
     use MocksExactConnection;
 
-    public function testCanFindModel()
+    public function testCanFindModel(): void
     {
         $handler = $this->createMockHandlerUsingFixture('item.json');
         $connection = $this->createMockConnection($handler);
@@ -23,7 +23,7 @@ public function testCanFindModel()
         $this->assertEquals('00000000-0000-0000-0000-000000000000', $response->primaryKeyContent());
     }
 
-    public function testCanGetFirstModel()
+    public function testCanGetFirstModel(): void
     {
         $handler = $this->createMockHandlerUsingFixture('item.json');
         $connection = $this->createMockConnection($handler);
@@ -34,7 +34,7 @@ public function testCanGetFirstModel()
         $this->assertEquals('00000000-0000-0000-0000-000000000000', $response->primaryKeyContent());
     }
 
-    public function testCanGetModels()
+    public function testCanGetModels(): void
     {
         $handler = $this->createMockHandlerUsingFixture('items.json');
         $connection = $this->createMockConnection($handler);
@@ -46,18 +46,17 @@ public function testCanGetModels()
         $this->assertCount(2, $response);
     }
 
-    public function testCanGetModelsAsGenerator()
+    public function testCanGetModelsAsGenerator(): void
     {
         $handler = $this->createMockHandlerUsingFixture('items.json');
         $connection = $this->createMockConnection($handler);
 
         $response = (new Item($connection))->getAsGenerator();
 
-        $this->assertInstanceOf(Generator::class, $response);
         $this->assertEquals(2, iterator_count($response));
     }
 
-    public function testCanFilterModels()
+    public function testCanFilterModels(): void
     {
         $handler = $this->createMockHandlerUsingFixture('items.json');
         $connection = $this->createMockConnection($handler);
@@ -69,18 +68,17 @@ public function testCanFilterModels()
         $this->assertCount(2, $response);
     }
 
-    public function testCanFilterModelsAsGenerator()
+    public function testCanFilterModelsAsGenerator(): void
     {
         $handler = $this->createMockHandlerUsingFixture('items.json');
         $connection = $this->createMockConnection($handler);
 
         $response = (new Item($connection))->filterAsGenerator('IsWebshopItem eq 0');
 
-        $this->assertInstanceOf(Generator::class, $response);
         $this->assertEquals(2, iterator_count($response));
     }
 
-    public function testCanGetCollectionFromResult()
+    public function testCanGetCollectionFromResult(): void
     {
         $handler = $this->createMockHandlerUsingFixture('items.json');
         $connection = $this->createMockConnection($handler);
@@ -94,7 +92,7 @@ public function testCanGetCollectionFromResult()
         $this->assertCount(2, $collection);
     }
 
-    public function testCanGetCollectionFromResultAsGenerator()
+    public function testCanGetCollectionFromResultAsGenerator(): void
     {
         $handler = $this->createMockHandlerUsingFixture('items.json');
         $connection = $this->createMockConnection($handler);
@@ -103,18 +101,16 @@ public function testCanGetCollectionFromResultAsGenerator()
         $result = $connection->get($item->url(), []);
         $collection = $item->collectionFromResultAsGenerator($result);
 
-        $this->assertInstanceOf(Generator::class, $collection);
         $this->assertEquals(2, iterator_count($collection));
     }
 
-    public function testCanGetResultSet()
+    public function testCanGetResultSet(): void
     {
         $handler = $this->createMockHandler();
         $connection = $this->createMockConnection($handler);
-        $item = new Item($connection);
 
-        $resultset = (new Item($connection))->getResultSet();
+        $resultSet = (new Item($connection))->getResultSet();
 
-        $this->assertInstanceOf(Resultset::class, $resultset);
+        $this->assertInstanceOf(Resultset::class, $resultSet);
     }
 }