Merge remote-tracking branch 'origin/3.4.x' into 4.0.x

2025-07-03 06:00:52 +00:00 · 2018-10-26 23:13:28 +08:00 · 2018-10-26 23:13:28 +08:00 · 71ecee02e9
commit 71ecee02e9
parent 4a47acce19 ed2f6ea72e
18 changed files with 24 additions and 16 deletions
--- a/docs/generators/elm.md
+++ b/docs/generators/elm.md
@ -6,4 +6,7 @@ CONFIG OPTIONS for elm
 	        0.19 - Elm 0.19
 	        0.18 - Elm 0.18

+	elmPrefixCustomTypeVariants
+	    Prefix custom type variants (Default: false)
+
 Back to the [generators list](README.md)
--- a/docs/generators/rust.md
+++ b/docs/generators/rust.md
@ -10,4 +10,9 @@ CONFIG OPTIONS for rust
 	hideGenerationTimestamp
 	    Hides the generation timestamp when files are generated. (Default: true)

+	library
+	    library template (sub-template) to use. (Default: hyper)
+	        hyper - HTTP client: Hyper.
+	        reqwest - HTTP client: Reqwest.
+
 Back to the [generators list](README.md)
--- a/samples/client/petstore/ruby/lib/petstore/api/default_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/default_api.rb
@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0

 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.3.2-SNAPSHOT
+OpenAPI Generator version: 3.4.0-SNAPSHOT

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/foo.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/foo.rb
@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0

 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.3.2-SNAPSHOT
+OpenAPI Generator version: 3.4.0-SNAPSHOT

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/inline_response_default.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/inline_response_default.rb
@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0.0

 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.3.2-SNAPSHOT
+OpenAPI Generator version: 3.4.0-SNAPSHOT

 =end

--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php
@ -17,7 +17,7 @@
 * OpenAPI spec version: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.2-SNAPSHOT
+ * OpenAPI Generator version: 3.4.0-SNAPSHOT
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php
@ -18,7 +18,7 @@
 * OpenAPI spec version: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.2-SNAPSHOT
+ * OpenAPI Generator version: 3.4.0-SNAPSHOT
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject.php
@ -18,7 +18,7 @@
 * OpenAPI spec version: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.2-SNAPSHOT
+ * OpenAPI Generator version: 3.4.0-SNAPSHOT
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject1.php
@ -18,7 +18,7 @@
 * OpenAPI spec version: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.2-SNAPSHOT
+ * OpenAPI Generator version: 3.4.0-SNAPSHOT
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject2.php
@ -18,7 +18,7 @@
 * OpenAPI spec version: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.2-SNAPSHOT
+ * OpenAPI Generator version: 3.4.0-SNAPSHOT
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject3.php
@ -18,7 +18,7 @@
 * OpenAPI spec version: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.2-SNAPSHOT
+ * OpenAPI Generator version: 3.4.0-SNAPSHOT
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject4.php
@ -18,7 +18,7 @@
 * OpenAPI spec version: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.2-SNAPSHOT
+ * OpenAPI Generator version: 3.4.0-SNAPSHOT
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineObject5.php
@ -18,7 +18,7 @@
 * OpenAPI spec version: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.2-SNAPSHOT
+ * OpenAPI Generator version: 3.4.0-SNAPSHOT
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php
@ -18,7 +18,7 @@
 * OpenAPI spec version: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.2-SNAPSHOT
+ * OpenAPI Generator version: 3.4.0-SNAPSHOT
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
@ -17,7 +17,7 @@
 * OpenAPI spec version: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.2-SNAPSHOT
+ * OpenAPI Generator version: 3.4.0-SNAPSHOT
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
@ -18,7 +18,7 @@
 * OpenAPI spec version: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.2-SNAPSHOT
+ * OpenAPI Generator version: 3.4.0-SNAPSHOT
 */

 /**
--- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php
+++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineResponseDefaultTest.php
@ -18,7 +18,7 @@
 * OpenAPI spec version: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
- * OpenAPI Generator version: 3.3.2-SNAPSHOT
+ * OpenAPI Generator version: 3.4.0-SNAPSHOT
 */

 /**
--- a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION
@ -1 +1 @@
-3.3.2-SNAPSHOT
+3.4.0-SNAPSHOT