chore: refactored EntityListTrait and entities

andrepimpao · andrepimpao · commit 11b656f62adf · 2023-10-30T19:05:44.000Z
diff --git a/src/Endpoint/AbstractEndpoint.php b/src/Endpoint/AbstractEndpoint.php
@@ -123,9 +123,7 @@ private function handleResponseErrors(ResponseInterface $response): void
     private function buildUrl(string $path, array $query): string
     {
         // Add application key to all requests
-        $query = $query + [
-            'appid' => $this->config->getApplicationKey()
-        ];
+        $query['appid'] = $this->config->getApplicationKey();
 
         return \sprintf('%s%s?%s', $this->config->getBaseUrl(), $path, http_build_query($query));
     }
diff --git a/src/Endpoint/AirPollutionEndpoint.php b/src/Endpoint/AirPollutionEndpoint.php
@@ -8,7 +8,6 @@
 use ProgrammatorDev\OpenWeatherMap\Entity\AirPollution\AirPollutionLocation;
 use ProgrammatorDev\OpenWeatherMap\Exception\ApiErrorException;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
-use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
 class AirPollutionEndpoint extends AbstractEndpoint
 {
diff --git a/src/Endpoint/GeocodingEndpoint.php b/src/Endpoint/GeocodingEndpoint.php
@@ -7,14 +7,13 @@
 use ProgrammatorDev\OpenWeatherMap\Entity\Geocoding\ZipCodeLocation;
 use ProgrammatorDev\OpenWeatherMap\Entity\Location;
 use ProgrammatorDev\OpenWeatherMap\Exception\ApiErrorException;
-use ProgrammatorDev\OpenWeatherMap\Util\CreateEntityListTrait;
+use ProgrammatorDev\OpenWeatherMap\Util\EntityListTrait;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
-use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
 class GeocodingEndpoint extends AbstractEndpoint
 {
     use ValidationTrait;
-    use CreateEntityListTrait;
+    use EntityListTrait;
 
     private const NUM_RESULTS = 5;
 
@@ -40,7 +39,7 @@ public function getByLocationName(string $locationName, int $numResults = self::
             ]
         );
 
-        return $this->createEntityList($data, Location::class);
+        return $this->createEntityList(Location::class, $data);
     }
 
     /**
@@ -85,6 +84,6 @@ public function getByCoordinate(float $latitude, float $longitude, int $numResul
             ]
         );
 
-        return $this->createEntityList($data, Location::class);
+        return $this->createEntityList(Location::class, $data);
     }
 }
diff --git a/src/Endpoint/OneCallEndpoint.php b/src/Endpoint/OneCallEndpoint.php
@@ -11,7 +11,6 @@
 use ProgrammatorDev\OpenWeatherMap\Entity\OneCall\OneCall;
 use ProgrammatorDev\OpenWeatherMap\Exception\ApiErrorException;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
-use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
 class OneCallEndpoint extends AbstractEndpoint
 {
diff --git a/src/Endpoint/WeatherEndpoint.php b/src/Endpoint/WeatherEndpoint.php
@@ -10,7 +10,6 @@
 use ProgrammatorDev\OpenWeatherMap\Entity\Weather\WeatherLocationList;
 use ProgrammatorDev\OpenWeatherMap\Exception\ApiErrorException;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
-use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
 class WeatherEndpoint extends AbstractEndpoint
 {
diff --git a/src/Entity/AirPollution/AirPollutionLocationList.php b/src/Entity/AirPollution/AirPollutionLocationList.php
@@ -3,30 +3,28 @@
 namespace ProgrammatorDev\OpenWeatherMap\Entity\AirPollution;
 
 use ProgrammatorDev\OpenWeatherMap\Entity\Coordinate;
-use ProgrammatorDev\OpenWeatherMap\Util\CreateEntityListTrait;
+use ProgrammatorDev\OpenWeatherMap\Util\EntityListTrait;
 
 class AirPollutionLocationList
 {
-    use CreateEntityListTrait;
+    use EntityListTrait;
 
     private Coordinate $coordinate;
 
+    /** @var AirPollution[] */
     private array $list;
 
     public function __construct(array $data)
     {
         $this->coordinate = new Coordinate($data['coord']);
-        $this->list = $this->createEntityList($data['list'], AirPollution::class);
+        $this->list = $this->createEntityList(AirPollution::class, $data['list']);
     }
 
     public function getCoordinate(): Coordinate
     {
         return $this->coordinate;
     }
 
