Skip to content

Commit abe8c74

Browse files
authored
Fix php generators treating double as a native type (#13421)
* Fix php generators treating double as a native type Fixes #13335 * Remove double handling in enum * Add missed double type removal
1 parent 0c6a951 commit abe8c74

File tree

23 files changed

+33
-50
lines changed

23 files changed

+33
-50
lines changed

docs/generators/php-dt.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
5656
<li>bool</li>
5757
<li>boolean</li>
5858
<li>byte</li>
59-
<li>double</li>
6059
<li>float</li>
6160
<li>int</li>
6261
<li>integer</li>

docs/generators/php-laravel.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
5757
<li>bool</li>
5858
<li>boolean</li>
5959
<li>byte</li>
60-
<li>double</li>
6160
<li>float</li>
6261
<li>int</li>
6362
<li>integer</li>

docs/generators/php-lumen.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
5757
<li>bool</li>
5858
<li>boolean</li>
5959
<li>byte</li>
60-
<li>double</li>
6160
<li>float</li>
6261
<li>int</li>
6362
<li>integer</li>

docs/generators/php-mezzio-ph.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
5656
<li>bool</li>
5757
<li>boolean</li>
5858
<li>byte</li>
59-
<li>double</li>
6059
<li>float</li>
6160
<li>int</li>
6261
<li>integer</li>

docs/generators/php-slim-deprecated.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
5757
<li>bool</li>
5858
<li>boolean</li>
5959
<li>byte</li>
60-
<li>double</li>
6160
<li>float</li>
6261
<li>int</li>
6362
<li>integer</li>

docs/generators/php-slim4.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
5858
<li>bool</li>
5959
<li>boolean</li>
6060
<li>byte</li>
61-
<li>double</li>
6261
<li>float</li>
6362
<li>int</li>
6463
<li>integer</li>

docs/generators/php-symfony.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
6262
<li>array</li>
6363
<li>bool</li>
6464
<li>byte</li>
65-
<li>double</li>
6665
<li>float</li>
6766
<li>int</li>
6867
<li>mixed</li>

docs/generators/php.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
5858
<li>bool</li>
5959
<li>boolean</li>
6060
<li>byte</li>
61-
<li>double</li>
6261
<li>float</li>
6362
<li>int</li>
6463
<li>integer</li>

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public AbstractPhpCodegen() {
9191
"boolean",
9292
"int",
9393
"integer",
94-
"double",
9594
"float",
9695
"string",
9796
"object",
@@ -119,7 +118,7 @@ public AbstractPhpCodegen() {
119118
typeMapping.put("number", "float");
120119
typeMapping.put("float", "float");
121120
typeMapping.put("decimal", "float");
122-
typeMapping.put("double", "double");
121+
typeMapping.put("double", "float");
123122
typeMapping.put("string", "string");
124123
typeMapping.put("byte", "int");
125124
typeMapping.put("boolean", "bool");
@@ -656,7 +655,7 @@ public void setParameterExampleValue(CodegenParameter p) {
656655

657656
@Override
658657
public String toEnumValue(String value, String datatype) {
659-
if ("int".equals(datatype) || "double".equals(datatype) || "float".equals(datatype)) {
658+
if ("int".equals(datatype) || "float".equals(datatype)) {
660659
return value;
661660
} else {
662661
return "\'" + escapeText(value) + "\'";
@@ -684,7 +683,7 @@ public String toEnumVarName(String name, String datatype) {
684683
}
685684

686685
// number
687-
if ("int".equals(datatype) || "double".equals(datatype) || "float".equals(datatype)) {
686+
if ("int".equals(datatype) || "float".equals(datatype)) {
688687
String varName = name;
689688
varName = varName.replaceAll("-", "MINUS_");
690689
varName = varName.replaceAll("\\+", "PLUS_");

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpDataTransferClientCodegen.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@ public PhpDataTransferClientCodegen() {
9292
.stability(Stability.BETA)
9393
.build();
9494

95-
//no point to use double - http://php.net/manual/en/language.types.float.php , especially because of PHP 7+ float type declaration
96-
typeMapping.put("double", "float");
97-
9895
// remove these from primitive types to make the output works
9996
languageSpecificPrimitives.remove("\\DateTime");
10097
languageSpecificPrimitives.remove("\\SplFileObject");

0 commit comments

Comments
 (0)