Merge branch 'develop'

oat-sa · Sep 23, 2016 · 83103f9 · 83103f9
2 parents bceda9e + 2f9aefb
commit 83103f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/qtism/runtime/pci/json/Marshaller.php b/src/qtism/runtime/pci/json/Marshaller.php
@@ -147,7 +147,7 @@ protected function marshallUnit($unit)
                 $jsonEntry = array();
                 $jsonEntry['name'] = $k;
 
-                if (isset($data['base']) === true || $data['base'] === null) {
+                if (array_key_exists('base', $data) === true) {
                     // Primitive base type.
                     $jsonEntry['base'] = $data['base'];
                 } else {

diff --git a/test/qtismtest/runtime/pci/json/JsonMarshallerTest.php b/test/qtismtest/runtime/pci/json/JsonMarshallerTest.php
@@ -270,6 +270,11 @@ public function marshallRecordProvider() {
         $json = json_encode(array('record' => array(array('name' => 'numeric', 'base' => array('float' => 1337.1337)), array('name' => 'null', 'base' => null), array('name' => 'coordinates', 'base' => array('point' => array(10, 20))))));
         $returnValue[] = array($record, $json);
 
+        // nested list record.
+        $record = new RecordContainer(array('nested' => new MultipleContainer(BaseType::INTEGER, array(new QtiInteger(1)))));
+        $json = json_encode(array('record' => array(array('name' => 'nested', 'list' => array('integer' => array(1))))));
+        $returnValue[] = array($record, $json);
+
         return $returnValue;
     }