-    /**
-     * @return AirPollution[]
-     */
     public function getList(): array
     {
         return $this->list;
diff --git a/src/Entity/AirPollution/AirQuality.php b/src/Entity/AirPollution/AirQuality.php
@@ -2,11 +2,11 @@
 
 namespace ProgrammatorDev\OpenWeatherMap\Entity\AirPollution;
 
-use ProgrammatorDev\OpenWeatherMap\Entity\AirPollution\Util\GetAirQualityQualitativeNameTrait;
+use ProgrammatorDev\OpenWeatherMap\Entity\AirPollution\Util\AirQualityQualitativeNameTrait;
 
 class AirQuality
 {
-    use GetAirQualityQualitativeNameTrait;
+    use AirQualityQualitativeNameTrait;
 
     private int $index;
 
diff --git a/src/Entity/AirPollution/Util/AirQualityQualitativeNameTrait.php b/src/Entity/AirPollution/Util/AirQualityQualitativeNameTrait.php
@@ -2,7 +2,7 @@
 
 namespace ProgrammatorDev\OpenWeatherMap\Entity\AirPollution\Util;
 
-trait GetAirQualityQualitativeNameTrait
+trait AirQualityQualitativeNameTrait
 {
     // Levels based on https://openweathermap.org/api/air-pollution
     private array $airQualityIndex = [
diff --git a/src/Entity/AtmosphericPressure.php b/src/Entity/AtmosphericPressure.php
@@ -13,7 +13,6 @@ class AtmosphericPressure
     public function __construct(array $data)
     {
         $this->pressure = $data['pressure'];
-
         $this->seaLevelPressure = $data['sea_level'] ?? null;
         $this->groundLevelPressure = $data['grnd_level'] ?? null;
     }
diff --git a/src/Entity/Location.php b/src/Entity/Location.php
@@ -30,24 +30,15 @@ public function __construct(array $data)
             'lat' => $data['lat'],
             'lon' => $data['lon']
         ]);
-
         $this->id = !empty($data['id']) ? $data['id'] : null;
         $this->name = !empty($data['name']) ? $data['name'] : null;
         $this->state = !empty($data['state']) ? $data['state'] : null;
         $this->countryCode = !empty($data['country']) ? $data['country'] : null;
         $this->localNames = !empty($data['local_names']) ? $data['local_names'] : null;
         $this->population = !empty($data['population']) ? $data['population'] : null;
-
-        $this->sunriseAt = !empty($data['sunrise'])
-            ? \DateTimeImmutable::createFromFormat('U', $data['sunrise'], new \DateTimeZone('UTC'))
-            : null;
-        $this->sunsetAt = !empty($data['sunset'])
-            ? \DateTimeImmutable::createFromFormat('U', $data['sunset'], new \DateTimeZone('UTC'))
-            : null;
-
-        $this->timezone = isset($data['timezone_offset'])
-            ? new Timezone(['timezone_offset' => $data['timezone_offset']])
-            : null;
+        $this->sunriseAt = !empty($data['sunrise']) ? \DateTimeImmutable::createFromFormat('U', $data['sunrise'], new \DateTimeZone('UTC')) : null;
+        $this->sunsetAt = !empty($data['sunset']) ? \DateTimeImmutable::createFromFormat('U', $data['sunset'], new \DateTimeZone('UTC')) : null;
+        $this->timezone = isset($data['timezone_offset']) ? new Timezone(['timezone_offset' => $data['timezone_offset']]) : null;
     }
 
     public function getId(): ?int
diff --git a/src/Entity/OneCall/OneCall.php b/src/Entity/OneCall/OneCall.php
@@ -4,39 +4,39 @@
 
 use ProgrammatorDev\OpenWeatherMap\Entity\Coordinate;
 use ProgrammatorDev\OpenWeatherMap\Entity\Timezone;
-use ProgrammatorDev\OpenWeatherMap\Util\CreateEntityListTrait;
+use ProgrammatorDev\OpenWeatherMap\Util\EntityListTrait;
 
 class OneCall
 {
-    use CreateEntityListTrait;
+    use EntityListTrait;
 
     private Coordinate $coordinate;
 
     private Timezone $timezone;
 
     private Weather $current;
 
+    /** @var ?MinuteForecast[] */
     private ?array $minutelyForecast;
 
+    /** @var Weather[] */
     private array $hourlyForecast;
 
+    /** @var Weather[] */
     private array $dailyForecast;
 
+    /** @var ?Alert[] */
     private ?array $alerts;
 
     public function __construct(array $data)
     {
         $this->coordinate = new Coordinate($data);
         $this->timezone = new Timezone($data);
         $this->current = new Weather($data['current']);
-        $this->minutelyForecast = !empty($data['minutely'])
-            ? $this->createEntityList($data['minutely'], MinuteForecast::class)
-            : null;
-        $this->hourlyForecast = $this->createEntityList($data['hourly'], Weather::class);
-        $this->dailyForecast = $this->createEntityList($data['daily'], Weather::class);
-        $this->alerts = !empty($data['alerts'])
-            ? $this->createEntityList($data['alerts'], Alert::class)
-            : null;
+        $this->minutelyForecast = !empty($data['minutely']) ? $this->createEntityList(MinuteForecast::class, $data['minutely']) : null;
+        $this->hourlyForecast = $this->createEntityList(Weather::class, $data['hourly']);
+        $this->dailyForecast = $this->createEntityList(Weather::class, $data['daily']);
+        $this->alerts = !empty($data['alerts']) ? $this->createEntityList(Alert::class, $data['alerts']) : null;
     }
 
     public function getCoordinate(): Coordinate
@@ -54,33 +54,21 @@ public function getCurrent(): Weather
         return $this->current;
     }
 
-    /**
-     * @return MinuteForecast[]|null
-     */
     public function getMinutelyForecast(): ?array
     {
         return $this->minutelyForecast;
     }
 
-    /**
-     * @return Weather[]
-     */
     public function getHourlyForecast(): array
     {
         return $this->hourlyForecast;
     }
 
-    /**
-     * @return Weather[]
-     */
     public function getDailyForecast(): array
     {
         return $this->dailyForecast;
     }
 
-    /**
-     * @return Alert[]|null
-     */
     public function getAlerts(): ?array
     {
         return $this->alerts;
diff --git a/src/Entity/OneCall/Weather.php b/src/Entity/OneCall/Weather.php
@@ -8,11 +8,11 @@
 use ProgrammatorDev\OpenWeatherMap\Entity\Temperature;
 use ProgrammatorDev\OpenWeatherMap\Entity\WeatherCondition;
 use ProgrammatorDev\OpenWeatherMap\Entity\Wind;
-use ProgrammatorDev\OpenWeatherMap\Util\CreateEntityListTrait;
+use ProgrammatorDev\OpenWeatherMap\Util\EntityListTrait;
 
 class Weather
 {
-    use CreateEntityListTrait;
+    use EntityListTrait;
 
     private \DateTimeImmutable $dateTime;
 
@@ -52,34 +52,21 @@ class Weather
 
     private Snow|float|null $snow;
 
+    /** @var WeatherCondition[] */
     private array $weatherConditions;
 
     public function __construct(array $data)
     {
         $timezoneUtc = new \DateTimeZone('UTC');
 
         $this->dateTime = \DateTimeImmutable::createFromFormat('U', $data['dt'], $timezoneUtc);
-        $this->sunriseAt = !empty($data['sunrise'])
-            ? \DateTimeImmutable::createFromFormat('U', $data['sunrise'], $timezoneUtc)
-            : null;
-        $this->sunsetAt = !empty($data['sunset'])
-            ? \DateTimeImmutable::createFromFormat('U', $data['sunset'], $timezoneUtc)
-            : null;
-        $this->moonriseAt = !empty($data['moonrise'])
-            ? \DateTimeImmutable::createFromFormat('U', $data['moonrise'], $timezoneUtc)
-            : null;
-        $this->moonsetAt = !empty($data['moonset'])
-            ? \DateTimeImmutable::createFromFormat('U', $data['moonset'], $timezoneUtc)
-            : null;
-        $this->moonPhase = !empty($data['moon_phase'])
-            ? new MoonPhase($data)
-            : null;
-        $this->temperature = is_array($data['temp'])
-            ? new Temperature($data['temp'])
-            : $data['temp'];
-        $this->temperatureFeelsLike = is_array($data['feels_like'])
-            ? new Temperature($data['feels_like'])
-            : $data['feels_like'];
+        $this->sunriseAt = !empty($data['sunrise']) ? \DateTimeImmutable::createFromFormat('U', $data['sunrise'], $timezoneUtc) : null;
+        $this->sunsetAt = !empty($data['sunset']) ? \DateTimeImmutable::createFromFormat('U', $data['sunset'], $timezoneUtc) : null;
+        $this->moonriseAt = !empty($data['moonrise']) ? \DateTimeImmutable::createFromFormat('U', $data['moonrise'], $timezoneUtc) : null;
+        $this->moonsetAt = !empty($data['moonset']) ? \DateTimeImmutable::createFromFormat('U', $data['moonset'], $timezoneUtc) : null;
+        $this->moonPhase = !empty($data['moon_phase']) ? new MoonPhase($data) : null;
+        $this->temperature = is_array($data['temp']) ? new Temperature($data['temp']) : $data['temp'];
+        $this->temperatureFeelsLike = is_array($data['feels_like']) ? new Temperature($data['feels_like']) : $data['feels_like'];
         $this->description = $data['summary'] ?? null;
         $this->atmosphericPressure = $data['pressure'];
         $this->humidity = $data['humidity'];
@@ -92,16 +79,14 @@ public function __construct(array $data)
             'deg' => $data['wind_deg'],
             'gust' => $data['wind_gust'] ?? null
         ]);
-        $this->precipitationProbability = isset($data['pop'])
-            ? round($data['pop'] * 100)
-            : null;
+        $this->precipitationProbability = isset($data['pop']) ? round($data['pop'] * 100) : null;
         $this->rain = !empty($data['rain'])
             ? is_array($data['rain']) ? new Rain($data['rain']) : $data['rain']
             : null;
         $this->snow = !empty($data['snow'])
             ? is_array($data['snow']) ? new Snow($data['snow']) : $data['snow']
             : null;
-        $this->weatherConditions = $this->createEntityList($data['weather'], WeatherCondition::class);
+        $this->weatherConditions = $this->createEntityList(WeatherCondition::class, $data['weather']);
     }
 
     public function getDateTime(): \DateTimeImmutable
@@ -199,9 +184,6 @@ public function getSnow(): Snow|float|null
         return $this->snow;
     }
 
