Vpack::fromArray() now supports PHPs null

martin-schilling · martin-schilling · commit 881be005c8a3 · 2017-12-14T23:05:52.000+01:00
diff --git a/src/vpackImpl.h b/src/vpackImpl.h
@@ -49,6 +49,9 @@ namespace arangodb { namespace fuerte { namespace php {
                 case IS_FALSE:
                     b->add(vpackKey, arangodb::velocypack::Value(false));
                     break;
+                case IS_NULL:
+                    b->add(vpackKey, arangodb::velocypack::Value(arangodb::velocypack::ValueType::Null));
+                    break;
                 case IS_ARRAY:
                     if(HT_IS_PACKED(Z_ARRVAL_P(data)) && HT_IS_WITHOUT_HOLES(Z_ARRVAL_P(data))) {
                         b->add(vpackKey, arangodb::velocypack::Value(arangodb::velocypack::ValueType::Array));
@@ -92,6 +95,9 @@ namespace arangodb { namespace fuerte { namespace php {
                case IS_FALSE:
                    b->add(arangodb::velocypack::Value(false));
                    break;
+               case IS_NULL:
+                   b->add(arangodb::velocypack::Value(arangodb::velocypack::ValueType::Null));
+                   break;
                case IS_ARRAY:
                    if(HT_IS_PACKED(Z_ARRVAL_P(data)) && HT_IS_WITHOUT_HOLES(Z_ARRVAL_P(data))) {
                        b->add(arangodb::velocypack::Value(arangodb::velocypack::ValueType::Array));
diff --git a/tests/VpackTest.php b/tests/VpackTest.php
@@ -91,13 +91,14 @@ public function it_produces_a_proper_vpack(): void
                 111
             ],
             [23, 58, 10],
-            [0 => 10, 1 => 20, 3 => 30]
+            [0 => 10, 1 => 20, 3 => 30],
+            "null" => null
         ];
 
         $vpackFromArray = Vpack::fromArray($arr);
 
         $this->assertEquals(
-            "{\"0\":10,\"1\":20,\"2\":[23,58,10],\"3\":{\"0\":10,\"1\":20,\"3\":30},\"a\":\"111\",\"arr\":{\"0\":111,\"a\":\"b\"},\"b\":222,\"c\":true,\"d\":false,\"e\":3.2}",
+            "{\"0\":10,\"1\":20,\"2\":[23,58,10],\"3\":{\"0\":10,\"1\":20,\"3\":30},\"a\":\"111\",\"arr\":{\"0\":111,\"a\":\"b\"},\"b\":222,\"c\":true,\"d\":false,\"e\":3.2,\"null\":null}",
             $vpackFromArray->toJson()
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -91,13 +91,14 @@ public function it_produces_a_proper_vpack(): void`
`91`	`91`	`111`
`92`	`92`	`],`
`93`	`93`	`[23, 58, 10],`
`94`		`- [0 => 10, 1 => 20, 3 => 30]`
	`94`	`+ [0 => 10, 1 => 20, 3 => 30],`
	`95`	`+ "null" => null`
`95`	`96`	`];`
`96`	`97`
`97`	`98`	`$vpackFromArray = Vpack::fromArray($arr);`
`98`	`99`
`99`	`100`	`$this->assertEquals(`
`100`		`- "{\"0\":10,\"1\":20,\"2\":[23,58,10],\"3\":{\"0\":10,\"1\":20,\"3\":30},\"a\":\"111\",\"arr\":{\"0\":111,\"a\":\"b\"},\"b\":222,\"c\":true,\"d\":false,\"e\":3.2}",`
	`101`	`+ "{\"0\":10,\"1\":20,\"2\":[23,58,10],\"3\":{\"0\":10,\"1\":20,\"3\":30},\"a\":\"111\",\"arr\":{\"0\":111,\"a\":\"b\"},\"b\":222,\"c\":true,\"d\":false,\"e\":3.2,\"null\":null}",`
`101`	`102`	`$vpackFromArray->toJson()`
`102`	`103`	`);`
`103`	`104`	`}`