[php] Fix JSON object deserialization (#8481)

* Fix JSON object deserialization * Revert "Fix JSON object deserialization" This reverts commit 42a4637e53020d8d3e921f72bc66de9d4ccd8151. * Add JSON body decoding before deserialize call * Add two more json_decode calls Co-authored-by: Thomas Hansen <thomas@thomasphansen.dk>
OpenAPITools · Mar 28, 2022 · 956ad2a · 956ad2a
1 parent 081619e
commit 956ad2a
Show file tree

Hide file tree

Showing 8 changed files with 189 additions and 0 deletions.
diff --git a/modules/openapi-generator/src/main/resources/php/api.mustache b/modules/openapi-generator/src/main/resources/php/api.mustache
@@ -233,6 +233,9 @@ use {{invokerPackage}}\ObjectSerializer;
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ('{{dataType}}' !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -251,6 +254,9 @@ use {{invokerPackage}}\ObjectSerializer;
                 $content = $response->getBody(); //stream goes to serializer
             } else {
                 $content = (string) $response->getBody();
+                if ($returnType !== 'string') {
+                    $content = json_decode($content);
+                }
             }
 
             return [
@@ -375,6 +381,9 @@ use {{invokerPackage}}\ObjectSerializer;
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ($returnType !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [

diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php
@@ -188,6 +188,9 @@ public function call123TestSpecialTagsWithHttpInfo($client)
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ('\OpenAPI\Client\Model\Client' !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -202,6 +205,9 @@ public function call123TestSpecialTagsWithHttpInfo($client)
                 $content = $response->getBody(); //stream goes to serializer
             } else {
                 $content = (string) $response->getBody();
+                if ($returnType !== 'string') {
+                    $content = json_decode($content);
+                }
             }
 
             return [
@@ -268,6 +274,9 @@ function ($response) use ($returnType) {
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ($returnType !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [

diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
@@ -182,6 +182,9 @@ public function fooGetWithHttpInfo()
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ('\OpenAPI\Client\Model\InlineResponseDefault' !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -196,6 +199,9 @@ public function fooGetWithHttpInfo()
                 $content = $response->getBody(); //stream goes to serializer
             } else {
                 $content = (string) $response->getBody();
+                if ($returnType !== 'string') {
+                    $content = json_decode($content);
+                }
             }
 
             return [
@@ -256,6 +262,9 @@ function ($response) use ($returnType) {
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ($returnType !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [

diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -186,6 +186,9 @@ public function fakeHealthGetWithHttpInfo()
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ('\OpenAPI\Client\Model\HealthCheckResult' !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -200,6 +203,9 @@ public function fakeHealthGetWithHttpInfo()
                 $content = $response->getBody(); //stream goes to serializer
             } else {
                 $content = (string) $response->getBody();
+                if ($returnType !== 'string') {
+                    $content = json_decode($content);
+                }
             }
 
             return [
@@ -264,6 +270,9 @@ function ($response) use ($returnType) {
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ($returnType !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -682,6 +691,9 @@ public function fakeOuterBooleanSerializeWithHttpInfo($body = null)
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ('bool' !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -696,6 +708,9 @@ public function fakeOuterBooleanSerializeWithHttpInfo($body = null)
                 $content = $response->getBody(); //stream goes to serializer
             } else {
                 $content = (string) $response->getBody();
+                if ($returnType !== 'string') {
+                    $content = json_decode($content);
+                }
             }
 
             return [
@@ -758,6 +773,9 @@ function ($response) use ($returnType) {
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ($returnType !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -937,6 +955,9 @@ public function fakeOuterCompositeSerializeWithHttpInfo($outer_composite = null)
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ('\OpenAPI\Client\Model\OuterComposite' !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -951,6 +972,9 @@ public function fakeOuterCompositeSerializeWithHttpInfo($outer_composite = null)
                 $content = $response->getBody(); //stream goes to serializer
             } else {
                 $content = (string) $response->getBody();
+                if ($returnType !== 'string') {
+                    $content = json_decode($content);
+                }
             }
 
             return [
@@ -1013,6 +1037,9 @@ function ($response) use ($returnType) {
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ($returnType !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -1192,6 +1219,9 @@ public function fakeOuterNumberSerializeWithHttpInfo($body = null)
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ('float' !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -1206,6 +1236,9 @@ public function fakeOuterNumberSerializeWithHttpInfo($body = null)
                 $content = $response->getBody(); //stream goes to serializer
             } else {
                 $content = (string) $response->getBody();
+                if ($returnType !== 'string') {
+                    $content = json_decode($content);
+                }
             }
 
             return [
@@ -1268,6 +1301,9 @@ function ($response) use ($returnType) {
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ($returnType !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -1447,6 +1483,9 @@ public function fakeOuterStringSerializeWithHttpInfo($body = null)
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ('string' !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -1461,6 +1500,9 @@ public function fakeOuterStringSerializeWithHttpInfo($body = null)
                 $content = $response->getBody(); //stream goes to serializer
             } else {
                 $content = (string) $response->getBody();
+                if ($returnType !== 'string') {
+                    $content = json_decode($content);
+                }
             }
 
             return [
@@ -1523,6 +1565,9 @@ function ($response) use ($returnType) {
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ($returnType !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -1702,6 +1747,9 @@ public function fakePropertyEnumIntegerSerializeWithHttpInfo($outer_object_with_
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ('\OpenAPI\Client\Model\OuterObjectWithEnumProperty' !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -1716,6 +1764,9 @@ public function fakePropertyEnumIntegerSerializeWithHttpInfo($outer_object_with_
                 $content = $response->getBody(); //stream goes to serializer
             } else {
                 $content = (string) $response->getBody();
+                if ($returnType !== 'string') {
+                    $content = json_decode($content);
+                }
             }
 
             return [
@@ -1778,6 +1829,9 @@ function ($response) use ($returnType) {
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ($returnType !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -2634,6 +2688,9 @@ public function testClientModelWithHttpInfo($client)
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ('\OpenAPI\Client\Model\Client' !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -2648,6 +2705,9 @@ public function testClientModelWithHttpInfo($client)
                 $content = $response->getBody(); //stream goes to serializer
             } else {
                 $content = (string) $response->getBody();
+                if ($returnType !== 'string') {
+                    $content = json_decode($content);
+                }
             }
 
             return [
@@ -2714,6 +2774,9 @@ function ($response) use ($returnType) {
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ($returnType !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [

diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php
@@ -188,6 +188,9 @@ public function testClassnameWithHttpInfo($client)
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ('\OpenAPI\Client\Model\Client' !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [
@@ -202,6 +205,9 @@ public function testClassnameWithHttpInfo($client)
                 $content = $response->getBody(); //stream goes to serializer
             } else {
                 $content = (string) $response->getBody();
+                if ($returnType !== 'string') {
+                    $content = json_decode($content);
+                }
             }
 
             return [
@@ -268,6 +274,9 @@ function ($response) use ($returnType) {
                         $content = $response->getBody(); //stream goes to serializer
                     } else {
                         $content = (string) $response->getBody();
+                        if ($returnType !== 'string') {
+                            $content = json_decode($content);
+                        }
                     }
 
                     return [