Skip to content

[FIX][PHP-NEXTGEN] Missing tagged union discriminator literal (#20343) #20356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
Dec 22, 2024
Merged

[FIX][PHP-NEXTGEN] Missing tagged union discriminator literal (#20343) #20356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47c14d5
fix: https://github.com/OpenAPITools/openapi-generator/issues/20343
brianferri Dec 19, 2024
4a4bf6b
chore: apply correct formatting
brianferri Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions modules/openapi-generator/src/main/resources/php-nextgen/model_generic.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,12 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
return self::$openAPIModelName;
}

{{#discriminator}}
{{#discriminator.mappedModels}}
public const {{#lambda.uppercase}}{{discriminator.propertyName}}_{{#lambda.snakecase}}{{mappingName}}{{/lambda.snakecase}}{{/lambda.uppercase}} = '{{mappingName}}';
{{/discriminator.mappedModels}}
{{/discriminator}}
{{^discriminator}}
{{#vars}}
{{#isEnum}}
{{#allowableValues}}
Expand All @@ -199,6 +205,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
{{/allowableValues}}
{{/isEnum}}
{{/vars}}
{{/discriminator}}

{{#vars}}
{{#isEnum}}
Expand All @@ -210,8 +217,15 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
public function {{getter}}AllowableValues()
{
return [
{{#discriminator}}
{{#discriminator.mappedModels}}
self::{{#lambda.uppercase}}{{discriminator.propertyName}}_{{#lambda.snakecase}}{{mappingName}}{{/lambda.snakecase}}{{/lambda.uppercase}},{{^-last}}
{{/-last}}{{/discriminator.mappedModels}}
{{/discriminator}}
{{^discriminator}}
{{#allowableValues}}{{#enumVars}}self::{{enumName}}_{{{name}}},{{^-last}}
{{/-last}}{{/enumVars}}{{/allowableValues}}
{{/discriminator}}
];
}

Expand All @@ -233,18 +247,18 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
*/
public function __construct(array $data = null)
{
{{#discriminator}}
// Initialize discriminator property with the model name.
$this->container['{{discriminatorName}}'] = static::$openAPIModelName;

{{/discriminator}}
{{#parentSchema}}
parent::__construct($data);

{{/parentSchema}}
{{#vars}}
$this->setIfExists('{{name}}', $data ?? [], {{#defaultValue}}{{{defaultValue}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}});
{{/vars}}
{{#discriminator}}

// Initialize discriminator property with the model name.
$this->container['{{discriminatorName}}'] = static::$openAPIModelName;
{{/discriminator}}
}

/**
Expand Down
8 changes: 5 additions & 3 deletions samples/client/petstore/php-nextgen/OpenAPIClient-php/src/Model/Animal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ public function getModelName(): string
return self::$openAPIModelName;
}

public const CLASS_NAME_CAT = 'CAT';
public const CLASS_NAME_DOG = 'DOG';

/**
* Associative array for storing property values
Expand All @@ -248,11 +250,11 @@ public function getModelName(): string
*/
public function __construct(array $data = null)
{
$this->setIfExists('class_name', $data ?? [], null);
$this->setIfExists('color', $data ?? [], 'red');

// Initialize discriminator property with the model name.
$this->container['class_name'] = static::$openAPIModelName;

$this->setIfExists('class_name', $data ?? [], null);
$this->setIfExists('color', $data ?? [], 'red');
}

/**
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/php-nextgen/OpenAPIClient-php/src/Model/ParentWithNullable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,11 @@ public function getTypeAllowableValues()
*/
public function __construct(array $data = null)
{
$this->setIfExists('type', $data ?? [], null);
$this->setIfExists('nullable_property', $data ?? [], null);

// Initialize discriminator property with the model name.
$this->container['type'] = static::$openAPIModelName;

$this->setIfExists('type', $data ?? [], null);
$this->setIfExists('nullable_property', $data ?? [], null);
}

/**
Expand Down