[pull] master from OpenAPITools:master

docs/generators/php-dt.md

@@ -107,6 +107,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>exit</li>
 <li>extends</li>
 <li>final</li>
+<li>finally</li>
+<li>fn</li>
 <li>for</li>
 <li>foreach</li>
 <li>formparams</li>
@@ -124,6 +126,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>interface</li>
 <li>isset</li>
 <li>list</li>
+<li>match</li>
 <li>namespace</li>
 <li>new</li>
 <li>or</li>
@@ -132,6 +135,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>protected</li>
 <li>public</li>
 <li>queryparams</li>
+<li>readonly</li>
 <li>require</li>
 <li>require_once</li>
 <li>resourcepath</li>
@@ -146,6 +150,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>var</li>
 <li>while</li>
 <li>xor</li>
+<li>yield</li>
 </ul>
 
 ## FEATURE SET

docs/generators/php-flight.md

@@ -109,6 +109,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>exit</li>
 <li>extends</li>
 <li>final</li>
+<li>finally</li>
+<li>fn</li>
 <li>for</li>
 <li>foreach</li>
 <li>formparams</li>
@@ -126,6 +128,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>interface</li>
 <li>isset</li>
 <li>list</li>
+<li>match</li>
 <li>namespace</li>
 <li>new</li>
 <li>or</li>
@@ -134,6 +137,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>protected</li>
 <li>public</li>
 <li>queryparams</li>
+<li>readonly</li>
 <li>require</li>
 <li>require_once</li>
 <li>resourcepath</li>
@@ -148,6 +152,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>var</li>
 <li>while</li>
 <li>xor</li>
+<li>yield</li>
 </ul>
 
 ## FEATURE SET

docs/generators/php-laravel.md

@@ -110,6 +110,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>exit</li>
 <li>extends</li>
 <li>final</li>
+<li>finally</li>
+<li>fn</li>
 <li>for</li>
 <li>foreach</li>
 <li>formparams</li>
@@ -127,6 +129,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>interface</li>
 <li>isset</li>
 <li>list</li>
+<li>match</li>
 <li>namespace</li>
 <li>new</li>
 <li>or</li>
@@ -135,6 +138,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>protected</li>
 <li>public</li>
 <li>queryparams</li>
+<li>readonly</li>
 <li>require</li>
 <li>require_once</li>
 <li>resourcepath</li>
@@ -149,6 +153,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>var</li>
 <li>while</li>
 <li>xor</li>
+<li>yield</li>
 </ul>
 
 ## FEATURE SET

docs/generators/php-lumen.md

@@ -108,6 +108,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>exit</li>
 <li>extends</li>
 <li>final</li>
+<li>finally</li>
+<li>fn</li>
 <li>for</li>
 <li>foreach</li>
 <li>formparams</li>
@@ -125,6 +127,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>interface</li>
 <li>isset</li>
 <li>list</li>
+<li>match</li>
 <li>namespace</li>
 <li>new</li>
 <li>or</li>
@@ -133,6 +136,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>protected</li>
 <li>public</li>
 <li>queryparams</li>
+<li>readonly</li>
 <li>require</li>
 <li>require_once</li>
 <li>resourcepath</li>
@@ -147,6 +151,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>var</li>
 <li>while</li>
 <li>xor</li>
+<li>yield</li>
 </ul>
 
 ## FEATURE SET

docs/generators/php-mezzio-ph.md

@@ -107,6 +107,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>exit</li>
 <li>extends</li>
 <li>final</li>
+<li>finally</li>
+<li>fn</li>
 <li>for</li>
 <li>foreach</li>
 <li>formparams</li>
@@ -124,6 +126,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>interface</li>
 <li>isset</li>
 <li>list</li>
+<li>match</li>
 <li>namespace</li>
 <li>new</li>
 <li>or</li>
@@ -132,6 +135,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>protected</li>
 <li>public</li>
 <li>queryparams</li>
+<li>readonly</li>
 <li>require</li>
 <li>require_once</li>
 <li>resourcepath</li>
@@ -146,6 +150,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>var</li>
 <li>while</li>
 <li>xor</li>
+<li>yield</li>
 </ul>
 
 ## FEATURE SET

docs/generators/php-nextgen.md

@@ -110,6 +110,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>exit</li>
 <li>extends</li>
 <li>final</li>
+<li>finally</li>
+<li>fn</li>
 <li>for</li>
 <li>foreach</li>
 <li>formparams</li>
@@ -127,6 +129,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>interface</li>
 <li>isset</li>
 <li>list</li>
+<li>match</li>
 <li>namespace</li>
 <li>new</li>
 <li>or</li>
@@ -135,6 +138,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>protected</li>
 <li>public</li>
 <li>queryparams</li>
+<li>readonly</li>
 <li>require</li>
 <li>require_once</li>
 <li>resourcepath</li>
@@ -149,6 +153,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>var</li>
 <li>while</li>
 <li>xor</li>
+<li>yield</li>
 </ul>
 
 ## FEATURE SET

docs/generators/php-slim4.md

@@ -109,6 +109,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>exit</li>
 <li>extends</li>
 <li>final</li>
+<li>finally</li>
+<li>fn</li>
 <li>for</li>
 <li>foreach</li>
 <li>formparams</li>
@@ -126,6 +128,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>interface</li>
 <li>isset</li>
 <li>list</li>
+<li>match</li>
 <li>namespace</li>
 <li>new</li>
 <li>or</li>
@@ -134,6 +137,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>protected</li>
 <li>public</li>
 <li>queryparams</li>
+<li>readonly</li>
 <li>require</li>
 <li>require_once</li>
 <li>resourcepath</li>
@@ -148,6 +152,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>var</li>
 <li>while</li>
 <li>xor</li>
