HHVM-266: Javascript should emit $code/$scope for JSON

Author: jmikola

ext_mongodb.php

@@ -1327,7 +1327,14 @@ public function serialize() : string
 
 	public function jsonSerialize() : mixed
 	{
-		return $this->code;
+		$json = [ '$code' => $this->code ];
+
+		if ( isset( $this->scope ) )
+		{
+			$json['$scope'] = $this->scope;
+		}
+
+		return $json;
 	}
 
 	public function unserialize(mixed $serialized) : void

tests/json-serialize-javascript-001.phpt

@@ -0,0 +1,29 @@
+--TEST--
+JsonSerializable: Javascript (with scope)
+--FILE--
+<?php
+$doc = [
+	'foo' => new MongoDB\BSON\Javascript( "function foo(bar) { return bar; }", [ 'foo' => 42 ] )
+];
+
+echo MongoDB\BSON\toJSON( \MongoDB\BSON\fromPHP( $doc ) ), "\n";
+$d = json_encode( $doc );
+echo $d, "\n";
+
+var_dump( \MongoDB\BSON\toPHP( \MongoDB\BSON\fromJSON( $d ) ) );
+?>
+--EXPECTF--
+{ "foo" : "function foo(bar) { return bar; }" }
+{"foo":{"$code":"function foo(bar) { return bar; }","$scope":{"foo":42}}}
+object(stdClass)#%d (%d) {
+  ["foo"]=>
+  object(stdClass)#%d (%d) {
+    ["$code"]=>
+    string(33) "function foo(bar) { return bar; }"
+    ["$scope"]=>
+    object(stdClass)#%d (%d) {
+      ["foo"]=>
+      int(42)
+    }
+  }
+}

tests/json-serialize-javascript.phpt renamed to tests/json-serialize-javascript-002.phpt

@@ -1,9 +1,9 @@
 --TEST--
-JsonSerializable: Javascript
+JsonSerializable: Javascript (without scope)
 --FILE--
 <?php
 $doc = [
-	'foo' => new MongoDB\BSON\Javascript( "function foo(bar) { return bar; }", [ 'foo' => 42 ] )
+	'foo' => new MongoDB\BSON\Javascript( "function foo(bar) { return bar; }")
 ];
 
 echo MongoDB\BSON\toJSON( \MongoDB\BSON\fromPHP( $doc ) ), "\n";
@@ -14,8 +14,11 @@ var_dump( \MongoDB\BSON\toPHP( \MongoDB\BSON\fromJSON( $d ) ) );
 ?>
 --EXPECTF--
 { "foo" : "function foo(bar) { return bar; }" }
-{"foo":"function foo(bar) { return bar; }"}
+{"foo":{"$code":"function foo(bar) { return bar; }"}}
 object(stdClass)#%d (%d) {
   ["foo"]=>
-  string(33) "function foo(bar) { return bar; }"
+  object(stdClass)#%d (%d) {
+    ["$code"]=>
+    string(33) "function foo(bar) { return bar; }"
+  }
 }