-    /**
-     * @return WeatherCondition[]
-     */
     public function getWeatherConditions(): array
     {
         return $this->weatherConditions;
diff --git a/src/Entity/OneCall/WeatherAggregate.php b/src/Entity/OneCall/WeatherAggregate.php
@@ -33,8 +33,7 @@ public function __construct(array $data)
         $this->timezone = new Timezone([
             'timezone_offset' => \DateTimeImmutable::createFromFormat('P', $data['tz'])->getOffset()
         ]);
-        $this->dateTime = \DateTimeImmutable::createFromFormat('Y-m-d', $data['date'], new \DateTimeZone('UTC'))
-            ->setTime(0, 0);
+        $this->dateTime = \DateTimeImmutable::createFromFormat('Y-m-d', $data['date'], new \DateTimeZone('UTC'))->setTime(0, 0);
         $this->cloudiness = round($data['cloud_cover']['afternoon']);
         $this->humidity = round($data['humidity']['afternoon']);
         $this->precipitation = $data['precipitation']['total'];
diff --git a/src/Entity/Weather/Weather.php b/src/Entity/Weather/Weather.php
@@ -7,11 +7,11 @@
 use ProgrammatorDev\OpenWeatherMap\Entity\Snow;
 use ProgrammatorDev\OpenWeatherMap\Entity\WeatherCondition;
 use ProgrammatorDev\OpenWeatherMap\Entity\Wind;
-use ProgrammatorDev\OpenWeatherMap\Util\CreateEntityListTrait;
+use ProgrammatorDev\OpenWeatherMap\Util\EntityListTrait;
 
 class Weather
 {
-    use CreateEntityListTrait;
+    use EntityListTrait;
 
     private float $temperature;
 
@@ -27,6 +27,7 @@ class Weather
 
     private int $visibility;
 
+    /** @var WeatherCondition[] */
     private array $weatherConditions;
 
     private Wind $wind;
@@ -51,18 +52,12 @@ public function __construct(array $data)
         $this->humidity = $data['main']['humidity'];
         $this->cloudiness = $data['clouds']['all'];
         $this->visibility = $data['visibility'];
-        $this->weatherConditions = $this->createEntityList($data['weather'], WeatherCondition::class);
+        $this->weatherConditions = $this->createEntityList(WeatherCondition::class, $data['weather']);
         $this->atmosphericPressure = new AtmosphericPressure($data['main']);
         $this->wind = new Wind($data['wind']);
-        $this->precipitationProbability = isset($data['pop'])
-            ? round($data['pop'] * 100)
-            : null;
-        $this->rain = !empty($data['rain'])
-            ? new Rain($data['rain'])
-            : null;
-        $this->snow = !empty($data['snow'])
-            ? new Snow($data['snow'])
-            : null;
+        $this->precipitationProbability = isset($data['pop']) ? round($data['pop'] * 100) : null;
+        $this->rain = !empty($data['rain']) ? new Rain($data['rain']) : null;
+        $this->snow = !empty($data['snow']) ? new Snow($data['snow']) : null;
     }
 
     public function getTemperature(): float
@@ -100,9 +95,6 @@ public function getVisibility(): int
         return $this->visibility;
     }
 
