Updating to use PHPUnit 5.7 and 6.

Author: dcarbone

composer.json

@@ -15,7 +15,7 @@
         "consul-api"
     ],
     "require": {
-        "php": ">=5.6.0",
+        "php": "^5.6 || ^7.0",
         "guzzlehttp/guzzle": "~6",
         "guzzlehttp/psr7": "~1"
     },
@@ -25,7 +25,7 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "5.6.*"
+        "phpunit/phpunit": "^5.7 || ^6.0"
     },
     "autoload-dev": {
         "psr-4": {

phpunit.local.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.6/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
         bootstrap="./vendor/autoload.php"
         colors="true"
         convertErrorsToExceptions="true"

phpunit.xml.dist

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.6/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
         bootstrap="./vendor/autoload.php"
         colors="true"
         convertErrorsToExceptions="true"

src/Values.php

@@ -82,14 +82,15 @@ public function add($key, $value) {
             throw new \InvalidArgumentException(sprintf('$key must be string, saw "%s".', gettype($key)));
         }
 
-        if (!is_string($value)) {
-            throw new \InvalidArgumentException(sprintf('$value must be string, saw "%s".', gettype($value)));
-        }
-
-        if (isset($this->values[$key])) {
-            $this->values[$key][] = $value;
+        if (settype($value, 'string')) {
+            if (isset($this->values[$key])) {
+                $this->values[$key][] = $value;
+            } else {
+                $this->values[$key] = [$value];
+            }
         } else {
-            $this->values[$key] = [$value];
+            throw new \InvalidArgumentException(sprintf('$value must be castable to string, saw "%s".',
+                gettype($value)));
         }
     }
 

tests/Definition/AbstractDefinitionTestCases.php

@@ -24,12 +24,13 @@
 use phpDocumentor\Reflection\Types\Integer;
 use phpDocumentor\Reflection\Types\Object_;
 use phpDocumentor\Reflection\Types\String_;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class AbstractDefinitionTestCases
  * @package DCarbone\PHPConsulAPITests\Definition
  */
-abstract class AbstractDefinitionTestCases extends \PHPUnit_Framework_TestCase {
+abstract class AbstractDefinitionTestCases extends TestCase {
     /** @var \ReflectionClass */
     protected $reflectionClass;
 

tests/Definition/ConsulDefinitionTest.php

@@ -18,12 +18,13 @@
 
 use DCarbone\PHPConsulAPI\Config;
 use DCarbone\PHPConsulAPI\Consul;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class ConsulDefinitionTest
  * @package DCarbone\PHPConsulAPITests\Definition
  */
-class ConsulDefinitionTest extends \PHPUnit_Framework_TestCase {
+class ConsulDefinitionTest extends TestCase {
 
     protected $clientClassnames = [];
 

tests/Usage/Agent/AgentClientUsageTests.php

@@ -23,12 +23,13 @@
 use DCarbone\PHPConsulAPI\Agent\AgentServiceRegistration;
 use DCarbone\PHPConsulAPI\Config;
 use DCarbone\PHPConsulAPITests\ConsulManager;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class AgentClientUsageTests
  * @package DCarbone\PHPConsulAPITests\Usage\Agent
  */
-class AgentClientUsageTests extends \PHPUnit_Framework_TestCase {
+class AgentClientUsageTests extends TestCase {
 
     const ServiceName = 'testservice';
 

tests/Usage/ConfigUsageTest.php

@@ -3,6 +3,7 @@
 use DCarbone\PHPConsulAPI\Config;
 use DCarbone\PHPConsulAPI\Consul;
 use DCarbone\PHPConsulAPITests\ConsulManager;
+use PHPUnit\Framework\TestCase;
 
 /*
    Copyright 2016-2017 Daniel Carbone ([email protected])
@@ -24,7 +25,7 @@
  * Class ConfigUsageTest
  * @package DCarbone\PHPConsulAPITests\Usage
  */
-class ConfigUsageTest extends \PHPUnit_Framework_TestCase {
+class ConfigUsageTest extends TestCase {
     const DEFAULT_ADDRESS = '127.0.0.1:8500';
     const DEFAULT_SCHEME = 'http';
 

tests/Usage/KV/KVClientAdvancedTests.php

@@ -16,10 +16,12 @@
    limitations under the License.
 */
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Class KVClientAdvancedTests
  * @package DCarbone\PHPConsulAPITests\Usage\KV
  */
-class KVClientAdvancedTests extends \PHPUnit_Framework_TestCase {
+class KVClientAdvancedTests extends TestCase {
 
 }

tests/Usage/KV/KVClientCRUDTests.php

@@ -23,12 +23,13 @@
 use DCarbone\PHPConsulAPI\QueryMeta;
 use DCarbone\PHPConsulAPI\WriteMeta;
 use DCarbone\PHPConsulAPITests\ConsulManager;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class KVClientCRUDTests
  * @package DCarbone\PHPConsulAPITests\Usage\KV
  */
-class KVClientCRUDTests extends \PHPUnit_Framework_TestCase {
+class KVClientCRUDTests extends TestCase {
 
     const KVKey1 = 'testkey1';
     const KVValue1 = 'testvalue1';