fix object serializer, update tests in php nextgen (OpenAPITools#16764)

modules/openapi-generator/src/main/resources/php-nextgen/ApiException.mustache

@@ -50,7 +50,7 @@ class ApiException extends Exception
      *
      * @var mixed
      */
-    protected mixed $responseObject;
+    protected mixed $responseObject = null;
 
     /**
      * Constructor

modules/openapi-generator/src/main/resources/php-nextgen/ObjectSerializer.mustache

@@ -427,7 +427,7 @@ class ObjectSerializer
             return $data;
         }
 
-        if ($class === 'DateTime') {
+        if ($class === '\DateTime') {
             // Some APIs return an invalid, empty string as a
             // date-time property. DateTime::__construct() will return
             // the current time for empty input which is probably not
@@ -474,7 +474,12 @@ class ObjectSerializer
         }
 
         /** @psalm-suppress ParadoxicalCondition */
-        if (in_array($class, [{{&primitives}}], true)) {
+        // handle primitive types
+        if (in_array($class, ['\DateTime', '\SplFileObject'], true)) {
+            return $data;
+        } elseif (in_array($class, ['array', 'bool', 'boolean', 'float', 'double', 'int', 'integer', 'object', 'string', 'null'], true)) {
+            // type ref: https://www.php.net/manual/en/function.settype.php
+            // byte, mixed, void in the old php client were removed
             settype($data, $class);
             return $data;
         }

samples/client/echo_api/php-nextgen/src/ApiException.php

@@ -60,7 +60,7 @@ class ApiException extends Exception
      *
      * @var mixed
      */
-    protected mixed $responseObject;
+    protected mixed $responseObject = null;
 
     /**
      * Constructor

samples/client/echo_api/php-nextgen/src/ObjectSerializer.php

@@ -437,7 +437,7 @@ public static function deserialize(mixed $data, string $class, array $httpHeader
             return $data;
         }
 
-        if ($class === 'DateTime') {
+        if ($class === '\DateTime') {
             // Some APIs return an invalid, empty string as a
             // date-time property. DateTime::__construct() will return
             // the current time for empty input which is probably not
@@ -484,7 +484,12 @@ public static function deserialize(mixed $data, string $class, array $httpHeader
         }
 
         /** @psalm-suppress ParadoxicalCondition */
-        if (in_array($class, ['\DateTime', '\SplFileObject', 'array', 'bool', 'boolean', 'byte', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) {
+        // handle primitive types
+        if (in_array($class, ['\DateTime', '\SplFileObject'], true)) {
+            return $data;
+        } elseif (in_array($class, ['array', 'bool', 'boolean', 'float', 'double', 'int', 'integer', 'object', 'string', 'null'], true)) {
+            // type ref: https://www.php.net/manual/en/function.settype.php
+            // byte, mixed, void in the old php client were removed
             settype($data, $class);
             return $data;
         }

samples/client/petstore/php-nextgen/OpenAPIClient-php/src/ApiException.php

@@ -59,7 +59,7 @@ class ApiException extends Exception
      *
      * @var mixed
      */
-    protected mixed $responseObject;
+    protected mixed $responseObject = null;
 
     /**
      * Constructor

samples/client/petstore/php-nextgen/OpenAPIClient-php/src/ObjectSerializer.php

@@ -436,7 +436,7 @@ public static function deserialize(mixed $data, string $class, array $httpHeader
             return $data;
         }
 
-        if ($class === 'DateTime') {
+        if ($class === '\DateTime') {
             // Some APIs return an invalid, empty string as a
             // date-time property. DateTime::__construct() will return
             // the current time for empty input which is probably not
@@ -483,7 +483,12 @@ public static function deserialize(mixed $data, string $class, array $httpHeader
         }
 
         /** @psalm-suppress ParadoxicalCondition */
-        if (in_array($class, ['\DateTime', '\SplFileObject', 'array', 'bool', 'boolean', 'byte', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)) {
+        // handle primitive types
+        if (in_array($class, ['\DateTime', '\SplFileObject'], true)) {
+            return $data;
+        } elseif (in_array($class, ['array', 'bool', 'boolean', 'float', 'double', 'int', 'integer', 'object', 'string', 'null'], true)) {
+            // type ref: https://www.php.net/manual/en/function.settype.php
+            // byte, mixed, void in the old php client were removed
             settype($data, $class);
             return $data;
         }

samples/client/petstore/php-nextgen/OpenAPIClient-php/test/DateTimeSerializerTest.php

@@ -13,6 +13,10 @@ public function testDateTimeSanitation()
 
         $input = new FormatTest([
             'date_time' => $dateTime,
+            'date' => $dateTime,
+            'number' => 123.45,
+            'password' => 'password',
+            'byte' => '0101'
         ]);
 
         $data = ObjectSerializer::sanitizeForSerialization($input);
@@ -30,7 +34,11 @@ public function testDateSanitation()
         $dateTime = new \DateTime('April 30, 1973 17:05 CEST');
 
         $input = new FormatTest([
+            'date_time' => $dateTime,
             'date' => $dateTime,
+            'number' => 123.45,
+            'password' => 'password',
+            'byte' => '0101'
         ]);
 
         $data = ObjectSerializer::sanitizeForSerialization($input);

samples/client/petstore/php-nextgen/OpenAPIClient-php/test/ParametersTest.php

@@ -50,10 +50,10 @@ public function testInlineAdditionalProperties()
     {
         $param = new \stdClass();
         $param->foo = 'bar';
-        $this->fakeApi->testInlineAdditionalProperties($param);
+        $this->fakeApi->testInlineAdditionalProperties(array($param));
 
         $request = $this->fakeHttpClient->getLastRequest();
-        $this->assertSame('{"foo":"bar"}', $request->getBody()->getContents());
+        $this->assertSame('[{"foo":"bar"}]', $request->getBody()->getContents());
     }
 
     /**

samples/client/petstore/php-nextgen/OpenAPIClient-php/test/PetApiTest.php

@@ -8,6 +8,8 @@
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Assert;
 
+require_once __DIR__ . '/FakeHttpClient.php';
+
 class PetApiTest extends TestCase
 {
 
@@ -117,15 +119,15 @@ public function testGetPetByIdWithHttpInfo()
 
     public function testFindPetByStatus()
     {
-        $response = $this->api->findPetsByStatus('available');
+        $response = $this->api->findPetsByStatus(array('available'));
         $this->assertGreaterThan(0, count($response)); // at least one object returned
 
         $this->assertInstanceOf(Pet::class, $response[0]); // verify the object is Pet
         foreach ($response as $pet) {
             $this->assertSame('available', $pet->getStatus());
         }
 
-        $response = $this->api->findPetsByStatus('unknown_and_incorrect_status');
+        $response = $this->api->findPetsByStatus(array('unknown_and_incorrect_status'));
         $this->assertCount(0, $response);
     }
 
@@ -281,14 +283,6 @@ public function testGetPetByIdWithByteArray()
     }
      */
 
-    // test empty object serialization
-    public function testEmptyPetSerialization()
-    {
-        $new_pet = new Model\Pet;
-        // the empty object should be serialised to {}
-        $this->assertSame("{}", "$new_pet");
-    }
-
     // test inheritance in the model
     public function testInheritance()
     {