[PHP] Use a valid php type for maps (#8718)

* Use a valid php type for maps

* Convert type hint to correct format

Align map array format to that expected by phpdoc and associated tools.

Author: neclimdul

docs/generators/php-laravel.md

@@ -33,7 +33,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | Type/Alias | Instantiated By |
 | ---------- | --------------- |
 |array|array|
-|map|map|
+|map|array|
 
 
 ## LANGUAGE PRIMITIVES

docs/generators/php-lumen.md

@@ -33,7 +33,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | Type/Alias | Instantiated By |
 | ---------- | --------------- |
 |array|array|
-|map|map|
+|map|array|
 
 
 ## LANGUAGE PRIMITIVES

docs/generators/php-mezzio-ph.md

@@ -33,7 +33,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | Type/Alias | Instantiated By |
 | ---------- | --------------- |
 |array|array|
-|map|map|
+|map|array|
 
 
 ## LANGUAGE PRIMITIVES

docs/generators/php-slim-deprecated.md

@@ -33,7 +33,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | Type/Alias | Instantiated By |
 | ---------- | --------------- |
 |array|array|
-|map|map|
+|map|array|
 
 
 ## LANGUAGE PRIMITIVES

docs/generators/php-slim4.md

@@ -34,7 +34,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | Type/Alias | Instantiated By |
 | ---------- | --------------- |
 |array|array|
-|map|map|
+|map|array|
 
 
 ## LANGUAGE PRIMITIVES

docs/generators/php-symfony.md

@@ -39,7 +39,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | Type/Alias | Instantiated By |
 | ---------- | --------------- |
 |array|array|
-|map|map|
+|map|array|
 
 
 ## LANGUAGE PRIMITIVES

docs/generators/php.md

@@ -34,7 +34,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | Type/Alias | Instantiated By |
 | ---------- | --------------- |
 |array|array|
-|map|map|
+|map|array|
 
 
 ## LANGUAGE PRIMITIVES

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

@@ -98,7 +98,7 @@ public AbstractPhpCodegen() {
         );
 
         instantiationTypes.put("array", "array");
-        instantiationTypes.put("map", "map");
+        instantiationTypes.put("map", "array");
 
 
         // provide primitives to mustache template
@@ -119,7 +119,7 @@ public AbstractPhpCodegen() {
         typeMapping.put("Date", "\\DateTime");
         typeMapping.put("DateTime", "\\DateTime");
         typeMapping.put("file", "\\SplFileObject");
-        typeMapping.put("map", "map");
+        typeMapping.put("map", "array");
         typeMapping.put("array", "array");
         typeMapping.put("list", "array");
         typeMapping.put("object", "object");
@@ -307,7 +307,7 @@ public String getTypeDeclaration(Schema p) {
                 LOGGER.warn(p.getName() + "(map property) does not have a proper inner type defined. Default to string");
                 inner = new StringSchema().description("TODO default missing map inner type to string");
             }
-            return getSchemaType(p) + "[string," + getTypeDeclaration(inner) + "]";
+            return getSchemaType(p) + "<string," + getTypeDeclaration(inner) + ">";
         } else if (StringUtils.isNotBlank(p.get$ref())) { // model
             String type = super.getTypeDeclaration(p);
             return (!languageSpecificPrimitives.contains(type))

modules/openapi-generator/src/main/resources/php-laravel/model.mustache

@@ -10,7 +10,7 @@ namespace {{modelPackage}};
 class {{classname}} {
 
     {{#vars}}
-    /** @var {{dataType}} ${{name}} {{#description}}{{description}}{{/description}}*/
+    /** @var {{{dataType}}} ${{name}} {{#description}}{{description}}{{/description}}*/
     private ${{name}};
 
     {{/vars}}

modules/openapi-generator/src/main/resources/php-mezzio-ph/api.mustache

@@ -45,10 +45,10 @@ class {{classname}}
 {{^isPrimitiveType}}
 {{#isContainer}}
      * TODO check if attribute is valid and can handle your container type
-     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":"{{dataType}}","objectAttr":"bodyData"})
+     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":"{{{dataType}}}","objectAttr":"bodyData"})
 {{/isContainer}}
 {{^isContainer}}
-     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":{{dataType}}::class,"objectAttr":"bodyData"})
+     * @PHA\Attribute(name=PHAttribute\Transfer::class, options={"type":{{{dataType}}}::class,"objectAttr":"bodyData"})
 {{/isContainer}}
 {{/isPrimitiveType}}
 {{/bodyParam}}
@@ -64,7 +64,7 @@ class {{classname}}
 {{#returnContainer}}
      * TODO check if generated return container type is valid
 {{/returnContainer}}
-     * @return {{returnType}}
+     * @return {{{returnType}}}
 {{/returnType}}
      */
     public function {{operationId}}(ServerRequestInterface $request){{#returnType}}: {{#returnContainer}}array{{/returnContainer}}{{^returnContainer}}{{returnType}}{{/returnContainer}}{{/returnType}}
@@ -78,7 +78,7 @@ class {{classname}}
 {{/vendorExtensions}}
 {{#bodyParam}}
 {{^isPrimitiveType}}
-        /** @var {{dataType}} $bodyData */
+        /** @var {{{dataType}}} $bodyData */
         $bodyData = $request->getAttribute("bodyData");
 {{/isPrimitiveType}}
 {{/bodyParam}}