Merge branch 'OpenAPITools:master' into master

Author: TheNevim

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

@@ -251,7 +251,7 @@ public String toDefaultValue(CodegenProperty codegenProperty, Schema schema) {
             schema = ModelUtils.getReferencedSchema(this.openAPI, schema);
 
             if (schema.getDefault() != null) { // array schema has default value
-                return "[" + schema.getDefault().toString() + "]";
+                return schema.getDefault().toString();
             } else if (schema.getItems().getDefault() != null) { // array item schema has default value
                 return "[" + toDefaultValue(schema.getItems()) + "]";
             } else {

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

@@ -300,7 +300,7 @@ public CodegenModel fromModel(String name, Schema model) {
                     // If the type is an array, extend the name with the inner type to prevent name collisions
                     // in case multiple arrays with different types are defined. If the user has manually specified
                     // a name, use that name instead.
-                    String collectionWithTypeName = toModelName(schema.getType()) + oneOf.containerTypeMapped + oneOf.items.dataType;
+                    String collectionWithTypeName = toModelName(schema.getType()) + oneOf.containerTypeMapped + oneOf.items.baseType;
                     String oneOfName = Optional.ofNullable(schema.getTitle()).orElse(collectionWithTypeName);
                     oneOf.setName(oneOfName);
                 }

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

@@ -274,6 +274,8 @@ public void processOpts() {
         if (!excludeSbt) {
             supportingFiles.add(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
             supportingFiles.add(new SupportingFile("project/build.properties.mustache", "project", "build.properties"));
+            supportingFiles.add(new SupportingFile("project/plugins.mustache", "project", "plugins.sbt"));
+            supportingFiles.add(new SupportingFile("scalafmt.mustache", "", ".scalafmt.conf"));
         } else {
             supportingFiles.remove(new SupportingFile("build.sbt.mustache", "", "build.sbt"));
             supportingFiles.remove(new SupportingFile("project/build.properties.mustache", "project", "build.properties"));

modules/openapi-generator/src/main/resources/php-nextgen/Configuration.mustache

@@ -492,13 +492,13 @@ class Configuration
     }
 
     /**
-    * Returns URL based on host settings, index and variables
-    *
-    * @param array      $hostSettings array of host settings, generated from getHostSettings() or equivalent from the API clients
-    * @param int        $hostIndex    index of the host settings
-    * @param array|null $variables    hash of variable and the corresponding value (optional)
-    * @return string URL based on host settings
-    */
+     * Returns URL based on host settings, index and variables
+     *
+     * @param array      $hostSettings array of host settings, generated from getHostSettings() or equivalent from the API clients
+     * @param int        $hostIndex    index of the host settings
+     * @param array|null $variables    hash of variable and the corresponding value (optional)
+     * @return string URL based on host settings
+     */
     public static function getHostString(array $hostSettings, int $hostIndex, ?array $variables = null): string
     {
         if (null === $variables) {

modules/openapi-generator/src/main/resources/php-nextgen/HeaderSelector.mustache

@@ -86,13 +86,13 @@ class HeaderSelector
     }
 
     /**
-    * Create an Accept header string from the given "Accept" headers array, recalculating all weights
-    *
-    * @param string[] $accept            Array of Accept Headers
-    * @param string[] $headersWithJson   Array of Accept Headers of type "json"
-    *
-    * @return string "Accept" Header (e.g. "application/json, text/html; q=0.9")
-    */
+     * Create an Accept header string from the given "Accept" headers array, recalculating all weights
+     *
+     * @param string[] $accept            Array of Accept Headers
+     * @param string[] $headersWithJson   Array of Accept Headers of type "json"
+     *
+     * @return string "Accept" Header (e.g. "application/json, text/html; q=0.9")
+     */
     private function getAcceptHeaderWithAdjustedWeight(array $accept, array $headersWithJson): string
     {
         $processedHeaders = [

modules/openapi-generator/src/main/resources/php-nextgen/ModelInterface.mustache

@@ -37,50 +37,51 @@ interface ModelInterface
     /**
      * Array of property to type mappings. Used for (de)serialization
      *
-     * @return array
+     * @return array<string,string>
      */
     public static function openAPITypes(): array;
 
     /**
      * Array of property to format mappings. Used for (de)serialization
      *
-     * @return array
+     * @return array<string,string|null>
      */
     public static function openAPIFormats(): array;
 
     /**
-     * Array of attributes where the key is the local name, and the value is the original name
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
      *
-     * @return array
+     * @return array<string,string>
      */
     public static function attributeMap(): array;
 
     /**
      * Array of attributes to setter functions (for deserialization of responses)
      *
-     * @return array
+     * @return array<string,string>
      */
     public static function setters(): array;
 
     /**
      * Array of attributes to getter functions (for serialization of requests)
      *
-     * @return array
+     * @return array<string,string>
      */
     public static function getters(): array;
 
     /**
      * Show all the invalid properties with reasons.
      *
-     * @return array
+     * @return string[] invalid properties with reasons
      */
     public function listInvalidProperties(): array;
 
     /**
      * Validate all the properties in the model
      * return true if all passed
      *
-     * @return bool
+     * @return bool True if all properties are valid
      */
     public function valid(): bool;
 

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

@@ -569,15 +569,15 @@ use {{invokerPackage}}\ObjectSerializer;
 {{/exts.x-group-parameters}}
 {{#servers}}
 {{#-first}}
-    * This operation contains host(s) defined in the OpenAPI spec. Use 'hostIndex' to select the host.
-    * if needed, use the 'variables' parameter to pass variables to the host.
+     * This operation contains host(s) defined in the OpenAPI spec. Use 'hostIndex' to select the host.
+     * if needed, use the 'variables' parameter to pass variables to the host.
 {{/-first}}
      * URL: {{{url}}}
 {{#variables}}
 {{#-first}}
      *  Variables:
 {{/-first}}
-    *    - {{{name}}}: {{{description}}}{{^description}} No description provided{{/description}}{{#enumValues}}
+     *    - {{{name}}}: {{{description}}}{{^description}} No description provided{{/description}}{{#enumValues}}
 {{#-first}}
      *      Allowed values:
 {{/-first}}

modules/openapi-generator/src/main/resources/php-nextgen/model_doc.mustache

@@ -1,4 +1,4 @@
-# {{#models}}{{#model}}# {{classname}}
+{{#models}}{{#model}}# {{classname}}
 
 ## Properties
 

modules/openapi-generator/src/main/resources/php-nextgen/model_enum.mustache

@@ -4,8 +4,8 @@ enum {{classname}}: {{exts.x-php-enum-type}}
     {{#enumVars}}
     {{#enumDescription}}
     /**
-    * {{enumDescription}}
-    */
+     * {{enumDescription}}
+     */
     {{/enumDescription}}
     case {{{name}}} = {{{value}}};
 {{^-last}}

modules/openapi-generator/src/main/resources/php-nextgen/model_generic.mustache

@@ -3,63 +3,59 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
     public const DISCRIMINATOR = {{#discriminator}}'{{discriminatorName}}'{{/discriminator}}{{^discriminator}}null{{/discriminator}};
 
     /**
-      * The original name of the model.
-      *
-      * @var string
-      */
+     * The original name of the model.
+     *
+     * @var string
+     */
     protected static string $openAPIModelName = '{{name}}';
 
     /**
-      * Array of property to type mappings. Used for (de)serialization
-      *
-      * @var array<string, string>
-      */
+     * Array of property to type mappings. Used for (de)serialization
+     *
+     * @var array<string, string>
+     */
     protected static array $openAPITypes = [
         {{#vars}}'{{name}}' => '{{{dataType}}}'{{^-last}},
         {{/-last}}{{/vars}}
     ];
 
     /**
-      * Array of property to format mappings. Used for (de)serialization
-      *
-      * @var array<string, string|null>
-      */
+     * Array of property to format mappings. Used for (de)serialization
+     *
+     * @var array<string, string|null>
+     */
     protected static array $openAPIFormats = [
         {{#vars}}'{{name}}' => {{#dataFormat}}'{{{.}}}'{{/dataFormat}}{{^dataFormat}}null{{/dataFormat}}{{^-last}},
         {{/-last}}{{/vars}}
     ];
 
     /**
-      * Array of nullable properties. Used for (de)serialization
-      *
-      * @var array<string, bool>
-      */
+     * Array of nullable properties. Used for (de)serialization
+     *
+     * @var array<string, bool>
+     */
     protected static array $openAPINullables = [
         {{#vars}}'{{name}}' => {{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{^-last}},
         {{/-last}}{{/vars}}
     ];
 
     /**
-      * If a nullable field gets set to null, insert it here
-      *
-      * @var array<string, bool>
-      */
+     * If a nullable field gets set to null, insert it here
+     *
+     * @var array<string, bool>
+     */
     protected array $openAPINullablesSetToNull = [];
 
     /**
-     * Array of property to type mappings. Used for (de)serialization
-     *
-     * @return array<string, string>
+     * {@inheritdoc}
      */
     public static function openAPITypes(): array
     {
         return self::$openAPITypes{{#parentSchema}} + parent::openAPITypes(){{/parentSchema}};
     }
 
     /**
-     * Array of property to format mappings. Used for (de)serialization
-     *
-     * @return array<string, string>
+     * {@inheritdoc}
      */
     public static function openAPIFormats(): array
     {
@@ -97,21 +93,15 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
     }
 
     /**
-     * Checks if a property is nullable
-     *
-     * @param string $property
-     * @return bool
+     * {@inheritdoc}
      */
     public static function isNullable(string $property): bool
     {
         return self::openAPINullables()[$property] ?? false;
     }
 
     /**
-     * Checks if a nullable property is set to null.
-     *
-     * @param string $property
-     * @return bool
+     * {@inheritdoc}
      */
     public function isNullableSetToNull(string $property): bool
     {
@@ -150,40 +140,31 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
     ];
 
     /**
-     * Array of attributes where the key is the local name,
-     * and the value is the original name
-     *
-     * @return array<string, string>
+     * {@inheritdoc}
      */
     public static function attributeMap(): array
     {
         return {{#parentSchema}}parent::attributeMap() + {{/parentSchema}}self::$attributeMap;
     }
 
     /**
-     * Array of attributes to setter functions (for deserialization of responses)
-     *
-     * @return array<string, string>
+     * {@inheritdoc}
      */
     public static function setters(): array
     {
         return {{#parentSchema}}parent::setters() + {{/parentSchema}}self::$setters;
     }
 
     /**
-     * Array of attributes to getter functions (for serialization of requests)
-     *
-     * @return array<string, string>
+     * {@inheritdoc}
      */
     public static function getters(): array
     {
         return {{#parentSchema}}parent::getters() + {{/parentSchema}}self::$getters;
     }
 
     /**
-     * The original name of the model.
-     *
-     * @return string
+     * {@inheritdoc}
      */
     public function getModelName(): string
     {
@@ -262,14 +243,14 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
     }
 
     /**
-    * Sets $this->container[$variableName] to the given data or to the given default Value; if $variableName
-    * is nullable and its value is set to null in the $fields array, then mark it as "set to null" in the
-    * $this->openAPINullablesSetToNull array
-    *
-    * @param string $variableName
-    * @param array  $fields
-    * @param mixed  $defaultValue
-    */
+     * Sets $this->container[$variableName] to the given data or to the given default Value; if $variableName
+     * is nullable and its value is set to null in the $fields array, then mark it as "set to null" in the
+     * $this->openAPINullablesSetToNull array
+     *
+     * @param string $variableName
+     * @param array  $fields
+     * @param mixed  $defaultValue
+     */
     private function setIfExists(string $variableName, array $fields, mixed $defaultValue): void
     {
         if (self::isNullable($variableName) && array_key_exists($variableName, $fields) && is_null($fields[$variableName])) {
@@ -280,9 +261,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
     }
 
     /**
-     * Show all the invalid properties with reasons.
-     *
-     * @return string[] invalid properties with reasons
+     * {@inheritdoc}
      */
     public function listInvalidProperties(): array
     {
@@ -361,10 +340,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}}{{/parentSchema}}{{^par
     }
 
     /**
-     * Validate all the properties in the model
-     * return true if all passed
-     *
-     * @return bool True if all properties are valid
+     * {@inheritdoc}
      */
     public function valid(): bool
     {