Merge pull request #97 from basho/develop

Packagist updates, Assertion for tombstones, and docblock descriptions

composer.json

@@ -1,6 +1,7 @@
 {
   "name": "basho/riak",
   "description": "Official Riak client for PHP",
+  "type": "library",
   "keywords": [
     "basho",
     "riak",
@@ -17,8 +18,16 @@
   "license": "Apache-2.0",
   "authors": [
     {
-      "name": "Riak Team & Contributors",
-      "homepage": "https://github.com/basho/riak-php-client/contributors"
+      "name": "Christopher Mancini",
+      "email": "[email protected]",
+      "homepage": "https://github.com/christophermancini",
+      "role": "Lead Developer"
+    },
+    {
+      "name": "Alex Moore",
+      "email": "[email protected]",
+      "homepage": "https://github.com/alexmoore",
+      "role": "Developer"
     }
   ],
   "autoload": {
@@ -27,6 +36,9 @@
   "autoload-dev": {
     "psr-4": {"Basho\\Tests\\": "tests/"}
   },
+  "support": {
+    "issues": "https://github.com/sebastianbergmann/phpunit/issues"
+  },
   "repositories": [
     {
       "type": "package",

src/Riak/Command/Bucket/Delete.php

@@ -21,7 +21,7 @@
 use Basho\Riak\CommandInterface;
 
 /**
- * Used to remove an object from Riak
+ * Used to remove a bucket property from a Riak bucket
  *
  * @author Christopher Mancini <cmancini at basho d0t com>
  */

src/Riak/Command/Bucket/Store.php

@@ -21,7 +21,7 @@
 use Basho\Riak\CommandInterface;
 
 /**
- * Riak key value object store
+ * Used to set a bucket property on a bucket
  *
  * @author Christopher Mancini <cmancini at basho d0t com>
  */

src/Riak/Command/Builder/IndexTrait.php

@@ -277,7 +277,7 @@ public function withMaxResults($maxResults)
      *
      * @return $this
      */
-    public function withReturnTerms($returnTerms)
+    public function withReturnTerms($returnTerms = true)
     {
         $this->returnTerms = $returnTerms;
         return $this;

src/Riak/Command/Builder/UpdateMap.php

@@ -221,6 +221,11 @@ public function validate()
             throw new Exception('At least one add, remove, or update operation needs to be defined.');
         }
 
+        if ($count_remove) {
+            $this->required('Location');
+            $this->required('Context');
+        }
+
         // if we are performing a remove on a nested set, Location and context are required
         if ($count_sets) {
             foreach ($this->sets as $set) {

src/Riak/Object.php

@@ -99,7 +99,11 @@ public function addValueToIndex($indexName, $value)
 
     private function validateIndexNameAndValue($indexName, $value)
     {
-        $type = gettype($value);
+        if (!is_scalar($value)) {
+            throw new \InvalidArgumentException("Invalid index type for '" . $indexName .
+                "'index. Expecting '*_int' for an integer index, or '*_bin' for a string index.");
+        }
+
         $isIntIndex = SecondaryIndexHeaderTranslator::isIntIndex($indexName);
         $isStringIndex = SecondaryIndexHeaderTranslator::isStringIndex($indexName);
 
@@ -108,14 +112,14 @@ private function validateIndexNameAndValue($indexName, $value)
                 "'index. Expecting '*_int' for an integer index, or '*_bin' for a string index.");
         }
 
-        if ($isIntIndex && $type != 'integer') {
+        if ($isIntIndex && !is_int($value)) {
             throw new \InvalidArgumentException("Invalid type for '" . $indexName .
-                "'index. Expecting 'integer', value was '" . $type . "''");
+                "'index. Expecting 'integer', value was '" . gettype($value) . "''");
         }
 
-        if ($isStringIndex && $type != 'string') {
+        if ($isStringIndex && !is_string($value)) {
             throw new \InvalidArgumentException("Invalid type for '" . $indexName .
-                "'index. Expecting 'string', value was '" . $type . "''");
+                "'index. Expecting 'string', value was '" . gettype($value) . "''");
         }
     }
 

tests/functional/ObjectOperationsTest.php

@@ -33,11 +33,6 @@ class ObjectOperationsTest extends TestCase
      */
     private static $object = NULL;
 
-    /**
-     * @var array|null
-     */
-    private static $vclock = NULL;
-
     public static function setUpBeforeClass()
     {
         // make completely random key based on time
@@ -180,6 +175,9 @@ public function testFetchDeleted($riak)
         $response = $command->execute();
 
         $this->assertEquals('404', $response->getStatusCode());
+
+        // deleted key's still leave behind a tombstone with their causal context, aka vclock
+        $this->assertNotEmpty($response->getVclock());
     }
 
     /**