From bee54343201db2782b0188188b1ad00efcb1aecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Bundyra?= Date: Fri, 6 Dec 2019 23:51:47 +0000 Subject: [PATCH] qa: PHPUnit update - allow v7 --- composer.json | 2 +- test/Helper/AbstractHtmlElementTest.php | 2 +- test/Helper/AbstractTest.php | 2 +- test/Helper/CycleTest.php | 4 ++-- test/Helper/DeclareVarsTest.php | 4 ++-- test/Helper/DoctypeTest.php | 4 ++-- test/Helper/EscapeCssTest.php | 2 +- test/Helper/EscapeHtmlAttrTest.php | 2 +- test/Helper/EscapeHtmlTest.php | 2 +- test/Helper/EscapeJsTest.php | 2 +- test/Helper/EscapeUrlTest.php | 2 +- test/Helper/FlashMessengerTest.php | 18 +++++++++--------- test/Helper/HeadLinkTest.php | 4 ++-- test/Helper/HeadMetaTest.php | 4 ++-- test/Helper/HeadScriptTest.php | 4 ++-- test/Helper/HeadStyleTest.php | 4 ++-- test/Helper/HeadTitleTest.php | 4 ++-- test/Helper/HtmlFlashTest.php | 2 +- test/Helper/HtmlListTest.php | 2 +- test/Helper/HtmlObjectTest.php | 2 +- test/Helper/HtmlPageTest.php | 2 +- test/Helper/HtmlQuicktimeTest.php | 2 +- test/Helper/HtmlTagTest.php | 2 +- test/Helper/InlineScriptTest.php | 4 ++-- test/Helper/JsonTest.php | 2 +- test/Helper/LayoutTest.php | 2 +- test/Helper/Navigation/LinksTest.php | 4 ++-- test/Helper/PaginationControlTest.php | 2 +- test/Helper/PartialLoopTest.php | 4 ++-- test/Helper/PartialTest.php | 4 ++-- test/Helper/Placeholder/ContainerTest.php | 4 ++-- test/Helper/Placeholder/RegistryTest.php | 4 ++-- .../Placeholder/StandaloneContainerTest.php | 2 +- test/Helper/PlaceholderTest.php | 4 ++-- test/Helper/RenderChildModelTest.php | 2 +- test/Helper/RenderToPlaceholderTest.php | 2 +- test/Helper/ServerUrlTest.php | 2 +- test/Helper/Service/IdentityFactoryTest.php | 2 +- test/HelperPluginManagerTest.php | 2 +- test/PhpRendererTest.php | 2 +- test/Renderer/FeedRendererTest.php | 2 +- test/Renderer/JsonRendererTest.php | 2 +- test/Resolver/TemplatePathStackTest.php | 2 +- test/Strategy/FeedStrategyTest.php | 2 +- test/Strategy/JsonStrategyTest.php | 2 +- test/Strategy/PhpRendererStrategyTest.php | 2 +- test/VariablesTest.php | 2 +- test/ViewEventTest.php | 2 +- test/ViewTest.php | 2 +- 49 files changed, 72 insertions(+), 72 deletions(-) diff --git a/composer.json b/composer.json index 58091f1af..ffd642af2 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "phpunit/phpunit": "^5.7.15 || ^6.0.8", + "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.18", "zendframework/zend-authentication": "^2.5", "zendframework/zend-cache": "^2.6.1", "zendframework/zend-coding-standard": "~1.0.0", diff --git a/test/Helper/AbstractHtmlElementTest.php b/test/Helper/AbstractHtmlElementTest.php index f4984e35b..e9b317c5d 100644 --- a/test/Helper/AbstractHtmlElementTest.php +++ b/test/Helper/AbstractHtmlElementTest.php @@ -28,7 +28,7 @@ class AbstractHtmlElementTest extends TestCase /** * {@inheritDoc} */ - public function setUp() + protected function setUp() { $this->helper = $this->getMockForAbstractClass(AbstractHtmlElement::class); diff --git a/test/Helper/AbstractTest.php b/test/Helper/AbstractTest.php index aa0dca0e9..265ba4a6e 100644 --- a/test/Helper/AbstractTest.php +++ b/test/Helper/AbstractTest.php @@ -24,7 +24,7 @@ class AbstractTest extends TestCase */ protected $helper; - public function setUp() + protected function setUp() { $this->helper = new ConcreteHelper(); } diff --git a/test/Helper/CycleTest.php b/test/Helper/CycleTest.php index 1661d9f0e..317931537 100644 --- a/test/Helper/CycleTest.php +++ b/test/Helper/CycleTest.php @@ -31,7 +31,7 @@ class CycleTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->helper = new Helper\Cycle(); } @@ -42,7 +42,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/DeclareVarsTest.php b/test/Helper/DeclareVarsTest.php index b34dbb9ae..9916ac7e7 100644 --- a/test/Helper/DeclareVarsTest.php +++ b/test/Helper/DeclareVarsTest.php @@ -19,7 +19,7 @@ */ class DeclareVarsTest extends TestCase { - public function setUp() + protected function setUp() { $view = new View(); $base = str_replace('/', DIRECTORY_SEPARATOR, '/../_templates'); @@ -28,7 +28,7 @@ public function setUp() $this->view = $view; } - public function tearDown() + protected function tearDown() { unset($this->view); } diff --git a/test/Helper/DoctypeTest.php b/test/Helper/DoctypeTest.php index 200da32d1..c220fa107 100644 --- a/test/Helper/DoctypeTest.php +++ b/test/Helper/DoctypeTest.php @@ -36,7 +36,7 @@ class DoctypeTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { Helper\Doctype::unsetDoctypeRegistry(); $this->helper = new Helper\Doctype(); @@ -48,7 +48,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/EscapeCssTest.php b/test/Helper/EscapeCssTest.php index 5c4e3a51a..692072232 100644 --- a/test/Helper/EscapeCssTest.php +++ b/test/Helper/EscapeCssTest.php @@ -28,7 +28,7 @@ class EscapeCssTest extends TestCase 'eucjp-win', 'macroman' ]; - public function setUp() + protected function setUp() { $this->helper = new EscapeHelper; } diff --git a/test/Helper/EscapeHtmlAttrTest.php b/test/Helper/EscapeHtmlAttrTest.php index 339719de3..c93268b7f 100644 --- a/test/Helper/EscapeHtmlAttrTest.php +++ b/test/Helper/EscapeHtmlAttrTest.php @@ -28,7 +28,7 @@ class EscapeHtmlAttrTest extends TestCase 'eucjp-win', 'macroman' ]; - public function setUp() + protected function setUp() { $this->helper = new EscapeHelper; } diff --git a/test/Helper/EscapeHtmlTest.php b/test/Helper/EscapeHtmlTest.php index 07cfa41b8..f97bffe22 100644 --- a/test/Helper/EscapeHtmlTest.php +++ b/test/Helper/EscapeHtmlTest.php @@ -28,7 +28,7 @@ class EscapeHtmlTest extends TestCase 'eucjp-win', 'macroman' ]; - public function setUp() + protected function setUp() { $this->helper = new EscapeHelper; } diff --git a/test/Helper/EscapeJsTest.php b/test/Helper/EscapeJsTest.php index cba739486..53380afb1 100644 --- a/test/Helper/EscapeJsTest.php +++ b/test/Helper/EscapeJsTest.php @@ -28,7 +28,7 @@ class EscapeJsTest extends TestCase 'eucjp-win', 'macroman' ]; - public function setUp() + protected function setUp() { $this->helper = new EscapeHelper; } diff --git a/test/Helper/EscapeUrlTest.php b/test/Helper/EscapeUrlTest.php index fe38e2696..417099de9 100644 --- a/test/Helper/EscapeUrlTest.php +++ b/test/Helper/EscapeUrlTest.php @@ -28,7 +28,7 @@ class EscapeUrlTest extends TestCase 'eucjp-win', 'macroman' ]; - public function setUp() + protected function setUp() { $this->helper = new EscapeHelper; } diff --git a/test/Helper/FlashMessengerTest.php b/test/Helper/FlashMessengerTest.php index 57a733bfb..50806b417 100644 --- a/test/Helper/FlashMessengerTest.php +++ b/test/Helper/FlashMessengerTest.php @@ -28,7 +28,7 @@ */ class FlashMessengerTest extends TestCase { - public function setUp() + protected function setUp() { $this->mvcPluginClass = class_exists(V2PluginFlashMessenger::class) ? V2PluginFlashMessenger::class @@ -442,7 +442,7 @@ public function testCanSetAutoEscape() } /** - * @covers Zend\View\Helper\FlashMessenger::render + * @covers \Zend\View\Helper\FlashMessenger::render */ public function testMessageIsEscapedByDefault() { @@ -456,7 +456,7 @@ public function testMessageIsEscapedByDefault() } /** - * @covers Zend\View\Helper\FlashMessenger::render + * @covers \Zend\View\Helper\FlashMessenger::render */ public function testMessageIsNotEscapedWhenAutoEscapeIsFalse() { @@ -471,7 +471,7 @@ public function testMessageIsNotEscapedWhenAutoEscapeIsFalse() } /** - * @covers Zend\View\Helper\FlashMessenger::render + * @covers \Zend\View\Helper\FlashMessenger::render */ public function testCanSetAutoEscapeOnRender() { @@ -485,7 +485,7 @@ public function testCanSetAutoEscapeOnRender() } /** - * @covers Zend\View\Helper\FlashMessenger::render + * @covers \Zend\View\Helper\FlashMessenger::render */ public function testRenderUsesCurrentAutoEscapeByDefault() { @@ -509,7 +509,7 @@ public function testRenderUsesCurrentAutoEscapeByDefault() } /** - * @covers Zend\View\Helper\FlashMessenger::renderCurrent + * @covers \Zend\View\Helper\FlashMessenger::renderCurrent */ public function testCurrentMessageIsEscapedByDefault() { @@ -521,7 +521,7 @@ public function testCurrentMessageIsEscapedByDefault() } /** - * @covers Zend\View\Helper\FlashMessenger::renderCurrent + * @covers \Zend\View\Helper\FlashMessenger::renderCurrent */ public function testCurrentMessageIsNotEscapedWhenAutoEscapeIsFalse() { @@ -534,7 +534,7 @@ public function testCurrentMessageIsNotEscapedWhenAutoEscapeIsFalse() } /** - * @covers Zend\View\Helper\FlashMessenger::renderCurrent + * @covers \Zend\View\Helper\FlashMessenger::renderCurrent */ public function testCanSetAutoEscapeOnRenderCurrent() { @@ -546,7 +546,7 @@ public function testCanSetAutoEscapeOnRenderCurrent() } /** - * @covers Zend\View\Helper\FlashMessenger::renderCurrent + * @covers \Zend\View\Helper\FlashMessenger::renderCurrent */ public function testRenderCurrentUsesCurrentAutoEscapeByDefault() { diff --git a/test/Helper/HeadLinkTest.php b/test/Helper/HeadLinkTest.php index 6c990ab78..9c28c86ab 100644 --- a/test/Helper/HeadLinkTest.php +++ b/test/Helper/HeadLinkTest.php @@ -44,7 +44,7 @@ class HeadLinkTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { Helper\Doctype::unsetDoctypeRegistry(); $this->basePath = __DIR__ . '/_files/modules'; @@ -60,7 +60,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/HeadMetaTest.php b/test/Helper/HeadMetaTest.php index 6693ff7ba..3ed73a049 100644 --- a/test/Helper/HeadMetaTest.php +++ b/test/Helper/HeadMetaTest.php @@ -44,7 +44,7 @@ class HeadMetaTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->error = false; Helper\Doctype::unsetDoctypeRegistry(); @@ -62,7 +62,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/HeadScriptTest.php b/test/Helper/HeadScriptTest.php index 24c8d67f2..6e68727c7 100644 --- a/test/Helper/HeadScriptTest.php +++ b/test/Helper/HeadScriptTest.php @@ -43,7 +43,7 @@ class HeadScriptTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->basePath = __DIR__ . '/_files/modules'; $this->helper = new Helper\HeadScript(); @@ -56,7 +56,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/HeadStyleTest.php b/test/Helper/HeadStyleTest.php index 590f403ca..d868bb347 100644 --- a/test/Helper/HeadStyleTest.php +++ b/test/Helper/HeadStyleTest.php @@ -37,7 +37,7 @@ class HeadStyleTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->basePath = __DIR__ . '/_files/modules'; $this->helper = new Helper\HeadStyle(); @@ -49,7 +49,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/HeadTitleTest.php b/test/Helper/HeadTitleTest.php index b95c38202..fbc137a65 100644 --- a/test/Helper/HeadTitleTest.php +++ b/test/Helper/HeadTitleTest.php @@ -37,7 +37,7 @@ class HeadTitleTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->basePath = __DIR__ . '/_files/modules'; $this->helper = new Helper\HeadTitle(); @@ -49,7 +49,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/HtmlFlashTest.php b/test/Helper/HtmlFlashTest.php index 548a81f0e..2fade88af 100644 --- a/test/Helper/HtmlFlashTest.php +++ b/test/Helper/HtmlFlashTest.php @@ -37,7 +37,7 @@ protected function setUp() $this->helper->setView($this->view); } - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/HtmlListTest.php b/test/Helper/HtmlListTest.php index 11525d642..a2b364a30 100644 --- a/test/Helper/HtmlListTest.php +++ b/test/Helper/HtmlListTest.php @@ -38,7 +38,7 @@ protected function setUp() $this->helper->setView($this->view); } - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/HtmlObjectTest.php b/test/Helper/HtmlObjectTest.php index 5d6bb1993..1ca03ef63 100644 --- a/test/Helper/HtmlObjectTest.php +++ b/test/Helper/HtmlObjectTest.php @@ -39,7 +39,7 @@ protected function setUp() $this->helper->setView($this->view); } - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/HtmlPageTest.php b/test/Helper/HtmlPageTest.php index 23b01615a..3fb9ef029 100644 --- a/test/Helper/HtmlPageTest.php +++ b/test/Helper/HtmlPageTest.php @@ -37,7 +37,7 @@ protected function setUp() $this->helper->setView($this->view); } - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/HtmlQuicktimeTest.php b/test/Helper/HtmlQuicktimeTest.php index c0d9e75cc..19be4adc8 100644 --- a/test/Helper/HtmlQuicktimeTest.php +++ b/test/Helper/HtmlQuicktimeTest.php @@ -37,7 +37,7 @@ protected function setUp() $this->helper->setView($this->view); } - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/HtmlTagTest.php b/test/Helper/HtmlTagTest.php index 2b4271181..0c09d44d0 100644 --- a/test/Helper/HtmlTagTest.php +++ b/test/Helper/HtmlTagTest.php @@ -31,7 +31,7 @@ protected function setUp() $this->helper->setView($this->view); } - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/InlineScriptTest.php b/test/Helper/InlineScriptTest.php index 5f10aaa30..4c0c6ed86 100644 --- a/test/Helper/InlineScriptTest.php +++ b/test/Helper/InlineScriptTest.php @@ -36,7 +36,7 @@ class InlineScriptTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->basePath = __DIR__ . '/_files/modules'; $this->helper = new Helper\InlineScript(); @@ -48,7 +48,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/JsonTest.php b/test/Helper/JsonTest.php index 2f2d8a8f2..7d0bd5ffc 100644 --- a/test/Helper/JsonTest.php +++ b/test/Helper/JsonTest.php @@ -28,7 +28,7 @@ class JsonTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->response = new Response(); $this->helper = new JsonHelper(); diff --git a/test/Helper/LayoutTest.php b/test/Helper/LayoutTest.php index 55bfa0f04..caf10505e 100644 --- a/test/Helper/LayoutTest.php +++ b/test/Helper/LayoutTest.php @@ -29,7 +29,7 @@ class LayoutTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->renderer = $renderer = new PhpRenderer(); $this->viewModelHelper = $renderer->plugin('view_model'); diff --git a/test/Helper/Navigation/LinksTest.php b/test/Helper/Navigation/LinksTest.php index e6b68b81a..8423f74e0 100644 --- a/test/Helper/Navigation/LinksTest.php +++ b/test/Helper/Navigation/LinksTest.php @@ -45,7 +45,7 @@ class LinksTest extends AbstractTest private $_oldDoctype; // @codingStandardsIgnoreEnd - public function setUp() + protected function setUp() { parent::setUp(); @@ -62,7 +62,7 @@ public function setUp() } } - public function tearDown() + protected function tearDown() { return; $this->_doctypeHelper->setDoctype($this->_oldDoctype); diff --git a/test/Helper/PaginationControlTest.php b/test/Helper/PaginationControlTest.php index 4edb7b0f3..532d0b917 100644 --- a/test/Helper/PaginationControlTest.php +++ b/test/Helper/PaginationControlTest.php @@ -55,7 +55,7 @@ protected function setUp() $this->_paginator = new Paginator\Paginator($adapter); } - public function tearDown() + protected function tearDown() { unset($this->_viewHelper); unset($this->_paginator); diff --git a/test/Helper/PartialLoopTest.php b/test/Helper/PartialLoopTest.php index 1c6bc1459..4966cba65 100644 --- a/test/Helper/PartialLoopTest.php +++ b/test/Helper/PartialLoopTest.php @@ -40,7 +40,7 @@ class PartialLoopTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->basePath = __DIR__ . '/_files/modules'; $this->helper = new PartialLoop(); @@ -52,7 +52,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/PartialTest.php b/test/Helper/PartialTest.php index f1ea037c1..d5ac24b30 100644 --- a/test/Helper/PartialTest.php +++ b/test/Helper/PartialTest.php @@ -40,7 +40,7 @@ class PartialTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->basePath = __DIR__ . '/_files/modules'; $this->helper = new Partial(); @@ -52,7 +52,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { unset($this->helper); } diff --git a/test/Helper/Placeholder/ContainerTest.php b/test/Helper/Placeholder/ContainerTest.php index 495a21594..f2e5f6d68 100644 --- a/test/Helper/Placeholder/ContainerTest.php +++ b/test/Helper/Placeholder/ContainerTest.php @@ -30,7 +30,7 @@ class ContainerTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->container = new \Zend\View\Helper\Placeholder\Container([]); } @@ -41,7 +41,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { unset($this->container); } diff --git a/test/Helper/Placeholder/RegistryTest.php b/test/Helper/Placeholder/RegistryTest.php index 8c6f20fc4..473d8455f 100644 --- a/test/Helper/Placeholder/RegistryTest.php +++ b/test/Helper/Placeholder/RegistryTest.php @@ -34,7 +34,7 @@ class RegistryTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->registry = new Registry(); } @@ -45,7 +45,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { unset($this->registry); } diff --git a/test/Helper/Placeholder/StandaloneContainerTest.php b/test/Helper/Placeholder/StandaloneContainerTest.php index 05d843813..acf0b7636 100644 --- a/test/Helper/Placeholder/StandaloneContainerTest.php +++ b/test/Helper/Placeholder/StandaloneContainerTest.php @@ -33,7 +33,7 @@ class StandaloneContainerTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->helper = new Foo(); } diff --git a/test/Helper/PlaceholderTest.php b/test/Helper/PlaceholderTest.php index 2064c373f..8e56ffafc 100644 --- a/test/Helper/PlaceholderTest.php +++ b/test/Helper/PlaceholderTest.php @@ -33,7 +33,7 @@ class PlaceholderTest extends TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->placeholder = new Helper\Placeholder(); } @@ -44,7 +44,7 @@ public function setUp() * * @return void */ - public function tearDown() + protected function tearDown() { unset($this->placeholder); } diff --git a/test/Helper/RenderChildModelTest.php b/test/Helper/RenderChildModelTest.php index f0a80c7f4..dd7ec7ba2 100644 --- a/test/Helper/RenderChildModelTest.php +++ b/test/Helper/RenderChildModelTest.php @@ -21,7 +21,7 @@ */ class RenderChildModelTest extends TestCase { - public function setUp() + protected function setUp() { $this->resolver = new TemplateMapResolver([ 'layout' => __DIR__ . '/../_templates/nested-view-model-layout.phtml', diff --git a/test/Helper/RenderToPlaceholderTest.php b/test/Helper/RenderToPlaceholderTest.php index 1807716f4..9267377f6 100644 --- a/test/Helper/RenderToPlaceholderTest.php +++ b/test/Helper/RenderToPlaceholderTest.php @@ -22,7 +22,7 @@ class RenderToPlaceholderTest extends TestCase protected $_view = null; // @codingStandardsIgnoreEnd - public function setUp() + protected function setUp() { $this->_view = new View(); $this->_view->resolver()->addPath(__DIR__.'/_files/scripts/'); diff --git a/test/Helper/ServerUrlTest.php b/test/Helper/ServerUrlTest.php index f59088efa..bde6dd51f 100644 --- a/test/Helper/ServerUrlTest.php +++ b/test/Helper/ServerUrlTest.php @@ -30,7 +30,7 @@ class ServerUrlTest extends TestCase /** * Prepares the environment before running a test. */ - public function setUp() + protected function setUp() { $this->serverBackup = $_SERVER; unset($_SERVER['HTTPS']); diff --git a/test/Helper/Service/IdentityFactoryTest.php b/test/Helper/Service/IdentityFactoryTest.php index 5e4a3362b..151318ae8 100644 --- a/test/Helper/Service/IdentityFactoryTest.php +++ b/test/Helper/Service/IdentityFactoryTest.php @@ -17,7 +17,7 @@ class IdentityFactoryTest extends TestCase { - public function setUp() + protected function setUp() { $this->services = $this->prophesize(ServiceManager::class); $this->helpers = new HelperPluginManager($this->services->reveal()); diff --git a/test/HelperPluginManagerTest.php b/test/HelperPluginManagerTest.php index 70276b3eb..94d9f275f 100644 --- a/test/HelperPluginManagerTest.php +++ b/test/HelperPluginManagerTest.php @@ -29,7 +29,7 @@ */ class HelperPluginManagerTest extends TestCase { - public function setUp() + protected function setUp() { $this->helpers = new HelperPluginManager(new ServiceManager()); } diff --git a/test/PhpRendererTest.php b/test/PhpRendererTest.php index 0638b90b7..7e3ddc637 100644 --- a/test/PhpRendererTest.php +++ b/test/PhpRendererTest.php @@ -27,7 +27,7 @@ */ class PhpRendererTest extends TestCase { - public function setUp() + protected function setUp() { $this->renderer = new PhpRenderer(); } diff --git a/test/Renderer/FeedRendererTest.php b/test/Renderer/FeedRendererTest.php index c6c358038..fc52df0dc 100644 --- a/test/Renderer/FeedRendererTest.php +++ b/test/Renderer/FeedRendererTest.php @@ -18,7 +18,7 @@ class FeedRendererTest extends TestCase { - public function setUp() + protected function setUp() { $this->renderer = new FeedRenderer(); } diff --git a/test/Renderer/JsonRendererTest.php b/test/Renderer/JsonRendererTest.php index 74abf4e8e..e8e5ec585 100644 --- a/test/Renderer/JsonRendererTest.php +++ b/test/Renderer/JsonRendererTest.php @@ -27,7 +27,7 @@ class JsonRendererTest extends TestCase */ protected $renderer; - public function setUp() + protected function setUp() { $this->renderer = new JsonRenderer(); } diff --git a/test/Resolver/TemplatePathStackTest.php b/test/Resolver/TemplatePathStackTest.php index 6df1912dd..ed7d98def 100644 --- a/test/Resolver/TemplatePathStackTest.php +++ b/test/Resolver/TemplatePathStackTest.php @@ -33,7 +33,7 @@ class TemplatePathStackTest extends TestCase */ private $baseDir; - public function setUp() + protected function setUp() { $this->baseDir = realpath(__DIR__ . '/..'); $this->stack = new TemplatePathStack(); diff --git a/test/Strategy/FeedStrategyTest.php b/test/Strategy/FeedStrategyTest.php index 02a93bd4b..f6251f4b2 100644 --- a/test/Strategy/FeedStrategyTest.php +++ b/test/Strategy/FeedStrategyTest.php @@ -25,7 +25,7 @@ class FeedStrategyTest extends TestCase { use EventListenerIntrospectionTrait; - public function setUp() + protected function setUp() { $this->markTestIncomplete('Re-enable tests after zend-feed has been updated to zend-servicemanager v3'); $this->renderer = new FeedRenderer; diff --git a/test/Strategy/JsonStrategyTest.php b/test/Strategy/JsonStrategyTest.php index 44e92d16f..c07d10c36 100644 --- a/test/Strategy/JsonStrategyTest.php +++ b/test/Strategy/JsonStrategyTest.php @@ -25,7 +25,7 @@ class JsonStrategyTest extends TestCase { use EventListenerIntrospectionTrait; - public function setUp() + protected function setUp() { $this->renderer = new JsonRenderer; $this->strategy = new JsonStrategy($this->renderer); diff --git a/test/Strategy/PhpRendererStrategyTest.php b/test/Strategy/PhpRendererStrategyTest.php index 8b1e1941a..981714776 100644 --- a/test/Strategy/PhpRendererStrategyTest.php +++ b/test/Strategy/PhpRendererStrategyTest.php @@ -24,7 +24,7 @@ class PhpRendererStrategyTest extends TestCase /** @var PhpRendererStrategy */ private $strategy; - public function setUp() + protected function setUp() { $this->renderer = new PhpRenderer; $this->strategy = new PhpRendererStrategy($this->renderer); diff --git a/test/VariablesTest.php b/test/VariablesTest.php index adc3596ad..fa6334600 100644 --- a/test/VariablesTest.php +++ b/test/VariablesTest.php @@ -18,7 +18,7 @@ */ class VariablesTest extends TestCase { - public function setup() + protected function setUp() { $this->error = false; $this->vars = new Variables; diff --git a/test/ViewEventTest.php b/test/ViewEventTest.php index a67d57425..8c6c45710 100644 --- a/test/ViewEventTest.php +++ b/test/ViewEventTest.php @@ -20,7 +20,7 @@ class ViewEventTest extends TestCase { protected $event; - public function setUp() + protected function setUp() { $this->event = new ViewEvent; } diff --git a/test/ViewTest.php b/test/ViewTest.php index 897c5c855..33f3668fe 100644 --- a/test/ViewTest.php +++ b/test/ViewTest.php @@ -26,7 +26,7 @@ class ViewTest extends TestCase { - public function setUp() + protected function setUp() { $this->request = new Request; $this->response = new Response;