Merge pull request #668 from DannyvdSluijs/Upgrade-phpunit

Upgrade phpunit

Author: stephangroen

composer.json

@@ -21,7 +21,7 @@
         "ext-json": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5|^9.3"
+        "phpunit/phpunit": "^9.6"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         bootstrap="./vendor/autoload.php"
-         colors="true"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        bootstrap="./vendor/autoload.php"
+        colors="true"
+        xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd">
+
+  <coverage>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </coverage>
+
   <testsuites>
-    <testsuite name="Application Test Suite">
+    <testsuite name="Exact PHP Client Test Suite">
       <directory>tests</directory>
     </testsuite>
   </testsuites>
-  <filter>
-    <whitelist>
-      <directory suffix=".php">src</directory>
-    </whitelist>
-  </filter>
 </phpunit>

tests/ConnectionTest.php

@@ -89,12 +89,10 @@ 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

@@ -2,7 +2,6 @@
 
 namespace Picqer\Tests;
 
-use Generator;
 use PHPUnit\Framework\TestCase;
 use Picqer\Financials\Exact\Item;
 use Picqer\Financials\Exact\Query\Resultset;
@@ -12,7 +11,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 +22,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 +33,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 +45,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->assertCount(2, $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 +67,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->assertCount(2, $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 +91,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 +100,16 @@ public function testCanGetCollectionFromResultAsGenerator()
         $result = $connection->get($item->url(), []);
         $collection = $item->collectionFromResultAsGenerator($result);
 
-        $this->assertInstanceOf(Generator::class, $collection);
-        $this->assertCount(2, $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);
     }
 }