Skip to content

Commit 6e12847

Browse files
committed
fixed missed properties
1 parent 8799694 commit 6e12847

File tree

2 files changed

+34
-16
lines changed

2 files changed

+34
-16
lines changed

src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,12 +1358,7 @@ public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> al
13581358
addParentContainer(codegenModel, name, schema);
13591359
}
13601360
else if (schema instanceof MapSchema) {
1361-
codegenModel.getVendorExtensions().put(CodegenConstants.IS_MAP_CONTAINER_EXT_NAME, Boolean.TRUE);
1362-
codegenModel.getVendorExtensions().put(IS_CONTAINER_EXT_NAME, Boolean.TRUE);
1363-
addParentContainer(codegenModel, name, schema);
1364-
if (hasSchemaProperties(schema) || hasTrueAdditionalProperties(schema)) {
1365-
addAdditionPropertiesToCodeGenModel(codegenModel, schema);
1366-
}
1361+
processMapSchema(codegenModel, name, schema);
13671362

13681363
}
13691364
else if (schema instanceof ComposedSchema) {
@@ -1493,6 +1488,15 @@ else if (schema instanceof ComposedSchema) {
14931488
return codegenModel;
14941489
}
14951490

1491+
protected void processMapSchema(CodegenModel codegenModel, String name, Schema schema) {
1492+
codegenModel.getVendorExtensions().put(CodegenConstants.IS_MAP_CONTAINER_EXT_NAME, Boolean.TRUE);
1493+
codegenModel.getVendorExtensions().put(IS_CONTAINER_EXT_NAME, Boolean.TRUE);
1494+
addParentContainer(codegenModel, name, schema);
1495+
if (hasSchemaProperties(schema) || hasTrueAdditionalProperties(schema)) {
1496+
addAdditionPropertiesToCodeGenModel(codegenModel, schema);
1497+
}
1498+
}
1499+
14961500
/**
14971501
* Recursively look for a discriminator in the interface tree
14981502
*/

src/main/java/io/swagger/codegen/v3/generators/php/PhpClientCodegen.java

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,40 @@
22

33
import io.swagger.codegen.v3.CliOption;
44
import io.swagger.codegen.v3.CodegenConstants;
5+
import io.swagger.codegen.v3.CodegenModel;
56
import io.swagger.codegen.v3.CodegenOperation;
67
import io.swagger.codegen.v3.CodegenParameter;
78
import io.swagger.codegen.v3.CodegenProperty;
89
import io.swagger.codegen.v3.CodegenSecurity;
910
import io.swagger.codegen.v3.CodegenType;
1011
import io.swagger.codegen.v3.SupportingFile;
1112
import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
13+
import io.swagger.v3.oas.models.media.ArraySchema;
14+
import io.swagger.v3.oas.models.media.BooleanSchema;
15+
import io.swagger.v3.oas.models.media.DateSchema;
16+
import io.swagger.v3.oas.models.media.DateTimeSchema;
17+
import io.swagger.v3.oas.models.media.IntegerSchema;
18+
import io.swagger.v3.oas.models.media.MapSchema;
19+
import io.swagger.v3.oas.models.media.NumberSchema;
20+
import io.swagger.v3.oas.models.media.ObjectSchema;
21+
import io.swagger.v3.oas.models.media.Schema;
22+
import io.swagger.v3.oas.models.media.StringSchema;
23+
import io.swagger.v3.oas.models.security.SecurityScheme;
24+
import io.swagger.v3.parser.util.SchemaTypeUtil;
25+
import org.apache.commons.lang3.StringUtils;
26+
import org.slf4j.Logger;
27+
import org.slf4j.LoggerFactory;
1228

1329
import java.io.File;
14-
import java.util.Arrays;
1530
import java.util.ArrayList;
31+
import java.util.Arrays;
1632
import java.util.Collections;
1733
import java.util.HashMap;
34+
import java.util.HashSet;
1835
import java.util.List;
1936
import java.util.Map;
20-
import java.util.HashSet;
2137
import java.util.regex.Matcher;
2238

23-
import io.swagger.v3.oas.models.media.*;
24-
import io.swagger.v3.oas.models.security.SecurityScheme;
25-
import io.swagger.v3.parser.util.SchemaTypeUtil;
26-
import org.apache.commons.lang3.StringUtils;
27-
28-
import org.slf4j.Logger;
29-
import org.slf4j.LoggerFactory;
30-
3139
import static io.swagger.codegen.v3.generators.handlebars.ExtensionHelper.getBooleanValue;
3240

3341
public class PhpClientCodegen extends DefaultCodegenConfig {
@@ -444,6 +452,12 @@ public void setComposerProjectName(String composerProjectName) {
444452
this.composerProjectName = composerProjectName;
445453
}
446454

455+
@Override
456+
protected void processMapSchema(CodegenModel codegenModel, String name, Schema schema) {
457+
super.processMapSchema(codegenModel, name, schema);
458+
addVars(codegenModel, schema.getProperties(), schema.getRequired());
459+
}
460+
447461
@Override
448462
public String toVarName(String name) {
449463
// sanitize name

0 commit comments

Comments
 (0)