diff options
author | Igor Scheller <igor.scheller@igorshp.de> | 2019-04-24 10:45:00 +0200 |
---|---|---|
committer | msquare <msquare@notrademark.de> | 2019-04-25 17:56:06 +0200 |
commit | c74fa7955d9392aea954c2e45ed4137fb2bebcbe (patch) | |
tree | 034c93b4b3ccc31e6cc9c27dd87f139569c10c72 /tests/Unit/Renderer | |
parent | b74835a0968c35ad9a0955dd8b5e2f3cf9b72a56 (diff) |
phpunit: Upgrade to version 8, fixed tests, formatting
Use `dms/phpunit-arraysubset-asserts` after `assertArraySubset` got deprecated
Diffstat (limited to 'tests/Unit/Renderer')
-rw-r--r-- | tests/Unit/Renderer/HtmlEngineTest.php | 5 | ||||
-rw-r--r-- | tests/Unit/Renderer/RendererServiceProviderTest.php | 12 | ||||
-rw-r--r-- | tests/Unit/Renderer/RendererTest.php | 8 | ||||
-rw-r--r-- | tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php | 3 |
4 files changed, 17 insertions, 11 deletions
diff --git a/tests/Unit/Renderer/HtmlEngineTest.php b/tests/Unit/Renderer/HtmlEngineTest.php index 8c262932..4a31e4bc 100644 --- a/tests/Unit/Renderer/HtmlEngineTest.php +++ b/tests/Unit/Renderer/HtmlEngineTest.php @@ -58,7 +58,10 @@ class HtmlEngineTest extends TestCase return $fileName; } - public function tearDown() + /** + * Remove files + */ + protected function tearDown(): void { foreach ($this->tmpFileNames as $fileName) { unlink($fileName); diff --git a/tests/Unit/Renderer/RendererServiceProviderTest.php b/tests/Unit/Renderer/RendererServiceProviderTest.php index 6cdf4363..36263b0c 100644 --- a/tests/Unit/Renderer/RendererServiceProviderTest.php +++ b/tests/Unit/Renderer/RendererServiceProviderTest.php @@ -7,7 +7,7 @@ use Engelsystem\Renderer\HtmlEngine; use Engelsystem\Renderer\Renderer; use Engelsystem\Renderer\RendererServiceProvider; use Engelsystem\Test\Unit\ServiceProviderTest; -use PHPUnit_Framework_MockObject_MockObject; +use PHPUnit\Framework\MockObject\MockObject; class RendererServiceProviderTest extends ServiceProviderTest { @@ -18,10 +18,10 @@ class RendererServiceProviderTest extends ServiceProviderTest */ public function testRegister() { - /** @var PHPUnit_Framework_MockObject_MockObject|Renderer $renderer */ + /** @var Renderer|MockObject $renderer */ $renderer = $this->getMockBuilder(Renderer::class) ->getMock(); - /** @var PHPUnit_Framework_MockObject_MockObject|HtmlEngine $htmlEngine */ + /** @var HtmlEngine|MockObject $htmlEngine */ $htmlEngine = $this->getMockBuilder(HtmlEngine::class) ->getMock(); @@ -57,12 +57,12 @@ class RendererServiceProviderTest extends ServiceProviderTest */ public function testBoot() { - /** @var PHPUnit_Framework_MockObject_MockObject|Renderer $renderer */ + /** @var Renderer|MockObject $renderer */ $renderer = $this->getMockBuilder(Renderer::class) ->getMock(); - /** @var PHPUnit_Framework_MockObject_MockObject|EngineInterface $engine1 */ + /** @var EngineInterface|MockObject $engine1 */ $engine1 = $this->getMockForAbstractClass(EngineInterface::class); - /** @var PHPUnit_Framework_MockObject_MockObject|EngineInterface $engine2 */ + /** @var EngineInterface|MockObject $engine2 */ $engine2 = $this->getMockForAbstractClass(EngineInterface::class); $app = $this->getApp(['get', 'tagged']); diff --git a/tests/Unit/Renderer/RendererTest.php b/tests/Unit/Renderer/RendererTest.php index 969ced7f..9304356a 100644 --- a/tests/Unit/Renderer/RendererTest.php +++ b/tests/Unit/Renderer/RendererTest.php @@ -4,8 +4,8 @@ namespace Engelsystem\Test\Unit\Renderer; use Engelsystem\Renderer\EngineInterface; use Engelsystem\Renderer\Renderer; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; -use PHPUnit_Framework_MockObject_MockObject as MockObject; use Psr\Log\LoggerInterface; class RendererTest extends TestCase @@ -14,7 +14,7 @@ class RendererTest extends TestCase { $renderer = new Renderer(); - /** @var MockObject|EngineInterface $nullRenderer */ + /** @var EngineInterface|MockObject $nullRenderer */ $nullRenderer = $this->getMockForAbstractClass(EngineInterface::class); $nullRenderer->expects($this->atLeastOnce()) @@ -22,7 +22,7 @@ class RendererTest extends TestCase ->willReturn(false); $renderer->addRenderer($nullRenderer); - /** @var MockObject|EngineInterface $mockRenderer */ + /** @var EngineInterface|MockObject $mockRenderer */ $mockRenderer = $this->getMockForAbstractClass(EngineInterface::class); $mockRenderer->expects($this->atLeastOnce()) @@ -45,7 +45,7 @@ class RendererTest extends TestCase { $renderer = new Renderer(); - /** @var MockObject|LoggerInterface $loggerMock */ + /** @var LoggerInterface|MockObject $loggerMock */ $loggerMock = $this->getMockForAbstractClass(LoggerInterface::class); $loggerMock ->expects($this->once()) diff --git a/tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php b/tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php index ef7dba7a..eb78e1ab 100644 --- a/tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php +++ b/tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php @@ -2,6 +2,7 @@ namespace Engelsystem\Test\Unit\Renderer\Twig\Extensions; +use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Twig_Function as TwigFunction; @@ -9,6 +10,8 @@ use Twig_Node as TwigNode; abstract class ExtensionTest extends TestCase { + use ArraySubsetAsserts; + /** * Assert that a twig filter was registered * |