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

Commit eab0553

Browse files
michalbundyramichalbundyra
committed
Merge branch 'qa/205' into develop
Forward port #205
2 parents 7211aa4 + d45e6f2 commit eab0553

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+72
-72
lines changed

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"zendframework/zend-stdlib": "^2.7 || ^3.0"
2424
},
2525
"require-dev": {
26-
"phpunit/phpunit": "^5.7.15 || ^6.0.8",
26+
"phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.18",
2727
"zendframework/zend-authentication": "^2.5",
2828
"zendframework/zend-cache": "^2.6.1",
2929
"zendframework/zend-coding-standard": "~1.0.0",

‎test/Helper/AbstractHtmlElementTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class AbstractHtmlElementTest extends TestCase
2828
/**
2929
* {@inheritDoc}
3030
*/
31-
public function setUp()
31+
protected function setUp()
3232
{
3333
$this->helper = $this->getMockForAbstractClass(AbstractHtmlElement::class);
3434

‎test/Helper/AbstractTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class AbstractTest extends TestCase
2424
*/
2525
protected $helper;
2626

27-
public function setUp()
27+
protected function setUp()
2828
{
2929
$this->helper = new ConcreteHelper();
3030
}

‎test/Helper/CycleTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class CycleTest extends TestCase
3131
*
3232
* @return void
3333
*/
34-
public function setUp()
34+
protected function setUp()
3535
{
3636
$this->helper = new Helper\Cycle();
3737
}
@@ -42,7 +42,7 @@ public function setUp()
4242
*
4343
* @return void
4444
*/
45-
public function tearDown()
45+
protected function tearDown()
4646
{
4747
unset($this->helper);
4848
}

‎test/Helper/DeclareVarsTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
class DeclareVarsTest extends TestCase
2121
{
22-
public function setUp()
22+
protected function setUp()
2323
{
2424
$view = new View();
2525
$base = str_replace('/', DIRECTORY_SEPARATOR, '/../_templates');
@@ -28,7 +28,7 @@ public function setUp()
2828
$this->view = $view;
2929
}
3030

31-
public function tearDown()
31+
protected function tearDown()
3232
{
3333
unset($this->view);
3434
}

‎test/Helper/DoctypeTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class DoctypeTest extends TestCase
3636
*
3737
* @return void
3838
*/
39-
public function setUp()
39+
protected function setUp()
4040
{
4141
Helper\Doctype::unsetDoctypeRegistry();
4242
$this->helper = new Helper\Doctype();
@@ -48,7 +48,7 @@ public function setUp()
4848
*
4949
* @return void
5050
*/
51-
public function tearDown()
51+
protected function tearDown()
5252
{
5353
unset($this->helper);
5454
}

‎test/Helper/EscapeCssTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class EscapeCssTest extends TestCase
2828
'eucjp-win', 'macroman'
2929
];
3030

31-
public function setUp()
31+
protected function setUp()
3232
{
3333
$this->helper = new EscapeHelper;
3434
}

‎test/Helper/EscapeHtmlAttrTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class EscapeHtmlAttrTest extends TestCase
2828
'eucjp-win', 'macroman'
2929
];
3030

31-
public function setUp()
31+
protected function setUp()
3232
{
3333
$this->helper = new EscapeHelper;
3434
}

‎test/Helper/EscapeHtmlTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class EscapeHtmlTest extends TestCase
2828
'eucjp-win', 'macroman'
2929
];
3030

31-
public function setUp()
31+
protected function setUp()
3232
{
3333
$this->helper = new EscapeHelper;
3434
}

‎test/Helper/EscapeJsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class EscapeJsTest extends TestCase
2828
'eucjp-win', 'macroman'
2929
];
3030

31-
public function setUp()
31+
protected function setUp()
3232
{
3333
$this->helper = new EscapeHelper;
3434
}

‎test/Helper/EscapeUrlTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class EscapeUrlTest extends TestCase
2828
'eucjp-win', 'macroman'
2929
];
3030

31-
public function setUp()
31+
protected function setUp()
3232
{
3333
$this->helper = new EscapeHelper;
3434
}

