Skip to content

Commit 2d9a24a

Browse files
dsteeleydsteeley
committed
Merge remote-tracking branch 'origin/master' into rust-server-ssl-features
2 parents a8e6ee2 + 683b024 commit 2d9a24a

1,112 files changed

Lines changed: 11596 additions & 4386 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/samples-python-fastapi-server.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v5
2222
- uses: actions/setup-python@v6
2323
with:
24-
python-version: '3.9'
24+
python-version: '3.10'
2525
- name: Install dependencies
2626
working-directory: ${{ matrix.sample }}
2727
run: |

‎bin/configs/html.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
generatorName: html
2+
outputDir: samples/documentation/html
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/htmlDocs
5+
additionalProperties:
6+
hideGenerationTimestamp: "true"

‎bin/configs/swift6-vapor.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ generateAliasAsModel: true
77
additionalProperties:
88
projectName: PetstoreClient
99
useSPMFileStructure: true
10-
useClasses: true
10+
useClasses: false
1111
useBacktickEscapes: true
1212
mapFileBinaryToData: true

‎bitrise.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,6 @@ workflows:
2727
set -e
2828
2929
./samples/client/petstore/swift6/swift6_test_all.sh
30-
- script@1.2.0:
31-
title: Run Swift5 tests
32-
inputs:
33-
- content: |
34-
#!/usr/bin/env bash
35-
36-
set -e
37-
38-
./samples/client/petstore/swift5/swift5_test_all.sh
3930
- script@1.2.0:
4031
title: Run swift-combine tests
4132
inputs:

‎docs/generators.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The following generators are available:
6868
* [scala-sttp4-jsoniter (beta)](generators/scala-sttp4-jsoniter.md)
6969
* [scalaz](generators/scalaz.md)
7070
* [swift-combine](generators/swift-combine.md)
71-
* [swift5](generators/swift5.md)
71+
* [swift5 (deprecated)](generators/swift5.md)
7272
* [swift6](generators/swift6.md)
7373
* [typescript (experimental)](generators/typescript.md)
7474
* [typescript-angular](generators/typescript-angular.md)

‎docs/generators/python-fastapi.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ title: Documentation for the python-fastapi Generator
1010
| generator stability | BETA | |
1111
| generator type | SERVER | |
1212
| generator language | Python | |
13-
| generator language version | 3.7 | |
13+
| generator language version | 3.10 | |
1414
| generator default templating engine | mustache | |
1515
| helpTxt | Generates a Python FastAPI server (beta). Models are defined with the pydantic library | |
1616

‎docs/generators/swift5.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ title: Documentation for the swift5 Generator
77
| Property | Value | Notes |
88
| -------- | ----- | ----- |
99
| generator name | swift5 | pass this to the generate command after -g |
10-
| generator stability | STABLE | |
10+
| generator stability | DEPRECATED | |
1111
| generator type | CLIENT | |
1212
| generator language | Swift | |
1313
| generator default templating engine | mustache | |

‎modules/openapi-generator/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@
488488
<dependency>
489489
<groupId>org.assertj</groupId>
490490
<artifactId>assertj-core</artifactId>
491-
<version>3.23.1</version>
491+
<version>3.27.7</version>
492492
<scope>test</scope>
493493
</dependency>
494494
<dependency>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,11 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
214214
String phpReturnType = String.join("|", phpReturnTypeOptions);
215215
String docReturnType = String.join("|", docReturnTypeOptions);
216216
if (hasEmptyResponse) {
217-
phpReturnType = "?" + phpReturnType;
217+
if (phpReturnTypeOptions.size() > 1) {
218+
phpReturnType = phpReturnType + "|null";
219+
} else {
220+
phpReturnType = "?" + phpReturnType;
221+
}
218222
docReturnType = docReturnType + "|null";
219223
}
220224

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ public void postProcess() {
330330

331331
@Override
332332
public String generatorLanguageVersion() {
333-
return "3.7";
333+
return "3.10";
334334
}
335335

336336
@Override

0 commit comments

Comments
 (0)