Skip to content

Commit cfe9ada

Browse files
committed
Make timezone nullable
1 parent 48e3d8c commit cfe9ada

File tree

3 files changed

+124
-3
lines changed

3 files changed

+124
-3
lines changed

lib/Model/Response/SettingsResponse.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class SettingsResponse extends AbstractDefaultResponse
99

1010
private ?string $name;
1111

12-
private string $timezone;
12+
private ?string $timezone;
1313

1414
private float $lat;
1515

@@ -154,12 +154,12 @@ public function setName(?string $name): void
154154
$this->name = $name;
155155
}
156156

157-
public function getTimezone(): string
157+
public function getTimezone(): ?string
158158
{
159159
return $this->timezone;
160160
}
161161

162-
public function setTimezone(string $timezone): void
162+
public function setTimezone(?string $timezone): void
163163
{
164164
$this->timezone = $timezone;
165165
}
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
{
2+
"device": {
3+
"type": "SHPLG-S",
4+
"mac": "24A160203491",
5+
"hostname": "shellyplug-s-30911A",
6+
"num_outputs": 1,
7+
"num_meters": 1
8+
},
9+
"wifi_ap": {
10+
"enabled": false,
11+
"ssid": "shellyplug-s-30911A",
12+
"key": ""
13+
},
14+
"wifi_sta": {
15+
"enabled": true,
16+
"ssid": "Test",
17+
"ipv4_method": "dhcp",
18+
"ip": null,
19+
"gw": null,
20+
"mask": null,
21+
"dns": null
22+
},
23+
"wifi_sta1": {
24+
"enabled": false,
25+
"ssid": null,
26+
"ipv4_method": "dhcp",
27+
"ip": null,
28+
"gw": null,
29+
"mask": null,
30+
"dns": null
31+
},
32+
"ap_roaming": {
33+
"enabled": false,
34+
"threshold": -70
35+
},
36+
"mqtt": {
37+
"enable": false,
38+
"server": "192.168.33.3:1883",
39+
"user": "",
40+
"id": "shellyplug-s-30911A",
41+
"reconnect_timeout_max": 60.000000,
42+
"reconnect_timeout_min": 2.000000,
43+
"clean_session": true,
44+
"keep_alive": 60,
45+
"max_qos": 0,
46+
"retain": false,
47+
"update_period": 30
48+
},
49+
"coiot": {
50+
"enabled": true,
51+
"update_period": 15,
52+
"peer": ""
53+
},
54+
"sntp": {
55+
"server": "192.168.33.1",
56+
"enabled": true
57+
},
58+
"login": {
59+
"enabled": true,
60+
"unprotected": false,
61+
"username": "test"
62+
},
63+
"pin_code": "",
64+
"name": "PC",
65+
"fw": "20210909-145347/v1.11.4-DNSfix-ge6b2f6d",
66+
"discoverable": false,
67+
"build_info": {
68+
"build_id": "20210909-145347/v1.11.4-DNSfix-ge6b2f6d",
69+
"build_timestamp": "2021-09-09T14:53:47Z",
70+
"build_version": "1.0"
71+
},
72+
"cloud": {
73+
"enabled": false,
74+
"connected": false
75+
},
76+
"timezone": null,
77+
"lat": 500.000000,
78+
"lng": 500.000000,
79+
"tzautodetect": true,
80+
"tz_utc_offset": 0,
81+
"tz_dst": false,
82+
"tz_dst_auto": true,
83+
"time": "",
84+
"unixtime": 0,
85+
"led_status_disable": true,
86+
"debug_enable": false,
87+
"allow_cross_origin": false,
88+
"actions": {
89+
"active": false,
90+
"names": [
91+
"btn_on_url",
92+
"out_on_url",
93+
"out_off_url"
94+
]
95+
},
96+
"hwinfo": {
97+
"hw_revision": "prod-190516",
98+
"batch_id": 1
99+
},
100+
"max_power": 2500,
101+
"led_status_disable": true,
102+
"led_power_disable": true,
103+
"relays": [
104+
{
105+
"name": null,
106+
"appliance_type": "General",
107+
"ison": true,
108+
"has_timer": false,
109+
"default_state": "off",
110+
"auto_on": 0.00,
111+
"auto_off": 0.00,
112+
"schedule": false,
113+
"schedule_rules": [],
114+
"max_power": 2500
115+
}
116+
]
117+
}

tests/Model/Request/SettingsRequestTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ public function simpleDataProvider(): array
3737
__DIR__ . '/Fixtures/settings/settings_shelly_plug_s.json',
3838
'SHPLG-S',
3939
],
40+
[
41+
__DIR__ . '/Fixtures/settings/settings_shelly_plug_s_version_1_11.json',
42+
'SHPLG-S',
43+
],
4044
];
4145
}
4246

0 commit comments

Comments
 (0)