Merge pull request #1119 from swagger-api/codegen-issue-10392

HugoMario · web-flow · commit 47d688651245 · 2023-03-18T06:50:11.000-05:00
PHP 7.4 Support
diff --git a/src/main/java/io/swagger/codegen/v3/generators/php/PhpClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/php/PhpClientCodegen.java
@@ -110,7 +110,7 @@ public PhpClientCodegen() {
 
         instantiationTypes.put("array", "array");
         instantiationTypes.put("map", "map");
-        
+
         // provide primitives to mustache template
         List<String> sortedLanguageSpecificPrimitives= new ArrayList<String>(languageSpecificPrimitives);
         Collections.sort(sortedLanguageSpecificPrimitives);
@@ -295,6 +295,12 @@ public void processOpts() {
         if (additionalProperties.containsKey(VARIABLE_NAMING_CONVENTION)) {
             this.setParameterNamingConvention((String) additionalProperties.get(VARIABLE_NAMING_CONVENTION));
         }
+        if (StringUtils.isBlank(composerVendorName) && additionalProperties.get(CodegenConstants.GIT_USER_ID) != null) {
+            additionalProperties.put(CodegenConstants.GIT_USER_ID, StringUtils.lowerCase(additionalProperties.get(CodegenConstants.GIT_USER_ID).toString()));
+        }
+        if (StringUtils.isBlank(composerProjectName) && additionalProperties.get(CodegenConstants.GIT_REPO_ID) != null) {
+            additionalProperties.put(CodegenConstants.GIT_REPO_ID, StringUtils.lowerCase(additionalProperties.get(CodegenConstants.GIT_REPO_ID).toString()));
+        }
 
         additionalProperties.put("escapedInvokerPackage", invokerPackage.replace("\\", "\\\\"));
 
diff --git a/src/main/resources/handlebars/php/.php_cs b/src/main/resources/handlebars/php/.php_cs
@@ -1,18 +1,23 @@
 <?php
 
-return Symfony\CS\Config::create()
-    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
+return PhpCsFixer\Config::create()
     ->setUsingCache(true)
-    ->fixers(
-        [
-            'ordered_use',
-            'phpdoc_order',
-            'short_array_syntax',
-            'strict',
-            'strict_param'
-        ]
-    )
-    ->finder(
-        Symfony\CS\Finder\DefaultFinder::create()
-            ->in(__DIR__)
+    ->setRules([
+        '@PSR2' => true,
+        'ordered_imports' => true,
+        'phpdoc_order' => true,
+        'array_syntax' => [ 'syntax' => 'short' ],
+        'strict_comparison' => true,
+        'strict_param' => true,
+        'no_trailing_whitespace' => false,
+        'no_trailing_whitespace_in_comment' => false,
+        'braces' => false,
+        'single_blank_line_at_eof' => false,
+        'blank_line_after_namespace' => false,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+        ->exclude('test')
+        ->exclude('tests')
+        ->in(__DIR__)
     );
diff --git a/src/main/resources/handlebars/php/HeaderSelector.mustache b/src/main/resources/handlebars/php/HeaderSelector.mustache
@@ -97,4 +97,3 @@ class HeaderSelector
         }
     }
 }
-
diff --git a/src/main/resources/handlebars/php/ObjectSerializer.mustache b/src/main/resources/handlebars/php/ObjectSerializer.mustache
@@ -33,11 +33,12 @@ class ObjectSerializer
      * Serialize data
      *
      * @param mixed  $data   the data to serialize
+     * @param string $type   the SwaggerType of the data
      * @param string $format the format of the Swagger type of the data
      *
      * @return string|object serialized form of $data
      */
-    public static function sanitizeForSerialization($data, $format = null)
+    public static function sanitizeForSerialization($data, $type = null, $format = null)
     {
         if (is_scalar($data) || null === $data) {
             return $data;
@@ -48,6 +49,11 @@ class ObjectSerializer
                 $data[$property] = self::sanitizeForSerialization($value);
             }
             return $data;
+        } elseif ($data instanceof \stdClass) {
+            foreach ($data as $property => $value) {
+                $data->$property = self::sanitizeForSerialization($value);
+            }
+            return $data;
         } elseif (is_object($data)) {
             $values = [];
             $formats = $data::swaggerFormats();
@@ -57,7 +63,7 @@ class ObjectSerializer
                 if ($value !== null
                     && !in_array($swaggerType, [{{&primitives}}], true)
                     && method_exists($swaggerType, 'getAllowableEnumValues')
-                    && !in_array($value, $swaggerType::getAllowableEnumValues())) {
+                    && !in_array($value, $swaggerType::getAllowableEnumValues(), true)) {
                     $imploded = implode("', '", $swaggerType::getAllowableEnumValues());
                     throw new \InvalidArgumentException("Invalid value for enum '$swaggerType', must be one of: '$imploded'");
                 }
@@ -108,23 +114,22 @@ class ObjectSerializer
      * later.
      *
      * @param string[]|string|\DateTime $object an object to be serialized to a string
-     * @param string|null $format the format of the parameter
      *
      * @return string the serialized object
      */
-    public static function toQueryValue($object, $format = null)
+    public static function toQueryValue($object)
     {
         if (is_array($object)) {
             return implode(',', $object);
         } else {
-            return self::toString($object, $format);
+            return self::toString($object);
         }
     }
 
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the header. If it's a string, pass through unchanged
-     * If it's a datetime object, format it in RFC3339
+     * If it's a datetime object, format it in ISO8601
      *
      * @param string $value a string which will be part of the header
      *
@@ -138,7 +143,7 @@ class ObjectSerializer
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the http body (form parameter). If it's a string, pass through unchanged
-     * If it's a datetime object, format it in RFC3339
+     * If it's a datetime object, format it in ISO8601
      *
      * @param string|\SplFileObject $value the value of the form parameter
      *
@@ -156,18 +161,16 @@ class ObjectSerializer
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the parameter. If it's a string, pass through unchanged
-     * If it's a datetime object, format it in RFC3339
-     * If it's a date, format it in Y-m-d
+     * If it's a datetime object, format it in ISO8601
      *
      * @param string|\DateTime $value the value of the parameter
-     * @param string|null $format the format of the parameter
      *
      * @return string the header string
      */
-    public static function toString($value, $format = null)
+    public static function toString($value)
     {
-        if ($value instanceof \DateTime) {
-            return ($format === 'date') ? $value->format('Y-m-d') : $value->format(\DateTime::ATOM);
+        if ($value instanceof \DateTime) { // datetime in ISO8601 format
+            return $value->format(\DateTime::ATOM);
         } else {
             return $value;
         }
@@ -276,7 +279,7 @@ class ObjectSerializer
 
             return new \SplFileObject($filename, 'r');
         } elseif (method_exists($class, 'getAllowableEnumValues')) {
-            if (!in_array($data, $class::getAllowableEnumValues())) {
+            if (!in_array($data, $class::getAllowableEnumValues(), true)) {
                 $imploded = implode("', '", $class::getAllowableEnumValues());
                 throw new \InvalidArgumentException("Invalid value for enum '$class', must be one of: '$imploded'");
             }
diff --git a/src/main/resources/handlebars/php/api_test.mustache b/src/main/resources/handlebars/php/api_test.mustache
@@ -21,6 +21,7 @@ namespace {{invokerPackage}};
 use {{backslash}}{{invokerPackage}}\Configuration;
 use {{backslash}}{{invokerPackage}}\ApiException;
 use {{backslash}}{{invokerPackage}}\ObjectSerializer;
+use PHPUnit\Framework\TestCase;
 
 /**
  * {{classname}}Test Class Doc Comment
@@ -30,47 +31,49 @@ use {{backslash}}{{invokerPackage}}\ObjectSerializer;
  * @author   Swagger Codegen team
  * @link     https://github.com/swagger-api/swagger-codegen
  */
-{{#operations}}class {{classname}}Test extends \PHPUnit_Framework_TestCase
+{{#operations}}class {{classname}}Test extends TestCase
 {
 
     /**
      * Setup before running any test cases
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
     {{#operation}}
+    {{#contents}}
 
     /**
      * Test case for {{{operationId}}}
      *
      * {{{summary}}}.
      *
      */
-    public function test{{vendorExtensions.x-testOperationId}}()
+    public function test{{vendorExtensions.x-testOperationId}}{{#isForm}}Form{{/isForm}}()
     {
     }
+    {{/contents}}
     {{/operation}}
 }
 {{/operations}}
diff --git a/src/main/resources/handlebars/php/composer.mustache b/src/main/resources/handlebars/php/composer.mustache
@@ -8,6 +8,7 @@
         "swagger",
         "php",
         "sdk",
+        "rest",
         "api"
     ],
     "homepage": "http://swagger.io",
@@ -19,16 +20,16 @@
         }
     ],
     "require": {
-        "php": ">=5.5",
+        "php": "^7.4 || ^8.0",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "guzzlehttp/guzzle": "^6.2"
+        "guzzlehttp/guzzle": "^7.3",
+        "guzzlehttp/psr7": "^1.7 || ^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
-        "squizlabs/php_codesniffer": "~2.6",
-        "friendsofphp/php-cs-fixer": "~1.12"
+        "phpunit/phpunit": "^8.0 || ^9.0",
+        "friendsofphp/php-cs-fixer": "^3.5"
     },
     "autoload": {
         "psr-4": { "{{escapedInvokerPackage}}\\" : "{{srcBasePath}}/" }
diff --git a/src/main/resources/handlebars/php/model_generic.mustache b/src/main/resources/handlebars/php/model_generic.mustache
@@ -166,7 +166,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
         {{#discriminator}}
 
         // Initialize discriminator property with the model name.
-        $discriminator = array_search('{{discriminator.propertyName}}', self::$attributeMap);
+        $discriminator = array_search('{{discriminator.propertyName}}', self::$attributeMap, true);
         $this->container[$discriminator] = static::$swaggerModelName;
         {{/discriminator}}
     }
@@ -353,7 +353,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
      *
      * @return boolean
      */
-    #[\ReturnTypeWillChange] 
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return isset($this->container[$offset]);
@@ -366,7 +366,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
      *
      * @return mixed
      */
-    #[\ReturnTypeWillChange] 
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return isset($this->container[$offset]) ? $this->container[$offset] : null;
@@ -380,7 +380,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
      *
      * @return void
      */
-    #[\ReturnTypeWillChange] 
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         if (is_null($offset)) {
@@ -397,7 +397,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa
      *
      * @return void
      */
-    #[\ReturnTypeWillChange] 
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->container[$offset]);
diff --git a/src/main/resources/handlebars/php/model_test.mustache b/src/main/resources/handlebars/php/model_test.mustache
@@ -21,6 +21,8 @@
 
 namespace {{invokerPackage}};
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * {{classname}}Test Class Doc Comment
  *
@@ -30,34 +32,34 @@ namespace {{invokerPackage}};
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen
  */
-class {{classname}}Test extends \PHPUnit_Framework_TestCase
+class {{classname}}Test extends TestCase
 {
 
     /**
      * Setup before running any test case
      */
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
     }
 
     /**
      * Setup before running each test case
      */
-    public function setUp()
+    public function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case
      */
-    public function tearDown()
+    public function tearDown(): void
     {
     }
 
     /**
      * Clean up after running all test cases
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
     }
 

Original file line number	Diff line number	Diff line change
`@@ -97,4 +97,3 @@ class HeaderSelector`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`}`
`100`		`-`
Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,12 @@ class ObjectSerializer`
`33`	`33`	`* Serialize data`
`34`	`34`	`*`
`35`	`35`	`* @param mixed $data the data to serialize`
	`36`	`+ * @param string $type the SwaggerType of the data`
`36`	`37`	`* @param string $format the format of the Swagger type of the data`
`37`	`38`	`*`
`38`	`39`	`* @return string\|object serialized form of $data`
`39`	`40`	`*/`
`40`		`- public static function sanitizeForSerialization($data, $format = null)`
	`41`	`+ public static function sanitizeForSerialization($data, $type = null, $format = null)`
`41`	`42`	`{`
`42`	`43`	`if (is_scalar($data) \|\| null === $data) {`
`43`	`44`	`return $data;`
`@@ -48,6 +49,11 @@ class ObjectSerializer`
`48`	`49`	`$data[$property] = self::sanitizeForSerialization($value);`
`49`	`50`	`}`
`50`	`51`	`return $data;`
	`52`	`+ } elseif ($data instanceof \stdClass) {`
	`53`	`+ foreach ($data as $property => $value) {`
	`54`	`+ $data->$property = self::sanitizeForSerialization($value);`
	`55`	`+ }`
	`56`	`+ return $data;`
`51`	`57`	`} elseif (is_object($data)) {`
`52`	`58`	`$values = [];`
`53`	`59`	`$formats = $data::swaggerFormats();`
`@@ -57,7 +63,7 @@ class ObjectSerializer`
`57`	`63`	`if ($value !== null`
`58`	`64`	`&& !in_array($swaggerType, [{{&primitives}}], true)`
`59`	`65`	`&& method_exists($swaggerType, 'getAllowableEnumValues')`
`60`		`- && !in_array($value, $swaggerType::getAllowableEnumValues())) {`
	`66`	`+ && !in_array($value, $swaggerType::getAllowableEnumValues(), true)) {`
`61`	`67`	`$imploded = implode("', '", $swaggerType::getAllowableEnumValues());`
`62`	`68`	`throw new \InvalidArgumentException("Invalid value for enum '$swaggerType', must be one of: '$imploded'");`
`63`	`69`	`}`
`@@ -108,23 +114,22 @@ class ObjectSerializer`
`108`	`114`	`* later.`
`109`	`115`	`*`
`110`	`116`	`* @param string[]\|string\|\DateTime $object an object to be serialized to a string`
`111`		`- * @param string\|null $format the format of the parameter`
`112`	`117`	`*`
`113`	`118`	`* @return string the serialized object`
`114`	`119`	`*/`
`115`		`- public static function toQueryValue($object, $format = null)`
	`120`	`+ public static function toQueryValue($object)`
`116`	`121`	`{`
`117`	`122`	`if (is_array($object)) {`
`118`	`123`	`return implode(',', $object);`
`119`	`124`	`} else {`
`120`		`- return self::toString($object, $format);`
	`125`	`+ return self::toString($object);`
`121`	`126`	`}`
`122`	`127`	`}`
`123`	`128`
`124`	`129`	`/**`
`125`	`130`	`* Take value and turn it into a string suitable for inclusion in`
`126`	`131`	`* the header. If it's a string, pass through unchanged`
`127`		`- * If it's a datetime object, format it in RFC3339`
	`132`	`+ * If it's a datetime object, format it in ISO8601`
`128`	`133`	`*`
`129`	`134`	`* @param string $value a string which will be part of the header`
`130`	`135`	`*`
`@@ -138,7 +143,7 @@ class ObjectSerializer`
`138`	`143`	`/**`
`139`	`144`	`* Take value and turn it into a string suitable for inclusion in`
`140`	`145`	`* the http body (form parameter). If it's a string, pass through unchanged`
`141`		`- * If it's a datetime object, format it in RFC3339`
	`146`	`+ * If it's a datetime object, format it in ISO8601`
`142`	`147`	`*`
`143`	`148`	`* @param string\|\SplFileObject $value the value of the form parameter`
`144`	`149`	`*`
`@@ -156,18 +161,16 @@ class ObjectSerializer`
`156`	`161`	`/**`
`157`	`162`	`* Take value and turn it into a string suitable for inclusion in`
`158`	`163`	`* the parameter. If it's a string, pass through unchanged`
`159`		`- * If it's a datetime object, format it in RFC3339`
`160`		`- * If it's a date, format it in Y-m-d`
	`164`	`+ * If it's a datetime object, format it in ISO8601`
`161`	`165`	`*`
`162`	`166`	`* @param string\|\DateTime $value the value of the parameter`
`163`		`- * @param string\|null $format the format of the parameter`
`164`	`167`	`*`
`165`	`168`	`* @return string the header string`
`166`	`169`	`*/`
`167`		`- public static function toString($value, $format = null)`
	`170`	`+ public static function toString($value)`
`168`	`171`	`{`
`169`		`- if ($value instanceof \DateTime) {`
`170`		`- return ($format === 'date') ? $value->format('Y-m-d') : $value->format(\DateTime::ATOM);`
	`172`	`+ if ($value instanceof \DateTime) { // datetime in ISO8601 format`
	`173`	`+ return $value->format(\DateTime::ATOM);`
`171`	`174`	`} else {`
`172`	`175`	`return $value;`
`173`	`176`	`}`
`@@ -276,7 +279,7 @@ class ObjectSerializer`
`276`	`279`
`277`	`280`	`return new \SplFileObject($filename, 'r');`
`278`	`281`	`} elseif (method_exists($class, 'getAllowableEnumValues')) {`
`279`		`- if (!in_array($data, $class::getAllowableEnumValues())) {`
	`282`	`+ if (!in_array($data, $class::getAllowableEnumValues(), true)) {`
`280`	`283`	`$imploded = implode("', '", $class::getAllowableEnumValues());`
`281`	`284`	`throw new \InvalidArgumentException("Invalid value for enum '$class', must be one of: '$imploded'");`
`282`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ namespace {{invokerPackage}};`
`21`	`21`	`use {{backslash}}{{invokerPackage}}\Configuration;`
`22`	`22`	`use {{backslash}}{{invokerPackage}}\ApiException;`
`23`	`23`	`use {{backslash}}{{invokerPackage}}\ObjectSerializer;`
	`24`	`+use PHPUnit\Framework\TestCase;`
`24`	`25`
`25`	`26`	`/**`
`26`	`27`	`* {{classname}}Test Class Doc Comment`
`@@ -30,47 +31,49 @@ use {{backslash}}{{invokerPackage}}\ObjectSerializer;`
`30`	`31`	`* @author Swagger Codegen team`
`31`	`32`	`* @link https://github.com/swagger-api/swagger-codegen`
`32`	`33`	`*/`
`33`		`-{{#operations}}class {{classname}}Test extends \PHPUnit_Framework_TestCase`
	`34`	`+{{#operations}}class {{classname}}Test extends TestCase`
`34`	`35`	`{`
`35`	`36`
`36`	`37`	`/**`
`37`	`38`	`* Setup before running any test cases`
`38`	`39`	`*/`
`39`		`- public static function setUpBeforeClass()`
	`40`	`+ public static function setUpBeforeClass(): void`
`40`	`41`	`{`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`/**`
`44`	`45`	`* Setup before running each test case`
`45`	`46`	`*/`
`46`		`- public function setUp()`
	`47`	`+ public function setUp(): void`
`47`	`48`	`{`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`/**`
`51`	`52`	`* Clean up after running each test case`
`52`	`53`	`*/`
`53`		`- public function tearDown()`
	`54`	`+ public function tearDown(): void`
`54`	`55`	`{`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`/**`
`58`	`59`	`* Clean up after running all test cases`
`59`	`60`	`*/`
`60`		`- public static function tearDownAfterClass()`
	`61`	`+ public static function tearDownAfterClass(): void`
`61`	`62`	`{`
`62`	`63`	`}`
`63`	`64`	`{{#operation}}`
	`65`	`+ {{#contents}}`
`64`	`66`
`65`	`67`	`/**`
`66`	`68`	`* Test case for {{{operationId}}}`
`67`	`69`	`*`
`68`	`70`	`* {{{summary}}}.`
`69`	`71`	`*`
`70`	`72`	`*/`
`71`		`- public function test{{vendorExtensions.x-testOperationId}}()`
	`73`	`+ public function test{{vendorExtensions.x-testOperationId}}{{#isForm}}Form{{/isForm}}()`
`72`	`74`	`{`
`73`	`75`	`}`
	`76`	`+ {{/contents}}`
`74`	`77`	`{{/operation}}`
`75`	`78`	`}`
`76`	`79`	`{{/operations}}`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa`
`166`	`166`	`{{#discriminator}}`
`167`	`167`
`168`	`168`	`// Initialize discriminator property with the model name.`
`169`		`- $discriminator = array_search('{{discriminator.propertyName}}', self::$attributeMap);`
	`169`	`+ $discriminator = array_search('{{discriminator.propertyName}}', self::$attributeMap, true);`
`170`	`170`	`$this->container[$discriminator] = static::$swaggerModelName;`
`171`	`171`	`{{/discriminator}}`
`172`	`172`	`}`
`@@ -353,7 +353,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa`
`353`	`353`	`*`
`354`	`354`	`* @return boolean`
`355`	`355`	`*/`
`356`		`- #[\ReturnTypeWillChange]`
	`356`	`+ #[\ReturnTypeWillChange]`
`357`	`357`	`public function offsetExists($offset)`
`358`	`358`	`{`
`359`	`359`	`return isset($this->container[$offset]);`
`@@ -366,7 +366,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa`
`366`	`366`	`*`
`367`	`367`	`* @return mixed`
`368`	`368`	`*/`
`369`		`- #[\ReturnTypeWillChange]`
	`369`	`+ #[\ReturnTypeWillChange]`
`370`	`370`	`public function offsetGet($offset)`
`371`	`371`	`{`
`372`	`372`	`return isset($this->container[$offset]) ? $this->container[$offset] : null;`
`@@ -380,7 +380,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa`
`380`	`380`	`*`
`381`	`381`	`* @return void`
`382`	`382`	`*/`
`383`		`- #[\ReturnTypeWillChange]`
	`383`	`+ #[\ReturnTypeWillChange]`
`384`	`384`	`public function offsetSet($offset, $value)`
`385`	`385`	`{`
`386`	`386`	`if (is_null($offset)) {`
`@@ -397,7 +397,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}{{^pa`
`397`	`397`	`*`
`398`	`398`	`* @return void`
`399`	`399`	`*/`
`400`		`- #[\ReturnTypeWillChange]`
	`400`	`+ #[\ReturnTypeWillChange]`
`401`	`401`	`public function offsetUnset($offset)`
`402`	`402`	`{`
`403`	`403`	`unset($this->container[$offset]);`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`
`22`	`22`	`namespace {{invokerPackage}};`
`23`	`23`
	`24`	`+use PHPUnit\Framework\TestCase;`
	`25`	`+`
`24`	`26`	`/**`
`25`	`27`	`* {{classname}}Test Class Doc Comment`
`26`	`28`	`*`
`@@ -30,34 +32,34 @@ namespace {{invokerPackage}};`
`30`	`32`	`* @author Swagger Codegen team`
`31`	`33`	`* @link https://github.com/swagger-api/swagger-codegen`
`32`	`34`	`*/`
`33`		`-class {{classname}}Test extends \PHPUnit_Framework_TestCase`
	`35`	`+class {{classname}}Test extends TestCase`
`34`	`36`	`{`
`35`	`37`
`36`	`38`	`/**`
`37`	`39`	`* Setup before running any test case`
`38`	`40`	`*/`
`39`		`- public static function setUpBeforeClass()`
	`41`	`+ public static function setUpBeforeClass(): void`
`40`	`42`	`{`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`/**`
`44`	`46`	`* Setup before running each test case`
`45`	`47`	`*/`
`46`		`- public function setUp()`
	`48`	`+ public function setUp(): void`
`47`	`49`	`{`
`48`	`50`	`}`
`49`	`51`
`50`	`52`	`/**`
`51`	`53`	`* Clean up after running each test case`
`52`	`54`	`*/`
`53`		`- public function tearDown()`
	`55`	`+ public function tearDown(): void`
`54`	`56`	`{`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`/**`
`58`	`60`	`* Clean up after running all test cases`
`59`	`61`	`*/`
`60`		`- public static function tearDownAfterClass()`
	`62`	`+ public static function tearDownAfterClass(): void`
`61`	`63`	`{`
`62`	`64`	`}`
`63`	`65`