From c74fa7955d9392aea954c2e45ed4137fb2bebcbe Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Wed, 24 Apr 2019 10:45:00 +0200 Subject: phpunit: Upgrade to version 8, fixed tests, formatting Use `dms/phpunit-arraysubset-asserts` after `assertArraySubset` got deprecated --- tests/Unit/Http/MessageTraitRequestTest.php | 3 +++ tests/Unit/Http/MessageTraitResponseTest.php | 3 +++ tests/Unit/Http/RequestServiceProviderTest.php | 2 +- tests/Unit/Http/RequestTest.php | 8 ++++---- tests/Unit/Http/ResponseServiceProviderTest.php | 4 ++-- tests/Unit/Http/ResponseTest.php | 6 +++++- tests/Unit/Http/SessionHandlers/DatabaseHandlerTest.php | 2 +- tests/Unit/Http/SessionServiceProviderTest.php | 4 ++-- tests/Unit/Http/UrlGeneratorServiceProviderTest.php | 4 ++-- 9 files changed, 23 insertions(+), 13 deletions(-) (limited to 'tests/Unit/Http') diff --git a/tests/Unit/Http/MessageTraitRequestTest.php b/tests/Unit/Http/MessageTraitRequestTest.php index 31ba249f..31ce68c3 100644 --- a/tests/Unit/Http/MessageTraitRequestTest.php +++ b/tests/Unit/Http/MessageTraitRequestTest.php @@ -2,12 +2,15 @@ namespace Engelsystem\Test\Unit\Http; +use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts; use Engelsystem\Test\Unit\Http\Stub\MessageTraitRequestImplementation; use Nyholm\Psr7\Stream; use PHPUnit\Framework\TestCase; class MessageTraitRequestTest extends TestCase { + use ArraySubsetAsserts; + /** * @covers \Engelsystem\Http\MessageTrait::withProtocolVersion */ diff --git a/tests/Unit/Http/MessageTraitResponseTest.php b/tests/Unit/Http/MessageTraitResponseTest.php index 9174eadd..33e8dc6b 100644 --- a/tests/Unit/Http/MessageTraitResponseTest.php +++ b/tests/Unit/Http/MessageTraitResponseTest.php @@ -2,6 +2,7 @@ namespace Engelsystem\Test\Unit\Http; +use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts; use Engelsystem\Test\Unit\Http\Stub\MessageTraitResponseImplementation; use Nyholm\Psr7\Stream; use PHPUnit\Framework\TestCase; @@ -11,6 +12,8 @@ use Symfony\Component\HttpFoundation\Response as SymfonyResponse; class MessageTraitResponseTest extends TestCase { + use ArraySubsetAsserts; + /** * @covers \Engelsystem\Http\MessageTrait */ diff --git a/tests/Unit/Http/RequestServiceProviderTest.php b/tests/Unit/Http/RequestServiceProviderTest.php index 4e9bb4e0..0a2ae31d 100644 --- a/tests/Unit/Http/RequestServiceProviderTest.php +++ b/tests/Unit/Http/RequestServiceProviderTest.php @@ -7,7 +7,7 @@ use Engelsystem\Container\ServiceProvider; use Engelsystem\Http\Request; use Engelsystem\Http\RequestServiceProvider; use Engelsystem\Test\Unit\ServiceProviderTest; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\HttpFoundation\Request as SymfonyRequest; class RequestServiceProviderTest extends ServiceProviderTest diff --git a/tests/Unit/Http/RequestTest.php b/tests/Unit/Http/RequestTest.php index df171905..26bf0116 100644 --- a/tests/Unit/Http/RequestTest.php +++ b/tests/Unit/Http/RequestTest.php @@ -4,8 +4,8 @@ namespace Engelsystem\Test\Unit\Http; use Engelsystem\Http\Request; use Nyholm\Psr7\UploadedFile; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; -use PHPUnit_Framework_MockObject_MockObject as MockObject; use Psr\Http\Message\RequestInterface; use Psr\Http\Message\UploadedFileInterface; use Psr\Http\Message\UriInterface; @@ -90,7 +90,7 @@ class RequestTest extends TestCase */ public function testPath() { - /** @var MockObject|Request $request */ + /** @var Request|MockObject $request */ $request = $this ->getMockBuilder(Request::class) ->setMethods(['getPathInfo']) @@ -113,7 +113,7 @@ class RequestTest extends TestCase */ public function testUrl() { - /** @var MockObject|Request $request */ + /** @var Request|MockObject $request */ $request = $this ->getMockBuilder(Request::class) ->setMethods(['getUri']) @@ -368,7 +368,7 @@ class RequestTest extends TestCase $request = new Request([], [], $attributes); $this->assertEquals($attributes['ipsum'], $request->getAttribute('ipsum')); - $this->assertEquals(null, $request->getAttribute('dolor')); + $this->assertNull($request->getAttribute('dolor')); $this->assertEquals(1234, $request->getAttribute('test', 1234)); } diff --git a/tests/Unit/Http/ResponseServiceProviderTest.php b/tests/Unit/Http/ResponseServiceProviderTest.php index 6ce1f4fe..de252b99 100644 --- a/tests/Unit/Http/ResponseServiceProviderTest.php +++ b/tests/Unit/Http/ResponseServiceProviderTest.php @@ -5,7 +5,7 @@ namespace Engelsystem\Test\Unit\Http; use Engelsystem\Http\Response; use Engelsystem\Http\ResponseServiceProvider; use Engelsystem\Test\Unit\ServiceProviderTest; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\HttpFoundation\Response as SymfonyResponse; class ResponseServiceProviderTest extends ServiceProviderTest @@ -15,7 +15,7 @@ class ResponseServiceProviderTest extends ServiceProviderTest */ public function testRegister() { - /** @var MockObject|Response $response */ + /** @var Response|MockObject $response */ $response = $this->getMockBuilder(Response::class) ->getMock(); diff --git a/tests/Unit/Http/ResponseTest.php b/tests/Unit/Http/ResponseTest.php index d7dc37c0..6f57e1db 100644 --- a/tests/Unit/Http/ResponseTest.php +++ b/tests/Unit/Http/ResponseTest.php @@ -2,8 +2,10 @@ namespace Engelsystem\Test\Unit\Http; +use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts; use Engelsystem\Http\Response; use Engelsystem\Renderer\Renderer; +use InvalidArgumentException; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Psr\Http\Message\ResponseInterface; @@ -11,6 +13,8 @@ use Symfony\Component\HttpFoundation\Response as SymfonyResponse; class ResponseTest extends TestCase { + use ArraySubsetAsserts; + /** * @covers \Engelsystem\Http\Response */ @@ -76,7 +80,7 @@ class ResponseTest extends TestCase */ public function testWithViewNoRenderer() { - $this->expectException(\InvalidArgumentException::class); + $this->expectException(InvalidArgumentException::class); $response = new Response(); $response->withView('foo'); diff --git a/tests/Unit/Http/SessionHandlers/DatabaseHandlerTest.php b/tests/Unit/Http/SessionHandlers/DatabaseHandlerTest.php index ea4f3701..61ab982d 100644 --- a/tests/Unit/Http/SessionHandlers/DatabaseHandlerTest.php +++ b/tests/Unit/Http/SessionHandlers/DatabaseHandlerTest.php @@ -88,7 +88,7 @@ class DatabaseHandlerTest extends TestCase /** * Prepare tests */ - protected function setUp() + protected function setUp(): void { $this->initDatabase(); } diff --git a/tests/Unit/Http/SessionServiceProviderTest.php b/tests/Unit/Http/SessionServiceProviderTest.php index 70e751f3..204cfe1e 100644 --- a/tests/Unit/Http/SessionServiceProviderTest.php +++ b/tests/Unit/Http/SessionServiceProviderTest.php @@ -7,7 +7,7 @@ use Engelsystem\Http\Request; use Engelsystem\Http\SessionHandlers\DatabaseHandler; use Engelsystem\Http\SessionServiceProvider; use Engelsystem\Test\Unit\ServiceProviderTest; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; @@ -33,7 +33,7 @@ class SessionServiceProviderTest extends ServiceProviderTest $session = $this->getSessionMock(); $request = $this->getRequestMock(); - /** @var MockObject|SessionServiceProvider $serviceProvider */ + /** @var SessionServiceProvider|MockObject $serviceProvider */ $serviceProvider = $this->getMockBuilder(SessionServiceProvider::class) ->setConstructorArgs([$app]) ->setMethods(['isCli']) diff --git a/tests/Unit/Http/UrlGeneratorServiceProviderTest.php b/tests/Unit/Http/UrlGeneratorServiceProviderTest.php index 720af631..c396c05a 100644 --- a/tests/Unit/Http/UrlGeneratorServiceProviderTest.php +++ b/tests/Unit/Http/UrlGeneratorServiceProviderTest.php @@ -5,7 +5,7 @@ namespace Engelsystem\Test\Unit\Http; use Engelsystem\Http\UrlGenerator; use Engelsystem\Http\UrlGeneratorServiceProvider; use Engelsystem\Test\Unit\ServiceProviderTest; -use PHPUnit_Framework_MockObject_MockObject; +use PHPUnit\Framework\MockObject\MockObject; class UrlGeneratorServiceProviderTest extends ServiceProviderTest { @@ -14,7 +14,7 @@ class UrlGeneratorServiceProviderTest extends ServiceProviderTest */ public function testRegister() { - /** @var PHPUnit_Framework_MockObject_MockObject|UrlGenerator $urlGenerator */ + /** @var UrlGenerator|MockObject $urlGenerator */ $urlGenerator = $this->getMockBuilder(UrlGenerator::class) ->getMock(); -- cgit v1.2.3-70-g09d2