Skip to content

Commit 51327e3

Browse files
andrepimpaoandrepimpao
committed
refactor(one-call): standardize dew point getters
1 parent 8d9726a commit 51327e3

7 files changed

Lines changed: 39 additions & 39 deletions

File tree

‎src/Entity/OneCall/Current.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ private function __construct(
3232
private readonly ?float $feelsLikeTemperature,
3333
private readonly ?int $pressure,
3434
private readonly ?int $humidity,
35-
private readonly ?float $dewPointTemperature,
35+
private readonly ?float $dewPoint,
3636
private readonly ?float $ultravioletIndex,
3737
private readonly ?int $visibility,
3838
private readonly ?Wind $wind,
@@ -86,7 +86,7 @@ public static function fromArray(array $data, ?Context $context = null): static
8686
feelsLikeTemperature: $reader->nullableFloat('data.0.feels_like'),
8787
pressure: $reader->nullableInt('data.0.pressure'),
8888
humidity: $reader->nullableInt('data.0.humidity'),
89-
dewPointTemperature: $reader->nullableFloat('data.0.dew_point'),
89+
dewPoint: $reader->nullableFloat('data.0.dew_point'),
9090
ultravioletIndex: $reader->nullableFloat('data.0.uvi'),
9191
visibility: $reader->nullableInt('data.0.visibility'),
9292
wind: $hasWind
@@ -197,21 +197,21 @@ public function humidityWithUnit(): ?string
197197
return MeasurementFormatter::format($this->humidity, $this->humidityUnit());
198198
}
199199

200-
public function dewPointTemperature(): ?float
200+
public function dewPoint(): ?float
201201
{
202-
return $this->dewPointTemperature;
202+
return $this->dewPoint;
203203
}
204204

205-
public function dewPointTemperatureUnit(): Unit
205+
public function dewPointUnit(): Unit
206206
{
207207
return $this->units->temperatureUnit();
208208
}
209209

210-
public function dewPointTemperatureWithUnit(): ?string
210+
public function dewPointWithUnit(): ?string
211211
{
212212
return MeasurementFormatter::format(
213-
$this->dewPointTemperature,
214-
$this->dewPointTemperatureUnit(),
213+
$this->dewPoint,
214+
$this->dewPointUnit(),
215215
);
216216
}
217217

‎src/Entity/OneCall/OneDayTimeline/Period.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private function __construct(
3131
private readonly ?FeelsLikeTemperature $feelsLikeTemperature,
3232
private readonly ?float $pressure,
3333
private readonly ?int $humidity,
34-
private readonly ?float $dewPointTemperature,
34+
private readonly ?float $dewPoint,
3535
private readonly ?float $ultravioletIndex,
3636
private readonly ?int $visibility,
3737
private readonly ?Wind $wind,
@@ -84,7 +84,7 @@ public static function fromArray(array $data, ?Context $context = null): static
8484
: FeelsLikeTemperature::fromArray($feelsLikeTemperature, $context),
8585
pressure: $reader->nullableFloat('pressure'),
8686
humidity: $reader->nullableInt('humidity'),
87-
dewPointTemperature: $reader->nullableFloat('dew_point'),
87+
dewPoint: $reader->nullableFloat('dew_point'),
8888
ultravioletIndex: $reader->nullableFloat('uvi'),
8989
visibility: $reader->nullableInt('visibility'),
9090
wind: $hasWind
@@ -180,21 +180,21 @@ public function humidityWithUnit(): ?string
180180
return MeasurementFormatter::format($this->humidity, $this->humidityUnit());
181181
}
182182

183-
public function dewPointTemperature(): ?float
183+
public function dewPoint(): ?float
184184
{
185-
return $this->dewPointTemperature;
185+
return $this->dewPoint;
186186
}
187187

188-
public function dewPointTemperatureUnit(): Unit
188+
public function dewPointUnit(): Unit
189189
{
190190
return $this->units->temperatureUnit();
191191
}
192192

193-
public function dewPointTemperatureWithUnit(): ?string
193+
public function dewPointWithUnit(): ?string
194194
{
195195
return MeasurementFormatter::format(
196-
$this->dewPointTemperature,
197-
$this->dewPointTemperatureUnit(),
196+
$this->dewPoint,
197+
$this->dewPointUnit(),
198198
);
199199
}
200200