+<li>yield</li>
 </ul>
 
 ## FEATURE SET

docs/generators/php.md

@@ -110,6 +110,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>exit</li>
 <li>extends</li>
 <li>final</li>
+<li>finally</li>
+<li>fn</li>
 <li>for</li>
 <li>foreach</li>
 <li>formparams</li>
@@ -127,6 +129,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>interface</li>
 <li>isset</li>
 <li>list</li>
+<li>match</li>
 <li>namespace</li>
 <li>new</li>
 <li>or</li>
@@ -135,6 +138,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>protected</li>
 <li>public</li>
 <li>queryparams</li>
+<li>readonly</li>
 <li>require</li>
 <li>require_once</li>
 <li>resourcepath</li>
@@ -149,6 +153,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>var</li>
 <li>while</li>
 <li>xor</li>
+<li>yield</li>
 </ul>
 
 ## FEATURE SET

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

@@ -92,8 +92,78 @@ public AbstractPhpCodegen() {
                         "resourcePath", "httpBody", "queryParams", "headerParams",
                         "formParams", "_header_accept", "_tempBody",
 
-                        // PHP reserved words
-                        "__halt_compiler", "abstract", "and", "array", "as", "break", "callable", "case", "catch", "class", "clone", "const", "continue", "declare", "default", "die", "do", "echo", "else", "elseif", "empty", "enddeclare", "endfor", "endforeach", "endif", "endswitch", "endwhile", "eval", "exit", "extends", "final", "for", "foreach", "function", "global", "goto", "if", "implements", "include", "include_once", "instanceof", "insteadof", "interface", "isset", "list", "namespace", "new", "or", "print", "private", "protected", "public", "require", "require_once", "return", "static", "switch", "throw", "trait", "try", "unset", "use", "var", "while", "xor")
+                        // PHP reserved words, ref: https://www.php.net/manual/en/reserved.keywords.php
+                        "__halt_compiler",
+                        "abstract",
+                        "and",
+                        "array",
+                        "as",
+                        "break",
+                        "callable",
+                        "case",
+                        "catch",
+                        "class",
+                        "clone",
+                        "const",
+                        "continue",
+                        "declare",
+                        "default",
+                        "die",
+                        "do",
+                        "echo",
+                        "else",
+                        "elseif",
+                        "empty",
+                        "enddeclare",
+                        "endfor",
+                        "endforeach",
+                        "endif",
+                        "endswitch",
+                        "endwhile",
+                        "eval",
+                        "exit",
+                        "extends",
+                        "final",
+                        "finally",
+                        "fn",
+                        "for",
+                        "foreach",
+                        "function",
+                        "global",
+                        "goto",
+                        "if",
+                        "implements",
+                        "include",
+                        "include_once",
+                        "instanceof",
+                        "insteadof",
+                        "interface",
+                        "isset",
+                        "list",
+                        "match",
+                        "namespace",
+                        "new",
+                        "or",
+                        "print",
+                        "private",
+                        "protected",
+                        "public",
+                        "readonly",
+                        "require",
+                        "require_once",
+                        "return",
+                        "static",
+                        "switch",
+                        "throw",
+                        "trait",
+                        "try",
+                        "unset",
+                        "use",
+                        "var",
+                        "while",
+                        "xor",
+                        "yield"
+                )
         );
 
         // ref: http://php.net/manual/en/language.types.intro.php

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

@@ -588,6 +588,10 @@ public String toVarName(String name) {
             return nameMapping.get(name);
         }
 
+        // translate @ for properties (like @type) to at_.
+        // Otherwise an additional "type" property will lead to duplicates
+        name = name.replaceAll("^@", "at_");
+
         name = sanitizeName(name, "[^\\w$]");
 
         if ("_".equals(name)) {

modules/openapi-generator/src/main/resources/Java/build.gradle.mustache

@@ -118,7 +118,7 @@ ext {
     jackson_annotations_version = "2.21"
     jackson_databind_version = "2.21.5"
     {{#openApiNullable}}
-    jackson_databind_nullable_version = "0.2.10"
+    jackson_databind_nullable_version = "0.2.11"
     {{/openApiNullable}}
     jakarta_annotation_version = "1.3.5"
     {{#useBeanValidation}}

modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache

@@ -129,14 +129,14 @@ ext {
     jackson_annotations_version = "2.21"
     jackson_databind_version = "2.21.5"
     {{#openApiNullable}}
-    jackson_databind_nullable_version = "0.2.10"
+    jackson_databind_nullable_version = "0.2.11"
     {{/openApiNullable}}
     {{/useJackson3}}
     {{#useJackson3}}
     jackson3_version = "3.1.5"
     jackson_annotations_version = "2.21"
     {{#openApiNullable}}
-    jackson_databind_nullable_version = "0.2.10"
+    jackson_databind_nullable_version = "0.2.11"
     {{/openApiNullable}}
     {{/useJackson3}}
     jakarta_annotation_version = "1.3.5"

modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache

@@ -397,14 +397,14 @@
         <jackson-annotations-version>2.21</jackson-annotations-version>
         <jackson-databind-version>2.21.5</jackson-databind-version>
         {{#openApiNullable}}
-        <jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
+        <jackson-databind-nullable-version>0.2.11</jackson-databind-nullable-version>
         {{/openApiNullable}}
         {{/useJackson3}}
         {{#useJackson3}}
         <jackson3-version>3.1.5</jackson3-version>
         <jackson-annotations-version>2.21</jackson-annotations-version>
         {{#openApiNullable}}
-        <jackson-databind-nullable-version>0.2.10</jackson-databind-nullable-version>
+        <jackson-databind-nullable-version>0.2.11</jackson-databind-nullable-version>
         {{/openApiNullable}}
         {{/useJackson3}}
         {{#useJakartaEe}}