Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

qa: PHPUnit update - allow v7 #205

Merged
merged 1 commit into from
Dec 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/AbstractHtmlElementTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class AbstractHtmlElementTest extends TestCase
/**
* {@inheritDoc}
*/
public function setUp()
protected function setUp()
{
$this->helper = $this->getMockForAbstractClass(AbstractHtmlElement::class);

Expand Down
2 changes: 1 addition & 1 deletion test/Helper/AbstractTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class AbstractTest extends TestCase
*/
protected $helper;

public function setUp()
protected function setUp()
{
$this->helper = new ConcreteHelper();
}
Expand Down
4 changes: 2 additions & 2 deletions test/Helper/CycleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class CycleTest extends TestCase
*
* @return void
*/
public function setUp()
protected function setUp()
{
$this->helper = new Helper\Cycle();
}
Expand All @@ -42,7 +42,7 @@ public function setUp()
*
* @return void
*/
public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
4 changes: 2 additions & 2 deletions test/Helper/DeclareVarsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
class DeclareVarsTest extends TestCase
{
public function setUp()
protected function setUp()
{
$view = new View();
$base = str_replace('/', DIRECTORY_SEPARATOR, '/../_templates');
Expand All @@ -28,7 +28,7 @@ public function setUp()
$this->view = $view;
}

public function tearDown()
protected function tearDown()
{
unset($this->view);
}
Expand Down
4 changes: 2 additions & 2 deletions test/Helper/DoctypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class DoctypeTest extends TestCase
*
* @return void
*/
public function setUp()
protected function setUp()
{
Helper\Doctype::unsetDoctypeRegistry();
$this->helper = new Helper\Doctype();
Expand All @@ -48,7 +48,7 @@ public function setUp()
*
* @return void
*/
public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/EscapeCssTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class EscapeCssTest extends TestCase
'eucjp-win', 'macroman'
];

public function setUp()
protected function setUp()
{
$this->helper = new EscapeHelper;
}
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/EscapeHtmlAttrTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class EscapeHtmlAttrTest extends TestCase
'eucjp-win', 'macroman'
];

public function setUp()
protected function setUp()
{
$this->helper = new EscapeHelper;
}
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/EscapeHtmlTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class EscapeHtmlTest extends TestCase
'eucjp-win', 'macroman'
];

public function setUp()
protected function setUp()
{
$this->helper = new EscapeHelper;
}
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/EscapeJsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class EscapeJsTest extends TestCase
'eucjp-win', 'macroman'
];

public function setUp()
protected function setUp()
{
$this->helper = new EscapeHelper;
}
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/EscapeUrlTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class EscapeUrlTest extends TestCase
'eucjp-win', 'macroman'
];

