OpenAPITools · ackintosh · Nov 26, 2018 · Nov 19, 2018 · Nov 19, 2018 · Nov 19, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -80,6 +80,9 @@ before_install:
   - sudo sh -c 'curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list'
   - sudo apt-get update
   - sudo apt-get install dart
+  # switch to php7
+  - phpenv global 7.1
+  - php -v
   # install perl module
   #- cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
   #- cpanm Test::Exception Test::More Log::Any LWP::UserAgent JSON URI:Query Module::Runtime DateTime Module::Find Moose::Role

diff --git a/modules/openapi-generator/src/main/resources/php/api_test.mustache b/modules/openapi-generator/src/main/resources/php/api_test.mustache
@@ -21,6 +21,7 @@ namespace {{invokerPackage}};
 use \{{invokerPackage}}\Configuration;
 use \{{invokerPackage}}\ApiException;
 use \{{invokerPackage}}\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * {{classname}}Test Class Doc Comment
@@ -30,7 +31,7 @@ use \{{invokerPackage}}\ObjectSerializer;
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-{{#operations}}class {{classname}}Test extends \PHPUnit_Framework_TestCase
+{{#operations}}class {{classname}}Test extends TestCase
 {
 
     /**

diff --git a/modules/openapi-generator/src/main/resources/php/composer.mustache b/modules/openapi-generator/src/main/resources/php/composer.mustache
@@ -21,14 +21,14 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
+        "php": ">=7.1",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "guzzlehttp/guzzle": "^6.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^7.4",
         "squizlabs/php_codesniffer": "~2.6",
         "friendsofphp/php-cs-fixer": "~2.12"
     },

diff --git a/modules/openapi-generator/src/main/resources/php/model_test.mustache b/modules/openapi-generator/src/main/resources/php/model_test.mustache
@@ -21,6 +21,8 @@
 
 namespace {{invokerPackage}};
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * {{classname}}Test Class Doc Comment
  *
@@ -30,7 +32,7 @@ namespace {{invokerPackage}};
  * @author      OpenAPI Generator team
  * @link        https://openapi-generator.tech
  */
-class {{classname}}Test extends \PHPUnit_Framework_TestCase
+class {{classname}}Test extends TestCase
 {
 
     /**

diff --git a/modules/openapi-generator/src/main/resources/php/phpunit.xml.mustache b/modules/openapi-generator/src/main/resources/php/phpunit.xml.mustache
@@ -6,7 +6,7 @@
          convertWarningsToExceptions="true"
          stopOnFailure="false">
     <testsuites>
-        <testsuite>
+        <testsuite name="tests">
             <directory>{{apiTestPath}}</directory>
             <directory>{{modelTestPath}}</directory>
         </testsuite>

diff --git a/samples/client/petstore-security-test/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/client/petstore-security-test/php/OpenAPIClient-php/.openapi-generator/VERSION
@@ -1 +1 @@
-3.3.0-SNAPSHOT
+3.3.4-SNAPSHOT
diff --git a/samples/client/petstore-security-test/php/OpenAPIClient-php/composer.json b/samples/client/petstore-security-test/php/OpenAPIClient-php/composer.json
@@ -18,14 +18,14 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
+        "php": ">=7.1",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "guzzlehttp/guzzle": "^6.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^7.4",
         "squizlabs/php_codesniffer": "~2.6",
         "friendsofphp/php-cs-fixer": "~2.12"
     },

diff --git a/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: [email protected] *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.4-SNAPSHOT
  */
 
 /**
@@ -253,10 +253,10 @@ protected function testCodeInjectEndRnNRRequest($unknown_base_type = null)
         // for model (json/xml)
         if (isset($_tempBody)) {
             // $_tempBody is the method argument, if present
-            $httpBody = $_tempBody;
-            // \stdClass has no __toString(), so we should encode it manually
-            if ($httpBody instanceof \stdClass && $headers['Content-Type'] === 'application/json') {
-                $httpBody = \GuzzleHttp\json_encode($httpBody);
+            if ($headers['Content-Type'] === 'application/json') {
+                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($_tempBody));
+            } else {
+                $httpBody = $_tempBody;
             }
         } elseif (count($formParams) > 0) {
             if ($multipart) {

diff --git a/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/ApiException.php b/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/ApiException.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: [email protected] *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.4-SNAPSHOT
  */
 
 /**

diff --git a/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/Configuration.php b/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/Configuration.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: [email protected] *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.4-SNAPSHOT
  */
 
 /**

diff --git a/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/HeaderSelector.php
@@ -17,7 +17,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: [email protected] *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.4-SNAPSHOT
  */
 
 /**

diff --git a/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/Model/ModelInterface.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: [email protected] *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.4-SNAPSHOT
  */
 
 /**

diff --git a/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/Model/ModelReturn.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: [email protected] *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.4-SNAPSHOT
  */
 
 /**

diff --git a/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore-security-test/php/OpenAPIClient-php/lib/ObjectSerializer.php
@@ -18,7 +18,7 @@
  * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
  * Contact: [email protected] *_/ ' \" =end -- \\r\\n \\n \\r
  * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.0-SNAPSHOT
+ * OpenAPI Generator version: 3.3.4-SNAPSHOT
  */
 
 /**
@@ -29,6 +29,8 @@
 
 namespace OpenAPI\Client;
 
+use OpenAPI\Client\Model\ModelInterface;
+
 /**
  * ObjectSerializer Class Doc Comment
  *
@@ -61,19 +63,25 @@ public static function sanitizeForSerialization($data, $type = null, $format = n
             return $data;
         } elseif (is_object($data)) {
             $values = [];
-            $formats = $data::openAPIFormats();
-            foreach ($data::openAPITypes() as $property => $openAPIType) {
-                $getter = $data::getters()[$property];
-                $value = $data->$getter();
-                if ($value !== null
-                    && !in_array($openAPIType, ['DateTime', 'bool', 'boolean', 'byte', 'double', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)
-                    && method_exists($openAPIType, 'getAllowableEnumValues')
-                    && !in_array($value, $openAPIType::getAllowableEnumValues(), true)) {
-                    $imploded = implode("', '", $openAPIType::getAllowableEnumValues());
-                    throw new \InvalidArgumentException("Invalid value for enum '$openAPIType', must be one of: '$imploded'");
+            if ($data instanceof ModelInterface) {
+                $formats = $data::openAPIFormats();
+                foreach ($data::openAPITypes() as $property => $openAPIType) {
+                    $getter = $data::getters()[$property];
+                    $value = $data->$getter();
+                    if ($value !== null
+                        && !in_array($openAPIType, ['DateTime', 'bool', 'boolean', 'byte', 'double', 'float', 'int', 'integer', 'mixed', 'number', 'object', 'string', 'void'], true)
+                        && method_exists($openAPIType, 'getAllowableEnumValues')
+                        && !in_array($value, $openAPIType::getAllowableEnumValues(), true)) {
+                        $imploded = implode("', '", $openAPIType::getAllowableEnumValues());
+                        throw new \InvalidArgumentException("Invalid value for enum '$openAPIType', must be one of: '$imploded'");
+                    }
+                    if ($value !== null) {
+                        $values[$data::attributeMap()[$property]] = self::sanitizeForSerialization($value, $openAPIType, $formats[$property]);
+                    }
                 }
-                if ($value !== null) {
-                    $values[$data::attributeMap()[$property]] = self::sanitizeForSerialization($value, $openAPIType, $formats[$property]);
+            } else {
+                foreach($data as $property => $value) {
+                    $values[$property] = self::sanitizeForSerialization($value);
                 }
             }
             return (object)$values;

diff --git a/samples/client/petstore-security-test/php/OpenAPIClient-php/phpunit.xml.dist b/samples/client/petstore-security-test/php/OpenAPIClient-php/phpunit.xml.dist
@@ -6,7 +6,7 @@
          convertWarningsToExceptions="true"
          stopOnFailure="false">
     <testsuites>
-        <testsuite>
+        <testsuite name="tests">
             <directory>./test/Api</directory>
             <directory>./test/Model</directory>
         </testsuite>

diff --git a/samples/client/petstore/php/OpenAPIClient-php/composer.json b/samples/client/petstore/php/OpenAPIClient-php/composer.json
@@ -18,14 +18,14 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
+        "php": ">=7.1",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "guzzlehttp/guzzle": "^6.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^7.4",
         "squizlabs/php_codesniffer": "~2.6",
         "friendsofphp/php-cs-fixer": "~2.12"
     },

diff --git a/samples/client/petstore/php/OpenAPIClient-php/phpunit.xml.dist b/samples/client/petstore/php/OpenAPIClient-php/phpunit.xml.dist
@@ -6,7 +6,7 @@
          convertWarningsToExceptions="true"
          stopOnFailure="false">
     <testsuites>
-        <testsuite>
+        <testsuite name="tests">
             <directory>./test/Api</directory>
             <directory>./test/Model</directory>
         </testsuite>

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
@@ -31,6 +31,7 @@
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * AnotherFakeApiTest Class Doc Comment
@@ -40,7 +41,7 @@
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-class AnotherFakeApiTest extends \PHPUnit_Framework_TestCase
+class AnotherFakeApiTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
@@ -31,6 +31,7 @@
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * FakeApiTest Class Doc Comment
@@ -40,7 +41,7 @@
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-class FakeApiTest extends \PHPUnit_Framework_TestCase
+class FakeApiTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
@@ -31,6 +31,7 @@
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * FakeClassnameTags123ApiTest Class Doc Comment
@@ -40,7 +41,7 @@
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-class FakeClassnameTags123ApiTest extends \PHPUnit_Framework_TestCase
+class FakeClassnameTags123ApiTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
@@ -31,6 +31,7 @@
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * PetApiTest Class Doc Comment
@@ -40,7 +41,7 @@
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-class PetApiTest extends \PHPUnit_Framework_TestCase
+class PetApiTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
@@ -31,6 +31,7 @@
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * StoreApiTest Class Doc Comment
@@ -40,7 +41,7 @@
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-class StoreApiTest extends \PHPUnit_Framework_TestCase
+class StoreApiTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
@@ -31,6 +31,7 @@
 use \OpenAPI\Client\Configuration;
 use \OpenAPI\Client\ApiException;
 use \OpenAPI\Client\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * UserApiTest Class Doc Comment
@@ -40,7 +41,7 @@
  * @author   OpenAPI Generator team
  * @link     https://openapi-generator.tech
  */
-class UserApiTest extends \PHPUnit_Framework_TestCase
+class UserApiTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
@@ -29,6 +29,8 @@
 
 namespace OpenAPI\Client;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * AdditionalPropertiesClassTest Class Doc Comment
  *
@@ -38,7 +40,7 @@
  * @author      OpenAPI Generator team
  * @link        https://openapi-generator.tech
  */
-class AdditionalPropertiesClassTest extends \PHPUnit_Framework_TestCase
+class AdditionalPropertiesClassTest extends TestCase
 {
 
     /**

diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalFarmTest.php
@@ -29,6 +29,8 @@
 
 namespace OpenAPI\Client;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * AnimalFarmTest Class Doc Comment
  *
@@ -38,7 +40,7 @@
  * @author      OpenAPI Generator team
  * @link        https://openapi-generator.tech
  */
-class AnimalFarmTest extends \PHPUnit_Framework_TestCase
+class AnimalFarmTest extends TestCase
 {
 
     /**