phpunit update

.gitignore

@@ -4,3 +4,4 @@ composer.lock
 state/*-*
 build/*
 phpunit.xml
+.phpunit.result.cache

composer.json

@@ -13,7 +13,7 @@
         }
     ],
      "require": {
-        "php": "~7.1",
+        "php": "^7.3",
         "silex/silex": "~2.0",
         "guzzle/guzzle": ">=3.8",
         "symfony/process": "~3|~4|~5",
@@ -23,7 +23,7 @@
     "require-dev": {
         "internations/kodierungsregelwerksammlung": "~0.23.0",
         "internations/testing-component": "1.0.1",
-        "phpunit/phpunit": "^7"
+        "phpunit/phpunit": "^9"
     },
     "autoload": {
         "psr-4": {"InterNations\\Component\\HttpMock\\": "src/"}

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.4/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          backupGlobals="false"
          convertErrorsToExceptions="true"
          convertWarningsToExceptions="true"
@@ -10,15 +10,20 @@
          colors="true"
          timeoutForLargeTests="100">
 
+    <coverage>
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
+    </coverage>
+
     <testsuites>
         <testsuite name="internations/http-mock">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
 
     <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="junit" target="build/logs/junit.xml" />
+        <junit outputFile="build/logs/junit.xml"/>
     </logging>
 
     <php>

tests/AppIntegrationTest.php

@@ -28,20 +28,20 @@ class AppIntegrationTest extends AbstractTestCase
      */
     private $client;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         static::$server1 = new Server(HTTP_MOCK_PORT, HTTP_MOCK_HOST);
         static::$server1->start();
     }
 
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         static::assertSame('', (string) static::$server1->getOutput(), (string) static::$server1->getOutput());
         static::assertSame('', (string) static::$server1->getErrorOutput(), (string) static::$server1->getErrorOutput());
         static::$server1->stop();
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         static::$server1->clean();
         $this->client = static::$server1->getClient();

tests/Matcher/ExtractorFactoryTest.php

@@ -14,7 +14,7 @@ class ExtractorFactoryTest extends AbstractTestCase
     /** @var Request|MockObject */
     private $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->extractorFactory = new ExtractorFactory();
         $this->request = $this->createMock('Symfony\Component\HttpFoundation\Request');

tests/MockBuilderIntegrationTest.php

@@ -27,7 +27,7 @@ class MockBuilderIntegrationTest extends TestCase
     /** @var Server */
     private $server;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->matches = new MatcherFactory();
         $this->builder = new MockBuilder($this->matches, new ExtractorFactory());
@@ -36,7 +36,7 @@ public function setUp()
         $this->server->clean();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->server->stop();
     }
@@ -93,7 +93,7 @@ public function testCreateExpectation()
 
         $this->assertSame('response body', (string) $client->post('/foo')->send()->getBody());
 
-        $this->assertContains('CLOSURE MATCHER: POST /foo', $this->server->getErrorOutput());
+        $this->assertTrue(strpos($this->server->getErrorOutput(), 'CLOSURE MATCHER: POST /foo') !== false);
     }
 
     public function testCreateTwoExpectationsAfterEachOther()

tests/PHPUnit/HttpMockMultiPHPUnitIntegrationTest.php

@@ -11,23 +11,23 @@ class HttpMockMultiPHPUnitIntegrationTest extends AbstractTestCase
 {
     use HttpMockTrait;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         static::setUpHttpMockBeforeClass(null, null, null, 'firstNamedServer');
         static::setUpHttpMockBeforeClass(static::getHttpMockDefaultPort() + 1, null, null, 'secondNamedServer');
     }
 
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         static::tearDownHttpMockAfterClass();
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpHttpMock();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->tearDownHttpMock();
     }
@@ -103,7 +103,7 @@ public function testErrorLogOutput()
             $this->tearDown();
             $this->fail('Exception expected');
         } catch (\Exception $e) {
-            $this->assertContains('HTTP mock server standard error output should be empty', $e->getMessage());
+            $this->assertTrue(strpos($e->getMessage(), 'HTTP mock server standard error output should be empty') !== false);
         }
     }
 

tests/PHPUnit/HttpMockPHPUnitIntegrationBasePathTest.php

@@ -9,22 +9,22 @@ class HttpMockPHPUnitIntegrationBasePathTest extends AbstractTestCase
 {
     use HttpMockTrait;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         static::setUpHttpMockBeforeClass(null, null, '/custom-base-path');
     }
 
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         static::tearDownHttpMockAfterClass();
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpHttpMock();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->tearDownHttpMock();
     }

tests/PHPUnit/HttpMockPHPUnitIntegrationTest.php

@@ -12,22 +12,22 @@ class HttpMockPHPUnitIntegrationTest extends AbstractTestCase
 {
     use HttpMockTrait;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         static::setUpHttpMockBeforeClass();
     }
 
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         static::tearDownHttpMockAfterClass();
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->setUpHttpMock();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->tearDownHttpMock();
     }
@@ -103,7 +103,7 @@ public function testErrorLogOutput()
             $this->tearDown();
             $this->fail('Exception expected');
         } catch (\Exception $e) {
-            $this->assertContains('HTTP mock server standard error output should be empty', $e->getMessage());
+            $this->assertTrue(strpos($e->getMessage(), 'HTTP mock server standard error output should be empty') !== false);
         }
     }
 

tests/Request/UnifiedRequestTest.php

@@ -21,7 +21,7 @@ class UnifiedRequestTest extends AbstractTestCase
     /** @var UnifiedRequest */
     private $unifiedEnclosingEntityRequest;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->wrappedRequest = $this->createMock('Guzzle\Http\Message\RequestInterface');
         $this->wrappedEntityEnclosingRequest = $this->createMock('Guzzle\Http\Message\EntityEnclosingRequestInterface');

tests/RequestCollectionFacadeTest.php

@@ -20,7 +20,7 @@ class RequestCollectionFacadeTest extends AbstractTestCase
     /** @var RequestCollectionFacade */
     private $facade;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->client = $this->createMock('Guzzle\Http\ClientInterface');
         $this->facade = new RequestCollectionFacade($this->client);