Bug in casting subobject arrays solve #471

UnionOfRAD · May 23, 2012 · 581a11a · 581a11a
1 parent 5cb1229
commit 581a11a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/data/DocumentSchema.php b/data/DocumentSchema.php
@@ -42,7 +42,12 @@ public function cast($object, $data, array $options = array()) {
 
 		foreach ($data as $key => $val) {
 			$fieldName = is_int($key) ? null : $key;
-			$pathKey = $basePathKey ? "{$basePathKey}.{$fieldName}" : $fieldName;
+
+			if($fieldName) {
+				$pathKey = $basePathKey ? "{$basePathKey}.{$fieldName}" : $fieldName;
+			} else {
+				$pathKey = $basePathKey;	
+			}
 
 			if ($val instanceof $classes['array'] || $val instanceof $classes['entity']) {
 				continue;
@@ -82,7 +87,7 @@ protected function _castArray($object, $val, $pathKey, $options, $defaults) {
 		}
 
 		if ($options['wrap']) {
-			$config  = array('data' => $val, 'model' => $options['model']);
+			$config = array('data' => $val, 'model' => $options['model'], 'schema' => $this);
 			$config += compact('pathKey') + array_diff_key($options, $defaults);
 			$val = $this->_instance($class, $config);
 		}