Updated PHPUnit - allow 5, 6 and 7 series

Author: michalbundyra

composer.json

@@ -13,13 +13,13 @@
         }
     },
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "^5.6 || ^7.0",
         "zendframework/zend-escaper": "^2.5",
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "phpunit/PHPUnit": "~4.0",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "suggest": {
@@ -46,7 +46,6 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
-        "upload-coverage": "coveralls -v"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }

phpunit.xml.dist

@@ -1,34 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="./test/bootstrap.php"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
          colors="true">
     <testsuites>
         <testsuite name="zend-tag Test Suite">
-            <directory>./test/</directory>
+            <directory>./test</directory>
         </testsuite>
     </testsuites>
 
-    <groups>
-        <exclude>
-            <group>disable</group>
-        </exclude>
-    </groups>
-
     <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
+        <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
-
-    <php>
-        <ini name="date.timezone" value="UTC"/>
-
-        <!-- OB_ENABLED should be enabled for some tests to check if all
-             functionality works as expected. Such tests include those for
-             Zend\Soap and Zend\Session, which require that headers not be sent
-             in order to work. -->
-        <env name="TESTS_ZEND_OB_ENABLED" value="false" />
-
-    </php>
 </phpunit>

test/Cloud/CloudTest.php

@@ -10,6 +10,7 @@
 namespace ZendTest\Tag\Cloud;
 
 use ArrayObject;
+use PHPUnit\Framework\TestCase;
 use stdClass;
 use Zend\ServiceManager\ServiceManager;
 use Zend\ServiceManager\Config as SMConfig;
@@ -26,7 +27,7 @@
  * @group      Zend_Tag
  * @group      Zend_Tag_Cloud
  */
-class CloudTest extends \PHPUnit_Framework_TestCase
+class CloudTest extends TestCase
 {
     public function testGetAndSetItemList()
     {

test/Cloud/Decorator/DecoratorPluginManagerCompatibilityTest.php

@@ -8,7 +8,7 @@
  */
 namespace ZendTest\ServiceManager;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Tag\Cloud\DecoratorPluginManager;
 use Zend\Tag\Cloud\Decorator\DecoratorInterface;

test/Cloud/Decorator/HtmlCloudTest.php

@@ -10,13 +10,14 @@
 namespace ZendTest\Tag\Cloud\Decorator;
 
 use ArrayObject;
+use PHPUnit\Framework\TestCase;
 use Zend\Tag\Cloud\Decorator;
 
 /**
  * @group      Zend_Tag
  * @group      Zend_Tag_Cloud
  */
-class HtmlCloudTest extends \PHPUnit_Framework_TestCase
+class HtmlCloudTest extends TestCase
 {
     public function testDefaultOutput()
     {

test/Cloud/Decorator/HtmlTagTest.php

@@ -10,14 +10,15 @@
 namespace ZendTest\Tag\Cloud\Decorator;
 
 use ArrayObject;
+use PHPUnit\Framework\TestCase;
 use Zend\Tag;
 use Zend\Tag\Cloud\Decorator;
 
 /**
  * @group      Zend_Tag
  * @group      Zend_Tag_Cloud
  */
-class HtmlTagTest extends \PHPUnit_Framework_TestCase
+class HtmlTagTest extends TestCase
 {
     public function testDefaultOutput()
     {

test/ItemListTest.php

@@ -9,12 +9,13 @@
 
 namespace ZendTest\Tag;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Tag;
 
 /**
  * @group      Zend_Tag
  */
-class ItemListTest extends \PHPUnit_Framework_TestCase
+class ItemListTest extends TestCase
 {
     public function testArrayAccessAndCount()
     {

test/ItemTest.php

@@ -10,12 +10,13 @@
 namespace ZendTest\Tag;
 
 use ArrayObject;
+use PHPUnit\Framework\TestCase;
 use Zend\Tag;
 
 /**
  * @group      Zend_Tag
  */
-class ItemTest extends \PHPUnit_Framework_TestCase
+class ItemTest extends TestCase
 {
     public function testConstructor()
     {