PHPUnit 7 and tests update

composer.json

@@ -36,7 +36,7 @@
         "zendframework/zend-validator": "^2.11"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15",
         "psr/http-message": "^1.0",
         "zendframework/zend-coding-standard": "~1.0.0"
     },

test/ArrayInputTest.php

@@ -13,11 +13,11 @@
 use Zend\InputFilter\Exception\InvalidArgumentException;
 
 /**
- * @covers Zend\InputFilter\ArrayInput
+ * @covers \Zend\InputFilter\ArrayInput
  */
 class ArrayInputTest extends InputTest
 {
-    public function setUp()
+    protected function setUp()
     {
         $this->input = new ArrayInput('foo');
     }

test/BaseInputFilterTest.php

@@ -24,7 +24,7 @@
 use Zend\InputFilter\UnfilteredDataInterface;
 
 /**
- * @covers Zend\InputFilter\BaseInputFilter
+ * @covers \Zend\InputFilter\BaseInputFilter
  */
 class BaseInputFilterTest extends TestCase
 {
@@ -33,7 +33,7 @@ class BaseInputFilterTest extends TestCase
      */
     protected $inputFilter;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->inputFilter = new BaseInputFilter();
     }

test/CollectionInputFilterTest.php

@@ -23,7 +23,7 @@
 use Zend\Validator\NotEmpty;
 
 /**
- * @covers Zend\InputFilter\CollectionInputFilter
+ * @covers \Zend\InputFilter\CollectionInputFilter
  */
 class CollectionInputFilterTest extends TestCase
 {
@@ -32,7 +32,7 @@ class CollectionInputFilterTest extends TestCase
      */
     protected $inputFilter;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->inputFilter = new CollectionInputFilter();
     }

test/FactoryTest.php

@@ -30,7 +30,7 @@
 use Zend\Validator;
 
 /**
- * @covers Zend\InputFilter\Factory
+ * @covers \Zend\InputFilter\Factory
  */
 class FactoryTest extends TestCase
 {

test/FileInput/HttpServerFileInputDecoratorTest.php

@@ -21,7 +21,7 @@ class HttpServerFileInputDecoratorTest extends InputTest
     /** @var HttpServerFileInputDecorator */
     protected $input;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->input = new FileInput('foo');
         // Upload validator does not work in CLI test environment, disable

test/FileInput/PsrFileInputDecoratorTest.php

@@ -23,7 +23,7 @@ class PsrFileInputDecoratorTest extends InputTest
     /** @var PsrFileInputDecorator */
     protected $input;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->input = new FileInput('foo');
         // Upload validator does not work in CLI test environment, disable

test/InputFilterAbstractServiceFactoryTest.php

@@ -24,7 +24,7 @@
 use Zend\Validator\ValidatorPluginManager;
 
 /**
- * @covers Zend\InputFilter\InputFilterAbstractServiceFactory
+ * @covers \Zend\InputFilter\InputFilterAbstractServiceFactory
  */
 class InputFilterAbstractServiceFactoryTest extends TestCase
 {
@@ -43,7 +43,7 @@ class InputFilterAbstractServiceFactoryTest extends TestCase
      */
     protected $factory;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->services = new ServiceManager();
         $this->filters  = new InputFilterPluginManager($this->services);

test/InputFilterAwareTraitTest.php

@@ -15,7 +15,7 @@
 
 /**
  * @requires PHP 5.4
- * @covers Zend\InputFilter\InputFilterAwareTrait
+ * @covers \Zend\InputFilter\InputFilterAwareTrait
  */
 class InputFilterAwareTraitTest extends TestCase
 {

test/InputFilterPluginManagerTest.php

@@ -26,7 +26,7 @@
 use Zend\Validator\ValidatorPluginManager;
 
 /**
- * @covers Zend\InputFilter\InputFilterPluginManager
+ * @covers \Zend\InputFilter\InputFilterPluginManager
  */
 class InputFilterPluginManagerTest extends TestCase
 {
@@ -40,7 +40,7 @@ class InputFilterPluginManagerTest extends TestCase
      */
     protected $services;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->services = new ServiceManager();
         $this->manager = new InputFilterPluginManager($this->services);

test/InputFilterTest.php

@@ -17,7 +17,7 @@
 use Zend\InputFilter\InputFilter;
 
 /**
- * @covers Zend\InputFilter\InputFilter
+ * @covers \Zend\InputFilter\InputFilter
  */
 class InputFilterTest extends BaseInputFilterTest
 {
@@ -26,7 +26,7 @@ class InputFilterTest extends BaseInputFilterTest
      */
     protected $inputFilter;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->inputFilter = new InputFilter();
     }

test/InputTest.php

@@ -21,7 +21,7 @@
 use Zend\Validator\ValidatorInterface;
 
 /**
- * @covers Zend\InputFilter\Input
+ * @covers \Zend\InputFilter\Input
  */
 class InputTest extends TestCase
 {
@@ -30,7 +30,7 @@ class InputTest extends TestCase
      */
     protected $input;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->input = new Input('foo');
     }