Merge branch 'qa/205'

Close #205
zendframework · Dec 6, 2019 · 0764ec5 · 0764ec5
2 parents aaadfe1 + d45e6f2
commit 0764ec5
Show file tree

Hide file tree

Showing 49 changed files with 72 additions and 72 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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');