Merge pull request #486 from wing328/php_fix_deserialize

Bug fixes for Swagger.php deserialize function
This commit is contained in:
Tony Tam 2015-03-13 09:39:50 -07:00
commit 7aca1cfb3f
2 changed files with 6 additions and 4 deletions

View File

@ -223,13 +223,14 @@ class APIClient {
$inner = substr($class, 4, -1); $inner = substr($class, 4, -1);
$values = array(); $values = array();
if(strrpos($inner, ",") !== false) { if(strrpos($inner, ",") !== false) {
$subClass = explode(',', $inner, 2)[1]; $subClass_array = explode(',', $inner, 2);
$subClass = $subClass_array[1];
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$values[] = array($key => self::deserialize($value, $subClass)); $values[] = array($key => self::deserialize($value, $subClass));
} }
} }
$deserialized = $values; $deserialized = $values;
} elseif (substr($class, 0, 6) == 'array[') { } elseif (strcasecmp(substr($class, 0, 6),'array[') == 0) {
$subClass = substr($class, 6, -1); $subClass = substr($class, 6, -1);
$values = array(); $values = array();
foreach ($data as $key => $value) { foreach ($data as $key => $value) {

View File

@ -223,13 +223,14 @@ class APIClient {
$inner = substr($class, 4, -1); $inner = substr($class, 4, -1);
$values = array(); $values = array();
if(strrpos($inner, ",") !== false) { if(strrpos($inner, ",") !== false) {
$subClass = explode(',', $inner, 2)[1]; $subClass_array = explode(',', $inner, 2);
$subClass = $subClass_array[1];
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$values[] = array($key => self::deserialize($value, $subClass)); $values[] = array($key => self::deserialize($value, $subClass));
} }
} }
$deserialized = $values; $deserialized = $values;
} elseif (substr($class, 0, 6) == 'array[') { } elseif (strcasecmp(substr($class, 0, 6),'array[') == 0) {
$subClass = substr($class, 6, -1); $subClass = substr($class, 6, -1);
$values = array(); $values = array();
foreach ($data as $key => $value) { foreach ($data as $key => $value) {