Skip to content

Commit c2d2aaa

Browse files
etremblayEric Durand-Tremblay
andauthored
fix php codegen (#93)
* fix php codegen * Update micronaut generator * bump version prior to merge Co-authored-by: Eric Durand-Tremblay <[email protected]>
1 parent 8a8b026 commit c2d2aaa

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

gradle/openapi-sdk/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import org.apache.tools.ant.taskdefs.Patch
22

3-
version = "0.0.15-SNAPSHOT"
3+
version = "0.0.16-SNAPSHOT"
44

55
val openApiPatchesSourceDirectory = layout.projectDirectory.dir("src/patches")
66
val openApiTemplatesDirectory = layout.buildDirectory.dir("tmp/openapi-templates")
@@ -16,7 +16,7 @@ dependencies {
1616

1717
compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
1818
implementation("org.openapitools:openapi-generator-gradle-plugin:$openApiVersion")
19-
implementation("com.equisoft.openapi.generator.micronaut:micronaut-project-openapi-generator:0.2.1")
19+
implementation("com.equisoft.openapi.generator.micronaut:micronaut-project-openapi-generator:0.3.0")
2020

2121
openApiGenerator("org.openapitools:openapi-generator:$openApiVersion")
2222
}

gradle/openapi-sdk/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,9 @@ public String getTypeDeclaration(Schema p) {
329329
} else if (p instanceof ComposedSchema) {
330330
// Support nullable defined using oneOf construct
331331
ComposedSchema composedSchema = (ComposedSchema)p;
332-
if (Boolean.TRUE.equals(p.getNullable()) || ModelUtils.isNullableComposedSchema(composedSchema)) {
332+
Boolean isNullable = Boolean.TRUE.equals(p.getNullable())
333+
|| ModelUtils.isNullableComposedSchema(composedSchema);
334+
if (composedSchema.getOneOf() != null && isNullable) {
333335
Schema inner = composedSchema
334336
.getOneOf()
335337
.stream()

0 commit comments

Comments
 (0)