‎src/Entity/OneCall/Timeline/WeatherPeriod.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected function __construct(
3030
private readonly ?float $feelsLikeTemperature,
3131
private readonly ?float $pressure,
3232
private readonly ?int $humidity,
33-
private readonly ?float $dewPointTemperature,
33+
private readonly ?float $dewPoint,
3434
private readonly ?float $ultravioletIndex,
3535
private readonly ?int $visibility,
3636
private readonly ?Wind $wind,
@@ -74,7 +74,7 @@ public static function fromArray(array $data, ?Context $context = null): static
7474
feelsLikeTemperature: $reader->nullableFloat('feels_like'),
7575
pressure: $reader->nullableFloat('pressure'),
7676
humidity: $reader->nullableInt('humidity'),
77-
dewPointTemperature: $reader->nullableFloat('dew_point'),
77+
dewPoint: $reader->nullableFloat('dew_point'),
7878
ultravioletIndex: $reader->nullableFloat('uvi'),
7979
visibility: $reader->nullableInt('visibility'),
8080
wind: $hasWind
@@ -166,21 +166,21 @@ public function humidityWithUnit(): ?string
166166
return MeasurementFormatter::format($this->humidity, $this->humidityUnit());
167167
}
168168

169-
public function dewPointTemperature(): ?float
169+
public function dewPoint(): ?float
170170
{
171-
return $this->dewPointTemperature;
171+
return $this->dewPoint;
172172
}
173173

174-
public function dewPointTemperatureUnit(): Unit
174+
public function dewPointUnit(): Unit
175175
{
176176
return $this->units->temperatureUnit();
177177
}
178178

179-
public function dewPointTemperatureWithUnit(): ?string
179+
public function dewPointWithUnit(): ?string
180180
{
181181
return MeasurementFormatter::format(
182-
$this->dewPointTemperature,
183-
$this->dewPointTemperatureUnit(),
182+
$this->dewPoint,
183+
$this->dewPointUnit(),
184184
);
185185
}
186186

‎tests/Unit/Entity/OneCall/CurrentTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public function testHydratesCapturedCurrentWeather(): void
4141
self::assertSame(71, $current->humidity());
4242
self::assertSame(Unit::PERCENT, $current->humidityUnit());
4343
self::assertSame('71 %', $current->humidityWithUnit());
44-
self::assertSame(18.75, $current->dewPointTemperature());
45-
self::assertSame(Unit::CELSIUS, $current->dewPointTemperatureUnit());
46-
self::assertSame('18.75 °C', $current->dewPointTemperatureWithUnit());
44+
self::assertSame(18.75, $current->dewPoint());
45+
self::assertSame(Unit::CELSIUS, $current->dewPointUnit());
46+
self::assertSame('18.75 °C', $current->dewPointWithUnit());
4747
self::assertSame(7.53, $current->ultravioletIndex());
4848
self::assertSame(40, $current->clouds()?->coverage());
4949
self::assertSame(Unit::PERCENT, $current->clouds()?->coverageUnit());
@@ -123,7 +123,7 @@ public function testRetainsUnitsFromHydrationContext(): void
123123
self::assertSame(Unit::FAHRENHEIT, $current->temperatureUnit());
124124
self::assertSame('72.5 °F', $current->temperatureWithUnit());
125125
self::assertSame('71 °F', $current->feelsLikeTemperatureWithUnit());
126-
self::assertSame('60 °F', $current->dewPointTemperatureWithUnit());
126+
self::assertSame('60 °F', $current->dewPointWithUnit());
127127
self::assertSame(Unit::MILES_PER_HOUR, $current->wind()?->speedUnit());
128128
self::assertSame('10 mph', $current->wind()?->speedWithUnit());
129129
self::assertSame('15 mph', $current->wind()?->gustWithUnit());
@@ -138,7 +138,7 @@ public function testToleratesMissingNullUnknownAndPartialFields(): void
138138
self::assertNull($missing->dateTime());
139139
self::assertNull($missing->temperature());
140140
self::assertNull($missing->temperatureWithUnit());
141-
self::assertNull($missing->dewPointTemperature());
141+
self::assertNull($missing->dewPoint());
142142
self::assertNull($missing->ultravioletIndex());
143143
self::assertNull($missing->wind());
144144
self::assertNull($missing->clouds());

