Fix discriminator name not following variable naming convention #1742
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ackintosh
reviewed
Dec 23, 2018
| @@ -186,7 +186,7 @@ public function __construct(array $data = null) | |||
| $this->container['color'] = isset($data['color']) ? $data['color'] : 'red'; | |||
|
|
|||
| // Initialize discriminator property with the model name. | |||
| $discriminator = array_search('className', self::$attributeMap, true); | |||
| $discriminator = array_search('class_name', self::$attributeMap, true); | |||
| $this->container[$discriminator] = static::$openAPIModelName; | |||
There was a problem hiding this comment.
1) OpenAPI\Client\ModelInheritanceTest::testDiscriminatorInitialization
Failed asserting that null is identical to 'Dog'.
/home/travis/build/OpenAPITools/openapi-generator/samples/client/petstore/php/OpenAPIClient-php/tests/ModelInheritanceTest.php:70
+ $discriminator = array_search('class_name', self::$attributeMap, true);
$this->container[$discriminator] = static::$openAPIModelName; Due to this PR, array_search may become unnecessary. We can pass {{discriminatorName}} to $this->container directly as following.
- Mustache template
$this->container[{{discriminatorName}}] = static::$openAPIModelName;
- PHP code
- $discriminator = array_search('class_name', self::$attributeMap, true);
+ $this->container['class_name'] = static::$openAPIModelName; There was a problem hiding this comment.
👌 I'll make the change later tonight.
ackintosh
approved these changes
Dec 24, 2018
A-Joshi
pushed a commit
to ihsmarkitoss/openapi-generator
that referenced
this pull request
Feb 27, 2019
…APITools#1742) * fix discrimintator name not following variable naming convention * fix test * update samples * use discriminator name directly in php * single quote array index
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR checklist
./bin/to update Petstore sample so that CIs can verify the change. (For instance, only need to run./bin/{LANG}-petstore.shand./bin/security/{LANG}-petstore.shif updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in.\bin\windows\.master,. Default:3.4.x,4.0.xmaster.Description of the PR
Fix discriminator name not following variable naming convention by using
toVarNamecc @OpenAPITools/generator-core-team