update files as rebase from #838

This commit is contained in:
Tony Tam
2015-08-23 11:05:19 -07:00
parent f662699fd0
commit 3160913433
3 changed files with 8 additions and 3 deletions

View File

@@ -193,7 +193,7 @@ class ObjectSerializer
$deserialized = $values;
} elseif ($class === '\DateTime') {
$deserialized = new \DateTime($data);
} elseif (in_array($class, array('string', 'int', 'float', 'double', 'bool', 'object'))) {
} elseif (in_array($class, array({{&primitives}}))) {
settype($data, $class);
$deserialized = $data;
} elseif ($class === '\SplFileObject') {