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 --- .../Unit/Exceptions/ExceptionsServiceProviderTest.php | 8 ++++---- tests/Unit/Exceptions/HandlerTest.php | 18 +++++++++--------- .../Unit/Exceptions/Handlers/LegacyDevelopmentTest.php | 4 ++-- tests/Unit/Exceptions/Handlers/LegacyTest.php | 18 +++++++++--------- tests/Unit/Exceptions/Handlers/WhoopsTest.php | 16 ++++++++-------- 5 files changed, 32 insertions(+), 32 deletions(-) (limited to 'tests/Unit/Exceptions') diff --git a/tests/Unit/Exceptions/ExceptionsServiceProviderTest.php b/tests/Unit/Exceptions/ExceptionsServiceProviderTest.php index 4f2ae654..b484f41f 100644 --- a/tests/Unit/Exceptions/ExceptionsServiceProviderTest.php +++ b/tests/Unit/Exceptions/ExceptionsServiceProviderTest.php @@ -10,7 +10,7 @@ use Engelsystem\Exceptions\Handlers\LegacyDevelopment; use Engelsystem\Exceptions\Handlers\Whoops; use Engelsystem\Http\Request; use Engelsystem\Test\Unit\ServiceProviderTest; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; class ExceptionsServiceProviderTest extends ServiceProviderTest { @@ -23,7 +23,7 @@ class ExceptionsServiceProviderTest extends ServiceProviderTest { $app = $this->getApp(['make', 'instance', 'bind']); - /** @var MockObject|Handler $handler */ + /** @var Handler|MockObject $handler */ $handler = $this->createMock(Handler::class); $this->setExpects($handler, 'register'); /** @var Legacy|MockObject $legacyHandler */ @@ -81,10 +81,10 @@ class ExceptionsServiceProviderTest extends ServiceProviderTest */ public function testBoot() { - /** @var MockObject|Handler $handler */ + /** @var Handler|MockObject $handler */ $handler = $this->createMock(Handler::class); - /** @var MockObject|Request $request */ + /** @var Request|MockObject $request */ $request = $this->createMock(Request::class); $handler->expects($this->once()) diff --git a/tests/Unit/Exceptions/HandlerTest.php b/tests/Unit/Exceptions/HandlerTest.php index 58d25de3..af89dae7 100644 --- a/tests/Unit/Exceptions/HandlerTest.php +++ b/tests/Unit/Exceptions/HandlerTest.php @@ -7,8 +7,8 @@ use Engelsystem\Exceptions\Handlers\HandlerInterface; use Engelsystem\Http\Request; use ErrorException; use Exception; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; -use PHPUnit_Framework_MockObject_MockObject as Mock; class HandlerTest extends TestCase { @@ -17,7 +17,7 @@ class HandlerTest extends TestCase */ public function testCreate() { - /** @var Handler|Mock $handler */ + /** @var Handler|MockObject $handler */ $handler = new Handler(); $this->assertInstanceOf(Handler::class, $handler); $this->assertEquals(Handler::ENV_PRODUCTION, $handler->getEnvironment()); @@ -31,7 +31,7 @@ class HandlerTest extends TestCase */ public function testErrorHandler() { - /** @var Handler|Mock $handler */ + /** @var Handler|MockObject $handler */ $handler = $this->getMockBuilder(Handler::class) ->setMethods(['exceptionHandler']) ->getMock(); @@ -51,7 +51,7 @@ class HandlerTest extends TestCase $exception = new Exception(); $errorMessage = 'Oh noes, an error!'; - /** @var HandlerInterface|Mock $handlerMock */ + /** @var HandlerInterface|MockObject $handlerMock */ $handlerMock = $this->getMockForAbstractClass(HandlerInterface::class); $handlerMock->expects($this->atLeastOnce()) ->method('report') @@ -63,7 +63,7 @@ class HandlerTest extends TestCase echo $errorMessage; }); - /** @var Handler|Mock $handler */ + /** @var Handler|MockObject $handler */ $handler = $this->getMockBuilder(Handler::class) ->setMethods(['terminateApplicationImmediately']) ->getMock(); @@ -84,7 +84,7 @@ class HandlerTest extends TestCase */ public function testRegister() { - /** @var Handler|Mock $handler */ + /** @var Handler|MockObject $handler */ $handler = $this->getMockForAbstractClass(Handler::class); $handler->register(); @@ -120,9 +120,9 @@ class HandlerTest extends TestCase public function testHandler() { $handler = new Handler(); - /** @var HandlerInterface|Mock $devHandler */ + /** @var HandlerInterface|MockObject $devHandler */ $devHandler = $this->getMockForAbstractClass(HandlerInterface::class); - /** @var HandlerInterface|Mock $prodHandler */ + /** @var HandlerInterface|MockObject $prodHandler */ $prodHandler = $this->getMockForAbstractClass(HandlerInterface::class); $handler->setHandler(Handler::ENV_DEVELOPMENT, $devHandler); @@ -139,7 +139,7 @@ class HandlerTest extends TestCase public function testRequest() { $handler = new Handler(); - /** @var Request|Mock $request */ + /** @var Request|MockObject $request */ $request = $this->createMock(Request::class); $handler->setRequest($request); diff --git a/tests/Unit/Exceptions/Handlers/LegacyDevelopmentTest.php b/tests/Unit/Exceptions/Handlers/LegacyDevelopmentTest.php index d5390c9e..bc4625e9 100644 --- a/tests/Unit/Exceptions/Handlers/LegacyDevelopmentTest.php +++ b/tests/Unit/Exceptions/Handlers/LegacyDevelopmentTest.php @@ -6,8 +6,8 @@ namespace Engelsystem\Test\Unit\Exceptions\handlers; use Engelsystem\Exceptions\Handlers\LegacyDevelopment; use Engelsystem\Http\Request; use ErrorException; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; -use PHPUnit_Framework_MockObject_MockObject as Mock; class LegacyDevelopmentTest extends TestCase { @@ -18,7 +18,7 @@ class LegacyDevelopmentTest extends TestCase public function testRender() { $handler = new LegacyDevelopment(); - /** @var Request|Mock $request */ + /** @var Request|MockObject $request */ $request = $this->createMock(Request::class); $exception = new ErrorException('Lorem Ipsum', 4242, 1, 'foo.php', 9999); diff --git a/tests/Unit/Exceptions/Handlers/LegacyTest.php b/tests/Unit/Exceptions/Handlers/LegacyTest.php index 04b214f2..d7d65daf 100644 --- a/tests/Unit/Exceptions/Handlers/LegacyTest.php +++ b/tests/Unit/Exceptions/Handlers/LegacyTest.php @@ -6,8 +6,8 @@ namespace Engelsystem\Test\Unit\Exceptions\handlers; use Engelsystem\Exceptions\Handlers\Legacy; use Engelsystem\Http\Request; use Exception; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; -use PHPUnit_Framework_MockObject_MockObject as Mock; class LegacyTest extends TestCase { @@ -17,9 +17,9 @@ class LegacyTest extends TestCase public function testRender() { $handler = new Legacy(); - /** @var Request|Mock $request */ + /** @var Request|MockObject $request */ $request = $this->createMock(Request::class); - /** @var Exception|Mock $exception */ + /** @var Exception|MockObject $exception */ $exception = $this->createMock(Exception::class); $this->expectOutputRegex('/.*error occurred.*/i'); @@ -45,11 +45,11 @@ class LegacyTest extends TestCase $logContent = file_get_contents($log); unset($log); - $this->assertContains('4242', $logContent); - $this->assertContains('Lorem Ipsum', $logContent); - $this->assertContains(basename(__FILE__), $logContent); - $this->assertContains((string)$line, $logContent); - $this->assertContains(__FUNCTION__, $logContent); - $this->assertContains(json_encode(__CLASS__), $logContent); + $this->assertStringContainsString('4242', $logContent); + $this->assertStringContainsString('Lorem Ipsum', $logContent); + $this->assertStringContainsString(basename(__FILE__), $logContent); + $this->assertStringContainsString((string)$line, $logContent); + $this->assertStringContainsString(__FUNCTION__, $logContent); + $this->assertStringContainsString(json_encode(__CLASS__), $logContent); } } diff --git a/tests/Unit/Exceptions/Handlers/WhoopsTest.php b/tests/Unit/Exceptions/Handlers/WhoopsTest.php index 4949c45a..74bdc457 100644 --- a/tests/Unit/Exceptions/Handlers/WhoopsTest.php +++ b/tests/Unit/Exceptions/Handlers/WhoopsTest.php @@ -8,8 +8,8 @@ use Engelsystem\Exceptions\Handlers\Whoops; use Engelsystem\Helpers\Authenticator; use Engelsystem\Http\Request; use Exception; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; -use PHPUnit_Framework_MockObject_MockObject as Mock; use Whoops\Handler\JsonResponseHandler; use Whoops\Handler\PrettyPageHandler; use Whoops\Run as WhoopsRunner; @@ -22,19 +22,19 @@ class WhoopsTest extends TestCase */ public function testRender() { - /** @var Application|Mock $app */ + /** @var Application|MockObject $app */ $app = $this->createMock(Application::class); - /** @var Authenticator|Mock $auth */ + /** @var Authenticator|MockObject $auth */ $auth = $this->createMock(Authenticator::class); - /** @var Request|Mock $request */ + /** @var Request|MockObject $request */ $request = $this->createMock(Request::class); - /** @var WhoopsRunnerInterface|Mock $whoopsRunner */ + /** @var WhoopsRunnerInterface|MockObject $whoopsRunner */ $whoopsRunner = $this->getMockForAbstractClass(WhoopsRunnerInterface::class); - /** @var PrettyPageHandler|Mock $prettyPageHandler */ + /** @var PrettyPageHandler|MockObject $prettyPageHandler */ $prettyPageHandler = $this->createMock(PrettyPageHandler::class); - /** @var JsonResponseHandler|Mock $jsonResponseHandler */ + /** @var JsonResponseHandler|MockObject $jsonResponseHandler */ $jsonResponseHandler = $this->createMock(JsonResponseHandler::class); - /** @var Exception|Mock $exception */ + /** @var Exception|MockObject $exception */ $exception = $this->createMock(Exception::class); $request->expects($this->once()) -- cgit v1.2.3-54-g00ecf