‎test/Helper/FlashMessengerTest.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929
class FlashMessengerTest extends TestCase
3030
{
31-
public function setUp()
31+
protected function setUp()
3232
{
3333
$this->mvcPluginClass = class_exists(V2PluginFlashMessenger::class)
3434
? V2PluginFlashMessenger::class
@@ -442,7 +442,7 @@ public function testCanSetAutoEscape()
442442
}
443443

444444
/**
445-
* @covers Zend\View\Helper\FlashMessenger::render
445+
* @covers \Zend\View\Helper\FlashMessenger::render
446446
*/
447447
public function testMessageIsEscapedByDefault()
448448
{
@@ -456,7 +456,7 @@ public function testMessageIsEscapedByDefault()
456456
}
457457

458458
/**
459-
* @covers Zend\View\Helper\FlashMessenger::render
459+
* @covers \Zend\View\Helper\FlashMessenger::render
460460
*/
461461
public function testMessageIsNotEscapedWhenAutoEscapeIsFalse()
462462
{
@@ -471,7 +471,7 @@ public function testMessageIsNotEscapedWhenAutoEscapeIsFalse()
471471
}
472472

473473
/**
474-
* @covers Zend\View\Helper\FlashMessenger::render
474+
* @covers \Zend\View\Helper\FlashMessenger::render
475475
*/
476476
public function testCanSetAutoEscapeOnRender()
477477
{
@@ -485,7 +485,7 @@ public function testCanSetAutoEscapeOnRender()
485485
}
486486

487487
/**
488-
* @covers Zend\View\Helper\FlashMessenger::render
488+
* @covers \Zend\View\Helper\FlashMessenger::render
489489
*/
490490
public function testRenderUsesCurrentAutoEscapeByDefault()
491491
{
@@ -509,7 +509,7 @@ public function testRenderUsesCurrentAutoEscapeByDefault()
509509
}
510510

511511
/**
512-
* @covers Zend\View\Helper\FlashMessenger::renderCurrent
512+
* @covers \Zend\View\Helper\FlashMessenger::renderCurrent
513513
*/
514514
public function testCurrentMessageIsEscapedByDefault()
515515
{
@@ -521,7 +521,7 @@ public function testCurrentMessageIsEscapedByDefault()
521521
}
522522

523523
/**
524-
* @covers Zend\View\Helper\FlashMessenger::renderCurrent
524+
* @covers \Zend\View\Helper\FlashMessenger::renderCurrent
525525
*/
526526
public function testCurrentMessageIsNotEscapedWhenAutoEscapeIsFalse()
527527
{
@@ -534,7 +534,7 @@ public function testCurrentMessageIsNotEscapedWhenAutoEscapeIsFalse()
534534
}
535535

536536
/**
537-
* @covers Zend\View\Helper\FlashMessenger::renderCurrent
537+
* @covers \Zend\View\Helper\FlashMessenger::renderCurrent
538538
*/
539539
public function testCanSetAutoEscapeOnRenderCurrent()
540540
{
@@ -546,7 +546,7 @@ public function testCanSetAutoEscapeOnRenderCurrent()
546546
}
547547

548548
/**
549-
* @covers Zend\View\Helper\FlashMessenger::renderCurrent
549+
* @covers \Zend\View\Helper\FlashMessenger::renderCurrent
550550
*/
551551
public function testRenderCurrentUsesCurrentAutoEscapeByDefault()
552552
{

‎test/Helper/HeadLinkTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class HeadLinkTest extends TestCase
4444
*
4545
* @return void
4646
*/
47-
public function setUp()
47+
protected function setUp()
4848
{
4949
Helper\Doctype::unsetDoctypeRegistry();
5050
$this->basePath = __DIR__ . '/_files/modules';
@@ -60,7 +60,7 @@ public function setUp()
6060
*
6161
* @return void
6262
*/
63-
public function tearDown()
63+
protected function tearDown()
6464
{
6565
unset($this->helper);
6666
}

‎test/Helper/HeadMetaTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class HeadMetaTest extends TestCase
4444
*
4545
* @return void
4646
*/
47-
public function setUp()
47+
protected function setUp()
4848
{
4949
$this->error = false;
5050
Helper\Doctype::unsetDoctypeRegistry();
@@ -62,7 +62,7 @@ public function setUp()
6262
*
6363
* @return void
6464
*/
65-
public function tearDown()
65+
protected function tearDown()
6666
{
6767
unset($this->helper);
6868
}

‎test/Helper/HeadScriptTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class HeadScriptTest extends TestCase
4343
*
4444
* @return void
4545
*/
46-
public function setUp()
46+
protected function setUp()
4747
{
4848
$this->basePath = __DIR__ . '/_files/modules';
4949
$this->helper = new Helper\HeadScript();
@@ -56,7 +56,7 @@ public function setUp()
5656
*
5757
* @return void
5858
*/
59-
public function tearDown()
59+
protected function tearDown()
6060
{
6161
unset($this->helper);
6262
}

‎test/Helper/HeadStyleTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class HeadStyleTest extends TestCase
3737
*
3838
* @return void
3939
*/
40-
public function setUp()
40+
protected function setUp()
4141
{
4242
$this->basePath = __DIR__ . '/_files/modules';
4343
$this->helper = new Helper\HeadStyle();
@@ -49,7 +49,7 @@ public function setUp()
4949
*
5050
* @return void
5151
*/
52-
public function tearDown()
52+
protected function tearDown()
5353
{
5454
unset($this->helper);
5555
}

‎test/Helper/HeadTitleTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class HeadTitleTest extends TestCase
3737
*
3838
* @return void
3939
*/
40-
public function setUp()
40+
protected function setUp()
4141
{
4242
$this->basePath = __DIR__ . '/_files/modules';
4343
$this->helper = new Helper\HeadTitle();
@@ -49,7 +49,7 @@ public function setUp()
4949
*
5050
* @return void
5151
*/
52-
public function tearDown()
52+
protected function tearDown()
5353
{
5454
unset($this->helper);
5555
}

‎test/Helper/HtmlFlashTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected function setUp()
3737
$this->helper->setView($this->view);
3838
}
3939

40-
public function tearDown()
40+
protected function tearDown()
4141
{
4242
unset($this->helper);
4343
}

‎test/Helper/HtmlListTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected function setUp()
3838
$this->helper->setView($this->view);
3939
}
4040

41-
public function tearDown()
41+
protected function tearDown()
4242
{
4343
unset($this->helper);
4444
}

‎test/Helper/HtmlObjectTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected function setUp()
3939
$this->helper->setView($this->view);
4040
}
4141

42-
public function tearDown()
42+
protected function tearDown()
4343
{
4444
unset($this->helper);
4545
}

‎test/Helper/HtmlPageTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected function setUp()
3737
$this->helper->setView($this->view);
3838
}
3939

40-
public function tearDown()
40+
protected function tearDown()
4141
{
4242
unset($this->helper);
4343
}

‎test/Helper/HtmlQuicktimeTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected function setUp()
3737
$this->helper->setView($this->view);
3838
}
3939

40-
public function tearDown()
40+
protected function tearDown()
4141
{
4242
unset($this->helper);
4343
}

‎test/Helper/HtmlTagTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function setUp()
3131
$this->helper->setView($this->view);
3232
}
3333

34-
public function tearDown()
34+
protected function tearDown()
3535
{
3636
unset($this->helper);
3737
}

‎test/Helper/InlineScriptTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class InlineScriptTest extends TestCase
3636
*
3737
* @return void
3838
*/
39-
public function setUp()
39+
protected function setUp()
4040
{
4141
$this->basePath = __DIR__ . '/_files/modules';
4242
$this->helper = new Helper\InlineScript();
@@ -48,7 +48,7 @@ public function setUp()
4848
*
4949
* @return void
5050
*/
51-
public function tearDown()
51+
protected function tearDown()
5252
{
5353
unset($this->helper);
5454
}

‎test/Helper/JsonTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class JsonTest extends TestCase
2828
*
2929
* @return void
3030
*/
31-
public function setUp()
31+
protected function setUp()
3232
{
3333
$this->response = new Response();
3434
$this->helper = new JsonHelper();

‎test/Helper/LayoutTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class LayoutTest extends TestCase
2929
*
3030
* @return void
3131
*/
32-
public function setUp()
32+
protected function setUp()
3333
{
3434
$this->renderer = $renderer = new PhpRenderer();
3535
$this->viewModelHelper = $renderer->plugin('view_model');

0 commit comments

Comments
 (0)