loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[php-symfony] Support for default scalar value of properties in model (#16605)

Browse Source 
* Add support for default scalar value of properties in php-symfony models. Default values now returns in getter-functions

* Revert nullable type-hinting. Move default values from getter to property initialize.
Made changes in __construct:
Now value of properties rewrites only if key exist in $data array.
This commit is contained in:
Artem
2023-10-01 15:32:32 +02:00
committed by GitHub
parent 03781d3a93
commit 039c1698b0
9 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java
View File

@@ -483,7 +483,7 @@ public class PhpSymfonyServerCodegen extends AbstractPhpCodegen implements Codeg
return dataType;
}
return "\\" + dataType;
return "\\" + dataType;
}
/**

8
modules/openapi-generator/src/main/resources/php-symfony/model_generic.mustache vendored
View File

@@ -12,9 +12,11 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}
parent::__construct($data);
{{/parentSchema}}
{{#vars}}
$this->{{name}} = $data['{{name}}'] ?? null;
{{/vars}}
if (is_array($data)) {
{{#vars}}
$this->{{name}} = array_key_exists('{{name}}', $data) ? $data['{{name}}'] : $this->{{name}};
{{/vars}}
}
}
{{#vars}}

2
modules/openapi-generator/src/main/resources/php-symfony/model_variables.mustache vendored
View File

@@ -98,4 +98,4 @@
{{/minItems}}
{{/hasValidation}}
*/
protected {{{vendorExtensions.x-parameter-type}}} ${{name}} = null;
protected {{{vendorExtensions.x-parameter-type}}} ${{name}} = {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}};

8
samples/server/petstore/php-symfony/SymfonyBundle-php/Model/ApiResponse.php
View File

@@ -74,9 +74,11 @@ class ApiResponse
*/
public function __construct(array $data = null)
{
$this->code = $data['code'] ?? null;
$this->type = $data['type'] ?? null;
$this->message = $data['message'] ?? null;
if (is_array($data)) {
$this->code = array_key_exists('code', $data) ? $data['code'] : $this->code;
$this->type = array_key_exists('type', $data) ? $data['type'] : $this->type;
$this->message = array_key_exists('message', $data) ? $data['message'] : $this->message;
}
}
/**

6
samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Category.php
View File

@@ -67,8 +67,10 @@ class Category
*/
public function __construct(array $data = null)
{
$this->id = $data['id'] ?? null;
$this->name = $data['name'] ?? null;
if (is_array($data)) {
$this->id = array_key_exists('id', $data) ? $data['id'] : $this->id;
$this->name = array_key_exists('name', $data) ? $data['name'] : $this->name;
}
}
/**

16
samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Order.php
View File

@@ -93,7 +93,7 @@ class Order
* @Assert\Type("bool")
* @Type("bool")
*/
protected ?bool $complete = null;
protected ?bool $complete = false;
/**
* Constructor
@@ -101,12 +101,14 @@ class Order
*/
public function __construct(array $data = null)
{
$this->id = $data['id'] ?? null;
$this->petId = $data['petId'] ?? null;
$this->quantity = $data['quantity'] ?? null;
$this->shipDate = $data['shipDate'] ?? null;
$this->status = $data['status'] ?? null;
$this->complete = $data['complete'] ?? null;
if (is_array($data)) {
$this->id = array_key_exists('id', $data) ? $data['id'] : $this->id;
$this->petId = array_key_exists('petId', $data) ? $data['petId'] : $this->petId;
$this->quantity = array_key_exists('quantity', $data) ? $data['quantity'] : $this->quantity;
$this->shipDate = array_key_exists('shipDate', $data) ? $data['shipDate'] : $this->shipDate;
$this->status = array_key_exists('status', $data) ? $data['status'] : $this->status;
$this->complete = array_key_exists('complete', $data) ? $data['complete'] : $this->complete;
}
}
/**

14
samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Pet.php
View File

@@ -107,12 +107,14 @@ class Pet
*/
public function __construct(array $data = null)
{
$this->id = $data['id'] ?? null;
$this->category = $data['category'] ?? null;
$this->name = $data['name'] ?? null;
$this->photoUrls = $data['photoUrls'] ?? null;
$this->tags = $data['tags'] ?? null;
$this->status = $data['status'] ?? null;
if (is_array($data)) {
$this->id = array_key_exists('id', $data) ? $data['id'] : $this->id;
$this->category = array_key_exists('category', $data) ? $data['category'] : $this->category;
$this->name = array_key_exists('name', $data) ? $data['name'] : $this->name;
$this->photoUrls = array_key_exists('photoUrls', $data) ? $data['photoUrls'] : $this->photoUrls;
$this->tags = array_key_exists('tags', $data) ? $data['tags'] : $this->tags;
$this->status = array_key_exists('status', $data) ? $data['status'] : $this->status;
}
}
/**

6
samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Tag.php
View File

@@ -66,8 +66,10 @@ class Tag
*/
public function __construct(array $data = null)
{
$this->id = $data['id'] ?? null;
$this->name = $data['name'] ?? null;
if (is_array($data)) {
$this->id = array_key_exists('id', $data) ? $data['id'] : $this->id;
$this->name = array_key_exists('name', $data) ? $data['name'] : $this->name;
}
}
/**

18
samples/server/petstore/php-symfony/SymfonyBundle-php/Model/User.php
View File

@@ -116,14 +116,16 @@ class User
*/
public function __construct(array $data = null)
{
$this->id = $data['id'] ?? null;
$this->username = $data['username'] ?? null;
$this->firstName = $data['firstName'] ?? null;
$this->lastName = $data['lastName'] ?? null;
$this->email = $data['email'] ?? null;
$this->password = $data['password'] ?? null;
$this->phone = $data['phone'] ?? null;
$this->userStatus = $data['userStatus'] ?? null;
if (is_array($data)) {
$this->id = array_key_exists('id', $data) ? $data['id'] : $this->id;
$this->username = array_key_exists('username', $data) ? $data['username'] : $this->username;
$this->firstName = array_key_exists('firstName', $data) ? $data['firstName'] : $this->firstName;
$this->lastName = array_key_exists('lastName', $data) ? $data['lastName'] : $this->lastName;
$this->email = array_key_exists('email', $data) ? $data['email'] : $this->email;
$this->password = array_key_exists('password', $data) ? $data['password'] : $this->password;
$this->phone = array_key_exists('phone', $data) ? $data['phone'] : $this->phone;
$this->userStatus = array_key_exists('userStatus', $data) ? $data['userStatus'] : $this->userStatus;
}
}
/**