Mild reorganization of KVClient class

- Adding error check on "KVClient::keys" method

Author: dcarbone

src/KV/KVClient.php

@@ -77,6 +77,49 @@ public function get($key, QueryOptions $queryOptions = null) {
         return [null, $qm, new Error(sprintf('%s: %s', $response->getStatusCode(), $response->getReasonPhrase()))];
     }
 
+    /**
+     * @param \DCarbone\PHPConsulAPI\KV\KVPair $p
+     * @param \DCarbone\PHPConsulAPI\WriteOptions $writeOptions
+     * @return array(
+     * @type \DCarbone\PHPConsulAPI\WriteMeta write metadata
+     * @type \DCarbone\PHPConsulAPI\Error|null error, if any
+     * )
+     */
+    public function put(KVPair $p, WriteOptions $writeOptions = null) {
+        $r = new Request('put', sprintf('v1/kv/%s', $p->Key), $this->c, $p->Value);
+        $r->setWriteOptions($writeOptions);
+        if (0 !== $p->Flags) {
+            $r->params->set('flags', (string)$p->Flags);
+        }
+
+        list($duration, $_, $err) = $this->requireOK($this->doRequest($r));
+        if (null !== $err) {
+            return [null, $err];
+        }
+
+        return [$this->buildWriteMeta($duration), null];
+    }
+
+    /**
+     * @param string $key
+     * @param \DCarbone\PHPConsulAPI\WriteOptions|null $writeOptions
+     * @return array(
+     * @type \DCarbone\PHPConsulAPI\WriteMeta metadata about write
+     * @type \DCarbone\PHPConsulAPI\Error|null error, if any
+     * )
+     */
+    public function delete($key, WriteOptions $writeOptions = null) {
+        $r = new Request('delete', sprintf('v1/kv/%s', $key), $this->c);
+        $r->setWriteOptions($writeOptions);
+
+        list ($duration, $_, $err) = $this->requireOK($this->doRequest($r));
+        if (null !== $err) {
+            return [null, $err];
+        }
+
+        return [$this->buildWriteMeta($duration), null];
+    }
+
     /**
      * @param string $prefix
      * @param \DCarbone\PHPConsulAPI\QueryOptions|null $queryOptions
@@ -167,49 +210,6 @@ public function keys($prefix = null, QueryOptions $queryOptions = null) {
         return [$data, $qm, $err];
     }
 
-    /**
-     * @param \DCarbone\PHPConsulAPI\KV\KVPair $p
-     * @param \DCarbone\PHPConsulAPI\WriteOptions $writeOptions
-     * @return array(
-     * @type \DCarbone\PHPConsulAPI\WriteMeta write metadata
-     * @type \DCarbone\PHPConsulAPI\Error|null error, if any
-     * )
-     */
-    public function put(KVPair $p, WriteOptions $writeOptions = null) {
-        $r = new Request('put', sprintf('v1/kv/%s', $p->Key), $this->c, $p->Value);
-        $r->setWriteOptions($writeOptions);
-        if (0 !== $p->Flags) {
-            $r->params->set('flags', (string)$p->Flags);
-        }
-
-        list($duration, $_, $err) = $this->requireOK($this->doRequest($r));
-        if (null !== $err) {
-            return [null, $err];
-        }
-
-        return [$this->buildWriteMeta($duration), null];
-    }
-
-    /**
-     * @param string $key
-     * @param \DCarbone\PHPConsulAPI\WriteOptions|null $writeOptions
-     * @return array(
-     * @type \DCarbone\PHPConsulAPI\WriteMeta metadata about write
-     * @type \DCarbone\PHPConsulAPI\Error|null error, if any
-     * )
-     */
-    public function delete($key, WriteOptions $writeOptions = null) {
-        $r = new Request('delete', sprintf('v1/kv/%s', $key), $this->c);
-        $r->setWriteOptions($writeOptions);
-
-        list ($duration, $_, $err) = $this->requireOK($this->doRequest($r));
-        if (null !== $err) {
-            return [null, $err];
-        }
-
-        return [$this->buildWriteMeta($duration), null];
-    }
-
     /**
      * @param \DCarbone\PHPConsulAPI\KV\KVPair $p
      * @param \DCarbone\PHPConsulAPI\WriteOptions $writeOptions

tests/Usage/KV/KVClientUsageTest.php renamed to tests/Usage/KV/KVClientCRUDTests.php

@@ -25,10 +25,10 @@
 use DCarbone\PHPConsulAPITests\ConsulManager;
 
 /**
- * Class KVClientUsageTest
+ * Class KVClientCRUDTests
  * @package DCarbone\PHPConsulAPITests\Usage\KV
  */
-class KVClientUsageTest extends \PHPUnit_Framework_TestCase {
+class KVClientCRUDTests extends \PHPUnit_Framework_TestCase {
 
     const KVKey1 = 'testkey1';
     const KVValue1 = 'testvalue1';
@@ -215,6 +215,19 @@ public function testCanGetPrefixList() {
         }
     }
 
+    public function testKeysReturnsErrorWithInvalidPrefix() {
+        $client = new KVClient(new Config());
+        list($_, $_, $err) = $client->keys(12345);
+        $this->assertInstanceOf(
+            Error::class,
+            $err,
+            sprintf(
+                'Expected $err to be "%s", saw "%s"',
+                Error::class,
+                is_object($err) ? get_class($err) : gettype($err)
+            ));
+    }
+
     /**
      * @depends testCanPutKey
      */