Merge branch 'master' into new_generators_tweaks

Author: HugoMario

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

@@ -124,6 +124,9 @@ protected CodegenModel processArrayItemSchema(CodegenModel codegenModel, ArraySc
         final Schema itemsSchema = arraySchema.getItems();
         if (itemsSchema instanceof ComposedSchema) {
             final CodegenModel composedModel = this.processComposedSchema(codegenModel.name + ARRAY_ITEMS_SUFFIX, (ComposedSchema) itemsSchema, allModels);
+            if (composedModel == null) {
+                return null;
+            }
             this.updateArrayModel(codegenModel, composedModel.name, arraySchema);
             return composedModel;
         }

src/main/resources/handlebars/csharp/Configuration.mustache

@@ -113,7 +113,6 @@ namespace {{packageName}}.Client
             ApiKey = new {{^net35}}Concurrent{{/net35}}Dictionary<string, string>();
             ApiKeyPrefix = new {{^net35}}Concurrent{{/net35}}Dictionary<string, string>();
 
-            // Setting Timeout has side effects (forces ApiClient creation).
             Timeout = 100000;
         }
 
@@ -236,15 +235,49 @@ namespace {{packageName}}.Client
         /// </summary>
         public virtual IDictionary<string, string> DefaultHeader { get; set; }
 
+        private int _timeout = 100000;
         /// <summary>
         /// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
         /// </summary>
         public virtual int Timeout
         {
-            {{#netStandard}}get { return (int)ApiClient.RestClient.Timeout.GetValueOrDefault(TimeSpan.FromSeconds(0)).TotalMilliseconds; }
-            set { ApiClient.RestClient.Timeout = TimeSpan.FromMilliseconds(value); }{{/netStandard}}{{^netStandard}}
-            get { return ApiClient.RestClient.Timeout; }
-            set { ApiClient.RestClient.Timeout = value; }{{/netStandard}}
+            {{#netStandard}}get
+            { 
+                if (_apiClient == null)
+                {
+                    return _timeout;
+                } else
+                {
+                    return (int)ApiClient.RestClient.Timeout.GetValueOrDefault(TimeSpan.FromSeconds(0)).TotalMilliseconds;
+                }
+            }
+            set
+            {
+                _timeout = value;
+                if (_apiClient != null)
+                {
+                    ApiClient.RestClient.Timeout = TimeSpan.FromMilliseconds(_timeout);
+                }
+            }{{/netStandard}}{{^netStandard}}
+            get
+            {
+                if (_apiClient == null)
+                {
+                    return _timeout;
+                } 
+                else
+                {
+                    return ApiClient.RestClient.Timeout;
+                }
+            }
+            set
+            {
+                _timeout = value;
+                if (_apiClient != null)
+                {
+                    ApiClient.RestClient.Timeout = _timeout;
+                }
+            }{{/netStandard}}
         }
 
         /// <summary>

src/main/resources/handlebars/php/ObjectSerializer.mustache

@@ -33,12 +33,11 @@ class ObjectSerializer
      * Serialize data
      *
      * @param mixed  $data   the data to serialize
-     * @param string $type   the SwaggerType of the data
      * @param string $format the format of the Swagger type of the data
      *
      * @return string|object serialized form of $data
      */
-    public static function sanitizeForSerialization($data, $type = null, $format = null)
+    public static function sanitizeForSerialization($data, $format = null)
     {
         if (is_scalar($data) || null === $data) {
             return $data;
@@ -109,22 +108,23 @@ class ObjectSerializer
      * later.
      *
      * @param string[]|string|\DateTime $object an object to be serialized to a string
+     * @param string|null $format the format of the parameter
      *
      * @return string the serialized object
      */
-    public static function toQueryValue($object)
+    public static function toQueryValue($object, $format = null)
     {
         if (is_array($object)) {
             return implode(',', $object);
         } else {
-            return self::toString($object);
+            return self::toString($object, $format);
         }
     }
 
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the header. If it's a string, pass through unchanged
-     * If it's a datetime object, format it in ISO8601
+     * If it's a datetime object, format it in RFC3339
      *
      * @param string $value a string which will be part of the header
      *
@@ -138,7 +138,7 @@ class ObjectSerializer
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the http body (form parameter). If it's a string, pass through unchanged
-     * If it's a datetime object, format it in ISO8601
+     * If it's a datetime object, format it in RFC3339
      *
      * @param string|\SplFileObject $value the value of the form parameter
      *
@@ -156,16 +156,18 @@ class ObjectSerializer
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the parameter. If it's a string, pass through unchanged
-     * If it's a datetime object, format it in ISO8601
+     * If it's a datetime object, format it in RFC3339
+     * If it's a date, format it in Y-m-d
      *
      * @param string|\DateTime $value the value of the parameter
+     * @param string|null $format the format of the parameter
      *
      * @return string the header string
      */
-    public static function toString($value)
+    public static function toString($value, $format = null)
     {
-        if ($value instanceof \DateTime) { // datetime in ISO8601 format
-            return $value->format(\DateTime::ATOM);
+        if ($value instanceof \DateTime) {
+            return ($format === 'date') ? $value->format('Y-m-d') : $value->format(\DateTime::ATOM);
         } else {
             return $value;
         }

src/main/resources/handlebars/php/api.mustache

@@ -361,7 +361,7 @@ use {{invokerPackage}}\ObjectSerializer;
         }
         {{/collectionFormat}}
         if (${{paramName}} !== null) {
-            $queryParams['{{baseName}}'] = ObjectSerializer::toQueryValue(${{paramName}});
+            $queryParams['{{baseName}}'] = ObjectSerializer::toQueryValue(${{paramName}}, {{#dataFormat}}'{{{dataFormat}}}'{{/dataFormat}}{{^dataFormat}}null{{/dataFormat}});
         }
         {{/queryParams}}
         {{#headerParams}}