Skip to content

Commit 86ebddc

Browse files
committed
Fix optional wrapping
1 parent b4bb9da commit 86ebddc

File tree

4 files changed

+8
-20
lines changed

4 files changed

+8
-20
lines changed

templates/apple/Sources/Client.swift.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ open class Client {
444444
encodedParams[key] = param
445445
} else if let encodable = param as? Encodable {
446446
encodedParams[key] = try encodable.toJson()
447-
} else {
447+
} else if let param = param {
448448
encodedParams[key] = String(describing: param)
449449
}
450450
}

templates/swift/Sources/Client.swift.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ open class Client {
480480
encodedParams[key] = param
481481
} else if let encodable = param as? Encodable {
482482
encodedParams[key] = try encodable.toJson()
483-
} else {
483+
} else if let param = param {
484484
encodedParams[key] = String(describing: param)
485485
}
486486
}
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Foundation
22

3-
public enum {{ enum.name | caseUcfirst | overrideIdentifier }}: String, CustomStringConvertible, Codable {
3+
public enum {{ enum.name | caseUcfirst | overrideIdentifier }}: String, CustomStringConvertible {
44
{%~ for value in enum.enum %}
55
{%~ set key = enum.keys is empty ? value : enum.keys[loop.index0] %}
66
case {{ key | caseEnumKey | escapeSwiftKeyword }} = "{{ value }}"
@@ -9,9 +9,4 @@ public enum {{ enum.name | caseUcfirst | overrideIdentifier }}: String, CustomSt
99
public var description: String {
1010
return rawValue
1111
}
12-
13-
public func encode(to encoder: Encoder) throws {
14-
var container = encoder.singleValueContainer()
15-
try container.encode(rawValue)
16-
}
1712
}

tests/Base.php

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -139,18 +139,11 @@ public function setUp(): void
139139

140140
$this->expectedOutput[] = $headers;
141141

142-
// Figure out if mock-server is running
143-
$isMockAPIRunning = \strlen(\exec('docker ps | grep mock-server')) > 0;
144-
145-
if (!$isMockAPIRunning) {
146-
echo "Starting Mock API Server";
147-
148-
\exec('
149-
cd ./mock-server && \
150-
docker compose build && \
151-
docker compose up -d --force-recreate
152-
');
153-
}
142+
\exec('
143+
cd ./mock-server && \
144+
docker compose build && \
145+
docker compose up -d --force-recreate
146+
');
154147
}
155148

156149
public function tearDown(): void

0 commit comments

Comments
 (0)