public function setUp()
protected function setUp()
{
$this->helper = new EscapeHelper;
}
Expand Down
18 changes: 9 additions & 9 deletions test/Helper/FlashMessengerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*/
class FlashMessengerTest extends TestCase
{
public function setUp()
protected function setUp()
{
$this->mvcPluginClass = class_exists(V2PluginFlashMessenger::class)
? V2PluginFlashMessenger::class
Expand Down Expand Up @@ -442,7 +442,7 @@ public function testCanSetAutoEscape()
}

/**
* @covers Zend\View\Helper\FlashMessenger::render
* @covers \Zend\View\Helper\FlashMessenger::render
*/
public function testMessageIsEscapedByDefault()
{
Expand All @@ -456,7 +456,7 @@ public function testMessageIsEscapedByDefault()
}

/**
* @covers Zend\View\Helper\FlashMessenger::render
* @covers \Zend\View\Helper\FlashMessenger::render
*/
public function testMessageIsNotEscapedWhenAutoEscapeIsFalse()
{
Expand All @@ -471,7 +471,7 @@ public function testMessageIsNotEscapedWhenAutoEscapeIsFalse()
}

/**
* @covers Zend\View\Helper\FlashMessenger::render
* @covers \Zend\View\Helper\FlashMessenger::render
*/
public function testCanSetAutoEscapeOnRender()
{
Expand All @@ -485,7 +485,7 @@ public function testCanSetAutoEscapeOnRender()
}

/**
* @covers Zend\View\Helper\FlashMessenger::render
* @covers \Zend\View\Helper\FlashMessenger::render
*/
public function testRenderUsesCurrentAutoEscapeByDefault()
{
Expand All @@ -509,7 +509,7 @@ public function testRenderUsesCurrentAutoEscapeByDefault()
}

/**
* @covers Zend\View\Helper\FlashMessenger::renderCurrent
* @covers \Zend\View\Helper\FlashMessenger::renderCurrent
*/
public function testCurrentMessageIsEscapedByDefault()
{
Expand All @@ -521,7 +521,7 @@ public function testCurrentMessageIsEscapedByDefault()
}

/**
* @covers Zend\View\Helper\FlashMessenger::renderCurrent
* @covers \Zend\View\Helper\FlashMessenger::renderCurrent
*/
public function testCurrentMessageIsNotEscapedWhenAutoEscapeIsFalse()
{
Expand All @@ -534,7 +534,7 @@ public function testCurrentMessageIsNotEscapedWhenAutoEscapeIsFalse()
}

/**
* @covers Zend\View\Helper\FlashMessenger::renderCurrent
* @covers \Zend\View\Helper\FlashMessenger::renderCurrent
*/
public function testCanSetAutoEscapeOnRenderCurrent()
{
Expand All @@ -546,7 +546,7 @@ public function testCanSetAutoEscapeOnRenderCurrent()
}

/**
* @covers Zend\View\Helper\FlashMessenger::renderCurrent
* @covers \Zend\View\Helper\FlashMessenger::renderCurrent
*/
public function testRenderCurrentUsesCurrentAutoEscapeByDefault()
{
Expand Down
4 changes: 2 additions & 2 deletions test/Helper/HeadLinkTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class HeadLinkTest extends TestCase
*
* @return void
*/
public function setUp()
protected function setUp()
{
Helper\Doctype::unsetDoctypeRegistry();
$this->basePath = __DIR__ . '/_files/modules';
Expand All @@ -60,7 +60,7 @@ public function setUp()
*
* @return void
*/
public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
4 changes: 2 additions & 2 deletions test/Helper/HeadMetaTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class HeadMetaTest extends TestCase
*
* @return void
*/
public function setUp()
protected function setUp()
{
$this->error = false;
Helper\Doctype::unsetDoctypeRegistry();
Expand All @@ -62,7 +62,7 @@ public function setUp()
*
* @return void
*/
public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
4 changes: 2 additions & 2 deletions test/Helper/HeadScriptTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -56,7 +56,7 @@ public function setUp()
*
* @return void
*/
public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
4 changes: 2 additions & 2 deletions test/Helper/HeadStyleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -49,7 +49,7 @@ public function setUp()
*
* @return void
*/
public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
4 changes: 2 additions & 2 deletions test/Helper/HeadTitleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -49,7 +49,7 @@ public function setUp()
*
* @return void
*/
public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/HtmlFlashTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected function setUp()
$this->helper->setView($this->view);
}

public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/HtmlListTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ protected function setUp()
$this->helper->setView($this->view);
}

public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/HtmlObjectTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ protected function setUp()
$this->helper->setView($this->view);
}

public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/HtmlPageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected function setUp()
$this->helper->setView($this->view);
}

public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/HtmlQuicktimeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected function setUp()
$this->helper->setView($this->view);
}

public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/HtmlTagTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ protected function setUp()
$this->helper->setView($this->view);
}

public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
4 changes: 2 additions & 2 deletions test/Helper/InlineScriptTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -48,7 +48,7 @@ public function setUp()
*
* @return void
*/
public function tearDown()
protected function tearDown()
{
unset($this->helper);
}
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/JsonTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class JsonTest extends TestCase
*
* @return void
*/
public function setUp()
protected function setUp()
{
$this->response = new Response();
$this->helper = new JsonHelper();
Expand Down
2 changes: 1 addition & 1 deletion test/Helper/LayoutTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
Loading