From 4600d4888560085da46bf1f6ea9ff70fe9e632a7 Mon Sep 17 00:00:00 2001 From: Alexander Dankovtsev Date: Fri, 12 Mar 2021 09:01:09 +0300 Subject: [PATCH] phpunit update --- .gitignore | 1 + composer.json | 4 ++-- phpunit.xml.dist | 11 ++++++++--- tests/AppIntegrationTest.php | 6 +++--- tests/Matcher/ExtractorFactoryTest.php | 2 +- tests/MockBuilderIntegrationTest.php | 6 +++--- tests/PHPUnit/HttpMockMultiPHPUnitIntegrationTest.php | 10 +++++----- .../HttpMockPHPUnitIntegrationBasePathTest.php | 8 ++++---- tests/PHPUnit/HttpMockPHPUnitIntegrationTest.php | 10 +++++----- tests/Request/UnifiedRequestTest.php | 2 +- tests/RequestCollectionFacadeTest.php | 2 +- 11 files changed, 34 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index 7278a54..63ae91d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ composer.lock state/*-* build/* phpunit.xml +.phpunit.result.cache diff --git a/composer.json b/composer.json index b09582f..09a90cc 100644 --- a/composer.json +++ b/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/"} diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 51c72a8..8298e09 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,6 +1,6 @@ + + + + + + ./tests/ @@ -17,8 +23,7 @@ - - + diff --git a/tests/AppIntegrationTest.php b/tests/AppIntegrationTest.php index c8d8ebc..85667cb 100644 --- a/tests/AppIntegrationTest.php +++ b/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(); diff --git a/tests/Matcher/ExtractorFactoryTest.php b/tests/Matcher/ExtractorFactoryTest.php index 3f5f8f7..a871f47 100644 --- a/tests/Matcher/ExtractorFactoryTest.php +++ b/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'); diff --git a/tests/MockBuilderIntegrationTest.php b/tests/MockBuilderIntegrationTest.php index 9b64c27..814269a 100644 --- a/tests/MockBuilderIntegrationTest.php +++ b/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() diff --git a/tests/PHPUnit/HttpMockMultiPHPUnitIntegrationTest.php b/tests/PHPUnit/HttpMockMultiPHPUnitIntegrationTest.php index d4561ef..dfae07b 100644 --- a/tests/PHPUnit/HttpMockMultiPHPUnitIntegrationTest.php +++ b/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); } } diff --git a/tests/PHPUnit/HttpMockPHPUnitIntegrationBasePathTest.php b/tests/PHPUnit/HttpMockPHPUnitIntegrationBasePathTest.php index 8cc8199..1a98bf4 100644 --- a/tests/PHPUnit/HttpMockPHPUnitIntegrationBasePathTest.php +++ b/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(); } diff --git a/tests/PHPUnit/HttpMockPHPUnitIntegrationTest.php b/tests/PHPUnit/HttpMockPHPUnitIntegrationTest.php index 239277a..5bdbc54 100644 --- a/tests/PHPUnit/HttpMockPHPUnitIntegrationTest.php +++ b/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); } } diff --git a/tests/Request/UnifiedRequestTest.php b/tests/Request/UnifiedRequestTest.php index 479a384..c64c5f6 100644 --- a/tests/Request/UnifiedRequestTest.php +++ b/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'); diff --git a/tests/RequestCollectionFacadeTest.php b/tests/RequestCollectionFacadeTest.php index e111263..9061e12 100644 --- a/tests/RequestCollectionFacadeTest.php +++ b/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);