‎tests/Unit/Entity/OneCall/FifteenMinuteTimeline/PeriodTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ public function testHydratesCapturedForecastPeriod(): void
3232
self::assertSame(55, $period->humidity());
3333
self::assertSame(Unit::PERCENT, $period->humidityUnit());
3434
self::assertSame('55 %', $period->humidityWithUnit());
35-
self::assertSame(16.45, $period->dewPointTemperature());
36-
self::assertSame(Unit::CELSIUS, $period->dewPointTemperatureUnit());
37-
self::assertSame('16.45 °C', $period->dewPointTemperatureWithUnit());
35+
self::assertSame(16.45, $period->dewPoint());
36+
self::assertSame(Unit::CELSIUS, $period->dewPointUnit());
37+
self::assertSame('16.45 °C', $period->dewPointWithUnit());
3838
self::assertSame(8.06, $period->ultravioletIndex());
3939
self::assertSame(10000, $period->visibility());
4040
self::assertSame(Unit::METER, $period->visibilityUnit());
@@ -105,7 +105,7 @@ public function testRetainsUnitsFromHydrationContext(): void
105105
self::assertSame(Unit::FAHRENHEIT, $period->temperatureUnit());
106106
self::assertSame('72.5 °F', $period->temperatureWithUnit());
107107
self::assertSame('71 °F', $period->feelsLikeTemperatureWithUnit());
108-
self::assertSame('60 °F', $period->dewPointTemperatureWithUnit());
108+
self::assertSame('60 °F', $period->dewPointWithUnit());
109109
self::assertSame(Unit::MILES_PER_HOUR, $period->wind()?->speedUnit());
110110
self::assertSame('10 mph', $period->wind()?->speedWithUnit());
111111
self::assertSame('15 mph', $period->wind()?->gustWithUnit());

‎tests/Unit/Entity/OneCall/OneDayTimeline/PeriodTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function testHydratesCapturedDailyPeriod(): void
4040
self::assertSame(Unit::HECTOPASCAL, $period->pressureUnit());
4141
self::assertSame('1015.44 hPa', $period->pressureWithUnit());
4242
self::assertSame(48, $period->humidity());
43-
self::assertNull($period->dewPointTemperature());
43+
self::assertNull($period->dewPoint());
4444
self::assertSame(0.0, $period->ultravioletIndex());
4545
self::assertNull($period->visibility());
4646
self::assertSame(6.17, $period->wind()?->speed());
@@ -89,8 +89,8 @@ public function testHydratesDocumentedFieldsAbsentFromCapturedPeriods(): void
8989
'alerts' => ['alert-id'],
9090
]);
9191

92-
self::assertSame(16.5, $period->dewPointTemperature());
93-
self::assertSame('16.5 °C', $period->dewPointTemperatureWithUnit());
92+
self::assertSame(16.5, $period->dewPoint());
93+
self::assertSame('16.5 °C', $period->dewPointWithUnit());
9494
self::assertSame(10000, $period->visibility());
9595
self::assertSame('10000 m', $period->visibilityWithUnit());
9696
self::assertSame(8.2, $period->wind()?->gust());
@@ -113,7 +113,7 @@ public function testRetainsUnitsFromHydrationContext(): void
113113
self::assertSame(Unit::FAHRENHEIT, $period->temperature()?->dayUnit());
114114
self::assertSame('72.5 °F', $period->temperature()?->dayWithUnit());
115115
self::assertSame('71 °F', $period->feelsLikeTemperature()?->dayWithUnit());
116-
self::assertSame('60 °F', $period->dewPointTemperatureWithUnit());
116+
self::assertSame('60 °F', $period->dewPointWithUnit());
117117
self::assertSame(Unit::MILES_PER_HOUR, $period->wind()?->speedUnit());
118118
self::assertSame('10 mph', $period->wind()?->speedWithUnit());
119119
}

‎tests/Unit/Entity/OneCall/OneHourTimeline/PeriodTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function testHydratesCapturedPeriod(): void
2828
self::assertSame(1015.0, $period->pressure());
2929
self::assertSame('1015 hPa', $period->pressureWithUnit());
3030
self::assertSame(62, $period->humidity());
31-
self::assertSame(17.27, $period->dewPointTemperature());
31+
self::assertSame(17.27, $period->dewPoint());
3232
self::assertSame(7.53, $period->ultravioletIndex());
3333
self::assertSame(10000, $period->visibility());
3434
self::assertSame(3.87, $period->wind()?->speed());
@@ -90,7 +90,7 @@ public function testRetainsUnitsFromHydrationContext(): void
9090
self::assertSame(Unit::FAHRENHEIT, $period->temperatureUnit());
9191
self::assertSame('72.5 °F', $period->temperatureWithUnit());
9292
self::assertSame('71 °F', $period->feelsLikeTemperatureWithUnit());
93-
self::assertSame('60 °F', $period->dewPointTemperatureWithUnit());
93+
self::assertSame('60 °F', $period->dewPointWithUnit());
9494
self::assertSame(Unit::MILES_PER_HOUR, $period->wind()?->speedUnit());
9595
self::assertSame('10 mph', $period->wind()?->speedWithUnit());
9696
self::assertSame('15 mph', $period->wind()?->gustWithUnit());

0 commit comments

Comments
 (0)