From bff2515bf25747e4ff3226f72951e40762b632c3 Mon Sep 17 00:00:00 2001 From: James Ebentier Date: Tue, 27 Jan 2015 11:48:20 -0800 Subject: [PATCH 1/3] Fixing issue with deserialization in PHP No longer will deserialize throw errors when converting a json response to a string --- src/main/resources/php/Swagger.mustache | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/php/Swagger.mustache b/src/main/resources/php/Swagger.mustache index c1d85c05e75..aca7a9e4db4 100644 --- a/src/main/resources/php/Swagger.mustache +++ b/src/main/resources/php/Swagger.mustache @@ -204,6 +204,7 @@ class APIClient { } elseif ($class == 'DateTime') { $deserialized = new \DateTime($data); } elseif (in_array($class, array('string', 'int', 'float', 'bool'))) { + $data = (is_object($data) || is_array($data)) json_decode($data) : $data; settype($data, $class); $deserialized = $data; } else { From 59568915dea37fd13fe13d0e1c4c3afe3144b7ee Mon Sep 17 00:00:00 2001 From: James Ebentier Date: Tue, 27 Jan 2015 12:08:41 -0800 Subject: [PATCH 2/3] Fixing minor typo --- src/main/resources/php/Swagger.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/php/Swagger.mustache b/src/main/resources/php/Swagger.mustache index aca7a9e4db4..f8f5861afef 100644 --- a/src/main/resources/php/Swagger.mustache +++ b/src/main/resources/php/Swagger.mustache @@ -204,7 +204,7 @@ class APIClient { } elseif ($class == 'DateTime') { $deserialized = new \DateTime($data); } elseif (in_array($class, array('string', 'int', 'float', 'bool'))) { - $data = (is_object($data) || is_array($data)) json_decode($data) : $data; + $data = (is_object($data) || is_array($data)) ? json_decode($data) : $data; settype($data, $class); $deserialized = $data; } else { From fd128cbab01373313f6560cf3330f83ab384e5f6 Mon Sep 17 00:00:00 2001 From: James Ebentier Date: Tue, 27 Jan 2015 12:28:28 -0800 Subject: [PATCH 3/3] Update Swagger.mustache --- src/main/resources/php/Swagger.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/php/Swagger.mustache b/src/main/resources/php/Swagger.mustache index f8f5861afef..efa2ecb0fde 100644 --- a/src/main/resources/php/Swagger.mustache +++ b/src/main/resources/php/Swagger.mustache @@ -204,7 +204,7 @@ class APIClient { } elseif ($class == 'DateTime') { $deserialized = new \DateTime($data); } elseif (in_array($class, array('string', 'int', 'float', 'bool'))) { - $data = (is_object($data) || is_array($data)) ? json_decode($data) : $data; + $data = (is_object($data) || is_array($data)) ? json_encode($data) : $data; settype($data, $class); $deserialized = $data; } else {