-    /**
-     * @return WeatherCondition[]
-     */
     public function getWeatherConditions(): array
     {
         return $this->weatherConditions;
diff --git a/src/Entity/Weather/WeatherLocationList.php b/src/Entity/Weather/WeatherLocationList.php
diff --git a/src/Entity/Wind.php b/src/Entity/Wind.php
diff --git a/src/Util/CreateEntityListTrait.php b/src/Util/CreateEntityListTrait.php
diff --git a/src/Util/EntityListTrait.php b/src/Util/EntityListTrait.php

Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,7 @@ private function handleResponseErrors(ResponseInterface $response): void`
`123`	`123`	`private function buildUrl(string $path, array $query): string`
`124`	`124`	`{`
`125`	`125`	`// Add application key to all requests`
`126`		`- $query = $query + [`
`127`		`- 'appid' => $this->config->getApplicationKey()`
`128`		`- ];`
	`126`	`+ $query['appid'] = $this->config->getApplicationKey();`
`129`	`127`
`130`	`128`	`return \sprintf('%s%s?%s', $this->config->getBaseUrl(), $path, http_build_query($query));`
`131`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`use ProgrammatorDev\OpenWeatherMap\Entity\AirPollution\AirPollutionLocation;`
`9`	`9`	`use ProgrammatorDev\OpenWeatherMap\Exception\ApiErrorException;`
`10`	`10`	`use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;`
`11`		`-use ProgrammatorDev\YetAnotherPhpValidator\Validator;`
`12`	`11`
`13`	`12`	`class AirPollutionEndpoint extends AbstractEndpoint`
`14`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,13 @@`
`7`	`7`	`use ProgrammatorDev\OpenWeatherMap\Entity\Geocoding\ZipCodeLocation;`
`8`	`8`	`use ProgrammatorDev\OpenWeatherMap\Entity\Location;`
`9`	`9`	`use ProgrammatorDev\OpenWeatherMap\Exception\ApiErrorException;`
`10`		`-use ProgrammatorDev\OpenWeatherMap\Util\CreateEntityListTrait;`
	`10`	`+use ProgrammatorDev\OpenWeatherMap\Util\EntityListTrait;`
`11`	`11`	`use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;`
`12`		`-use ProgrammatorDev\YetAnotherPhpValidator\Validator;`
`13`	`12`
`14`	`13`	`class GeocodingEndpoint extends AbstractEndpoint`
`15`	`14`	`{`
`16`	`15`	`use ValidationTrait;`
`17`		`- use CreateEntityListTrait;`
	`16`	`+ use EntityListTrait;`
`18`	`17`
`19`	`18`	`private const NUM_RESULTS = 5;`
`20`	`19`
`@@ -40,7 +39,7 @@ public function getByLocationName(string $locationName, int $numResults = self::`
`40`	`39`	`]`
`41`	`40`	`);`
`42`	`41`
`43`		`- return $this->createEntityList($data, Location::class);`
	`42`	`+ return $this->createEntityList(Location::class, $data);`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`/**`
`@@ -85,6 +84,6 @@ public function getByCoordinate(float $latitude, float $longitude, int $numResul`
`85`	`84`	`]`
`86`	`85`	`);`
`87`	`86`
`88`		`- return $this->createEntityList($data, Location::class);`
	`87`	`+ return $this->createEntityList(Location::class, $data);`
`89`	`88`	`}`
`90`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`use ProgrammatorDev\OpenWeatherMap\Entity\OneCall\OneCall;`
`12`	`12`	`use ProgrammatorDev\OpenWeatherMap\Exception\ApiErrorException;`
`13`	`13`	`use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;`
`14`		`-use ProgrammatorDev\YetAnotherPhpValidator\Validator;`
`15`	`14`
`16`	`15`	`class OneCallEndpoint extends AbstractEndpoint`
`17`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`use ProgrammatorDev\OpenWeatherMap\Entity\Weather\WeatherLocationList;`
`11`	`11`	`use ProgrammatorDev\OpenWeatherMap\Exception\ApiErrorException;`
`12`	`12`	`use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;`
`13`		`-use ProgrammatorDev\YetAnotherPhpValidator\Validator;`
`14`	`13`
`15`	`14`	`class WeatherEndpoint extends AbstractEndpoint`
`16`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,30 +3,28 @@`
`3`	`3`	`namespace ProgrammatorDev\OpenWeatherMap\Entity\AirPollution;`
`4`	`4`
`5`	`5`	`use ProgrammatorDev\OpenWeatherMap\Entity\Coordinate;`
`6`		`-use ProgrammatorDev\OpenWeatherMap\Util\CreateEntityListTrait;`
	`6`	`+use ProgrammatorDev\OpenWeatherMap\Util\EntityListTrait;`
`7`	`7`
`8`	`8`	`class AirPollutionLocationList`
`9`	`9`	`{`
`10`		`- use CreateEntityListTrait;`
	`10`	`+ use EntityListTrait;`
`11`	`11`
`12`	`12`	`private Coordinate $coordinate;`
`13`	`13`
	`14`	`+ /** @var AirPollution[] */`
`14`	`15`	`private array $list;`
`15`	`16`
`16`	`17`	`public function __construct(array $data)`
`17`	`18`	`{`
`18`	`19`	`$this->coordinate = new Coordinate($data['coord']);`
`19`		`- $this->list = $this->createEntityList($data['list'], AirPollution::class);`
	`20`	`+ $this->list = $this->createEntityList(AirPollution::class, $data['list']);`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`public function getCoordinate(): Coordinate`
`23`	`24`	`{`
`24`	`25`	`return $this->coordinate;`
`25`	`26`	`}`
`26`	`27`
`27`		`- /**`
`28`		`- * @return AirPollution[]`
`29`		`- */`
`30`	`28`	`public function getList(): array`
`31`	`29`	`{`
`32`	`30`	`return $this->list;`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`
`3`	`3`	`namespace ProgrammatorDev\OpenWeatherMap\Entity\AirPollution;`
`4`	`4`
`5`		`-use ProgrammatorDev\OpenWeatherMap\Entity\AirPollution\Util\GetAirQualityQualitativeNameTrait;`
	`5`	`+use ProgrammatorDev\OpenWeatherMap\Entity\AirPollution\Util\AirQualityQualitativeNameTrait;`
`6`	`6`
`7`	`7`	`class AirQuality`
`8`	`8`	`{`
`9`		`- use GetAirQualityQualitativeNameTrait;`
	`9`	`+ use AirQualityQualitativeNameTrait;`
`10`	`10`
`11`	`11`	`private int $index;`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace ProgrammatorDev\OpenWeatherMap\Entity\AirPollution\Util;`
`4`	`4`
`5`		`-trait GetAirQualityQualitativeNameTrait`
	`5`	`+trait AirQualityQualitativeNameTrait`
`6`	`6`	`{`
`7`	`7`	`// Levels based on https://openweathermap.org/api/air-pollution`
`8`	`8`	`private array $airQualityIndex = [`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ class AtmosphericPressure`
`13`	`13`	`public function __construct(array $data)`
`14`	`14`	`{`
`15`	`15`	`$this->pressure = $data['pressure'];`
`16`		`-`
`17`	`16`	`$this->seaLevelPressure = $data['sea_level'] ?? null;`
`18`	`17`	`$this->groundLevelPressure = $data['grnd_level'] ?? null;`
`19`	`18`	`}`