chore: change traits to static class helpers

andrepimpao · andrepimpao · commit fcb9c514b776 · 2025-11-08T17:14:43.000Z
diff --git a/src/Entity/AirPollution/AirPollutionCollection.php b/src/Entity/AirPollution/AirPollutionCollection.php
@@ -3,12 +3,10 @@
 namespace ProgrammatorDev\OpenWeatherMap\Entity\AirPollution;
 
 use ProgrammatorDev\OpenWeatherMap\Entity\Coordinate;
-use ProgrammatorDev\OpenWeatherMap\Util\EntityTrait;
+use ProgrammatorDev\OpenWeatherMap\Helper\EntityHelper;
 
 class AirPollutionCollection
 {
-    use EntityTrait;
-
     private int $numResults;
 
     private Coordinate $coordinate;
@@ -20,7 +18,7 @@ public function __construct(array $data)
     {
         $this->numResults = count($data['list']);
         $this->coordinate = new Coordinate($data['coord']);
-        $this->data = $this->createEntityList(AirPollutionData::class, $data['list']);
+        $this->data = EntityHelper::createEntityList(AirPollutionData::class, $data['list']);
     }
 
     public function getNumResults(): int
diff --git a/src/Entity/Assistant/Answer.php b/src/Entity/Assistant/Answer.php
@@ -2,12 +2,10 @@
 
 namespace ProgrammatorDev\OpenWeatherMap\Entity\Assistant;
 
-use ProgrammatorDev\OpenWeatherMap\Util\EntityTrait;
+use ProgrammatorDev\OpenWeatherMap\Helper\EntityHelper;
 
 class Answer
 {
-    use EntityTrait;
-
     private string $answer;
 
     private string $sessionId;
@@ -21,7 +19,7 @@ public function __construct(array $data)
         $this->sessionId = $data['session_id'];
 
         if (!empty($data['data'])) {
-            $this->data = $this->createEntityKeyList(WeatherData::class, $data['data']);
+            $this->data = EntityHelper::createEntityKeyList(WeatherData::class, $data['data']);
         }
     }
 
diff --git a/src/Entity/BaseWeather.php b/src/Entity/BaseWeather.php
@@ -2,12 +2,10 @@
 
 namespace ProgrammatorDev\OpenWeatherMap\Entity;
 
-use ProgrammatorDev\OpenWeatherMap\Util\EntityTrait;
+use ProgrammatorDev\OpenWeatherMap\Helper\EntityHelper;
 
 class BaseWeather
 {
-    use EntityTrait;
-
     private \DateTimeImmutable $dateTime;
 
     private int $atmosphericPressure;
@@ -44,7 +42,7 @@ public function __construct(array $data)
             'gust' => $data['wind_gust'] ?? null
         ]);
 
-        $this->conditions = $this->createEntityList(Condition::class, $data['weather']);
+        $this->conditions = EntityHelper::createEntityList(Condition::class, $data['weather']);
         $this->rainVolume = $data['rain']['1h'] ?? $data['rain']['3h'] ?? $data['rain'] ?? null;
         $this->snowVolume = $data['snow']['1h'] ?? $data['snow']['3h'] ?? $data['snow'] ?? null;
     }
diff --git a/src/Entity/OneCall/Weather.php b/src/Entity/OneCall/Weather.php
@@ -4,12 +4,10 @@
 
 use ProgrammatorDev\OpenWeatherMap\Entity\Coordinate;
 use ProgrammatorDev\OpenWeatherMap\Entity\Timezone;
-use ProgrammatorDev\OpenWeatherMap\Util\EntityTrait;
+use ProgrammatorDev\OpenWeatherMap\Helper\EntityHelper;
 
 class Weather
 {
-    use EntityTrait;
-
     private Coordinate $coordinate;
 
     private Timezone $timezone;
@@ -43,14 +41,14 @@ public function __construct(array $data)
         $this->current = new WeatherData($data['current']);
 
         $this->minutelyForecast = isset($data['minutely'])
-            ? $this->createEntityList(MinuteData::class, $data['minutely'])
+            ? EntityHelper::createEntityList(MinuteData::class, $data['minutely'])
             : null;
 
-        $this->hourlyForecast = $this->createEntityList(HourData::class, $data['hourly']);
-        $this->dailyForecast = $this->createEntityList(DayData::class, $data['daily']);
+        $this->hourlyForecast = EntityHelper::createEntityList(HourData::class, $data['hourly']);
+        $this->dailyForecast = EntityHelper::createEntityList(DayData::class, $data['daily']);
 
         $this->alerts = isset($data['alerts'])
-            ? $this->createEntityList(Alert::class, $data['alerts'])
+            ? EntityHelper::createEntityList(Alert::class, $data['alerts'])
             : null;
     }
 
diff --git a/src/Entity/Weather/WeatherCollection.php b/src/Entity/Weather/WeatherCollection.php
@@ -3,12 +3,10 @@
 namespace ProgrammatorDev\OpenWeatherMap\Entity\Weather;
 
 use ProgrammatorDev\OpenWeatherMap\Entity\Location;
-use ProgrammatorDev\OpenWeatherMap\Util\EntityTrait;
+use ProgrammatorDev\OpenWeatherMap\Helper\EntityHelper;
 
 class WeatherCollection
 {
-    use EntityTrait;
-
     private int $numResults;
 
     private Location $location;
@@ -32,7 +30,7 @@ public function __construct(array $data)
             'timezone_offset' => $data['city']['timezone']
         ]);
 
-        $this->data = $this->createEntityList(WeatherData::class, $data['list']);
+        $this->data = EntityHelper::createEntityList(WeatherData::class, $data['list']);
     }
 
     public function getNumResults(): int
diff --git a/src/Entity/Weather/WeatherData.php b/src/Entity/Weather/WeatherData.php
@@ -4,12 +4,10 @@
 
 use ProgrammatorDev\OpenWeatherMap\Entity\Condition;
 use ProgrammatorDev\OpenWeatherMap\Entity\Wind;
-use ProgrammatorDev\OpenWeatherMap\Util\EntityTrait;
+use ProgrammatorDev\OpenWeatherMap\Helper\EntityHelper;
 
 class WeatherData
 {
-    use EntityTrait;
-
     private \DateTimeImmutable $dateTime;
 
     private float $temperature;
@@ -50,7 +48,7 @@ public function __construct(array $data)
         $this->cloudiness = $data['clouds']['all'];
         $this->visibility = $data['visibility'];
         $this->atmosphericPressure = $data['main']['pressure'];
-        $this->conditions = $this->createEntityList(Condition::class, $data['weather']);
+        $this->conditions = EntityHelper::createEntityList(Condition::class, $data['weather']);
         $this->wind = new Wind($data['wind']);
 
         $this->precipitationProbability = isset($data['pop'])
diff --git a/src/Helper/EntityHelper.php b/src/Helper/EntityHelper.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace ProgrammatorDev\OpenWeatherMap\Util;
+namespace ProgrammatorDev\OpenWeatherMap\Helper;
 
-trait EntityTrait
+class EntityHelper
 {
-    private function createEntityList(string $entityClass, array $list): array
+    public static function createEntityList(string $entityClass, array $list): array
     {
         return array_map(function(array $data) use ($entityClass) {
             return new $entityClass($data);
         }, $list);
     }
 
-    private function createEntityKeyList(string $entityClass, array $list): array
+    public static function createEntityKeyList(string $entityClass, array $list): array
     {
         return array_map(function(array $data, int|string $key) use ($entityClass) {
             return new $entityClass($key, $data);
diff --git a/src/Helper/ReflectionHelper.php b/src/Helper/ReflectionHelper.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace ProgrammatorDev\OpenWeatherMap\Util;
+namespace ProgrammatorDev\OpenWeatherMap\Helper;
 
-trait ReflectionTrait
+class ReflectionHelper
 {
-    private function getClassConstants(string $className): array
+    public static function getClassConstants(string $className): array
     {
         $class = new \ReflectionClass($className);
         $constants = $class->getConstants();
diff --git a/src/Language/Language.php b/src/Language/Language.php
@@ -2,12 +2,10 @@
 
 namespace ProgrammatorDev\OpenWeatherMap\Language;
 
-use ProgrammatorDev\OpenWeatherMap\Util\ReflectionTrait;
+use ProgrammatorDev\OpenWeatherMap\Helper\ReflectionHelper;
 
 class Language
 {
-    use ReflectionTrait;
-
     public const AFRIKAANS = 'af';
     public const ALBANIAN = 'al';
     public const ARABIC = 'ar';
@@ -57,6 +55,6 @@ class Language
 
     public static function getOptions(): array
     {
-        return (new Language)->getClassConstants(self::class);
+        return ReflectionHelper::getClassConstants(self::class);
     }
 }
diff --git a/src/Resource/GeocodingResource.php b/src/Resource/GeocodingResource.php
@@ -5,13 +5,11 @@
 use ProgrammatorDev\Api\Method;
 use ProgrammatorDev\OpenWeatherMap\Entity\Geocoding\ZipLocation;
 use ProgrammatorDev\OpenWeatherMap\Entity\Location;
-use ProgrammatorDev\OpenWeatherMap\Util\EntityTrait;
+use ProgrammatorDev\OpenWeatherMap\Helper\EntityHelper;
 use Psr\Http\Client\ClientExceptionInterface;
 
 class GeocodingResource extends Resource
 {
-    use EntityTrait;
-
     private const NUM_RESULTS = 5;
 
     /**
@@ -31,7 +29,7 @@ public function getByLocationName(string $locationName, int $numResults = self::
             ]
         );
 
-        return $this->createEntityList(Location::class, $data);
+        return EntityHelper::createEntityList(Location::class, $data);
     }
 
     /**
@@ -70,6 +68,6 @@ public function getByCoordinate(float $latitude, float $longitude, int $numResul
             ]
         );
 
-        return $this->createEntityList(Location::class, $data);
+        return EntityHelper::createEntityList(Location::class, $data);
     }
 }
diff --git a/src/UnitSystem/UnitSystem.php b/src/UnitSystem/UnitSystem.php
@@ -2,18 +2,16 @@
 
 namespace ProgrammatorDev\OpenWeatherMap\UnitSystem;
 
-use ProgrammatorDev\OpenWeatherMap\Util\ReflectionTrait;
+use ProgrammatorDev\OpenWeatherMap\Helper\ReflectionHelper;
 
 class UnitSystem
 {
-    use ReflectionTrait;
-
     public const METRIC = 'metric';
     public const IMPERIAL = 'imperial';
     public const STANDARD = 'standard';
 
     public static function getOptions(): array
     {
-        return (new UnitSystem)->getClassConstants(self::class);
+        return ReflectionHelper::getClassConstants(self::class);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,10 @@`
`3`	`3`	`namespace ProgrammatorDev\OpenWeatherMap\Entity\AirPollution;`
`4`	`4`
`5`	`5`	`use ProgrammatorDev\OpenWeatherMap\Entity\Coordinate;`
`6`		`-use ProgrammatorDev\OpenWeatherMap\Util\EntityTrait;`
	`6`	`+use ProgrammatorDev\OpenWeatherMap\Helper\EntityHelper;`
`7`	`7`
`8`	`8`	`class AirPollutionCollection`
`9`	`9`	`{`
`10`		`- use EntityTrait;`
`11`		`-`
`12`	`10`	`private int $numResults;`
`13`	`11`
`14`	`12`	`private Coordinate $coordinate;`
`@@ -20,7 +18,7 @@ public function __construct(array $data)`
`20`	`18`	`{`
`21`	`19`	`$this->numResults = count($data['list']);`
`22`	`20`	`$this->coordinate = new Coordinate($data['coord']);`
`23`		`- $this->data = $this->createEntityList(AirPollutionData::class, $data['list']);`
	`21`	`+ $this->data = EntityHelper::createEntityList(AirPollutionData::class, $data['list']);`
`24`	`22`	`}`
`25`	`23`
`26`	`24`	`public function getNumResults(): int`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace ProgrammatorDev\OpenWeatherMap\Entity\Assistant;`
`4`	`4`
`5`		`-use ProgrammatorDev\OpenWeatherMap\Util\EntityTrait;`
	`5`	`+use ProgrammatorDev\OpenWeatherMap\Helper\EntityHelper;`
`6`	`6`
`7`	`7`	`class Answer`
`8`	`8`	`{`
`9`		`- use EntityTrait;`
`10`		`-`
`11`	`9`	`private string $answer;`
`12`	`10`
`13`	`11`	`private string $sessionId;`
`@@ -21,7 +19,7 @@ public function __construct(array $data)`
`21`	`19`	`$this->sessionId = $data['session_id'];`
`22`	`20`
`23`	`21`	`if (!empty($data['data'])) {`
`24`		`- $this->data = $this->createEntityKeyList(WeatherData::class, $data['data']);`
	`22`	`+ $this->data = EntityHelper::createEntityKeyList(WeatherData::class, $data['data']);`
`25`	`23`	`}`
`26`	`24`	`}`
`27`	`25`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,17 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace ProgrammatorDev\OpenWeatherMap\Util;`
	`3`	`+namespace ProgrammatorDev\OpenWeatherMap\Helper;`
`4`	`4`
`5`		`-trait EntityTrait`
	`5`	`+class EntityHelper`
`6`	`6`	`{`
`7`		`- private function createEntityList(string $entityClass, array $list): array`
	`7`	`+ public static function createEntityList(string $entityClass, array $list): array`
`8`	`8`	`{`
`9`	`9`	`return array_map(function(array $data) use ($entityClass) {`
`10`	`10`	`return new $entityClass($data);`
`11`	`11`	`}, $list);`
`12`	`12`	`}`
`13`	`13`
`14`		`- private function createEntityKeyList(string $entityClass, array $list): array`
	`14`	`+ public static function createEntityKeyList(string $entityClass, array $list): array`
`15`	`15`	`{`
`16`	`16`	`return array_map(function(array $data, int\|string $key) use ($entityClass) {`
`17`	`17`	`return new $entityClass($key, $data);`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace ProgrammatorDev\OpenWeatherMap\Util;`
	`3`	`+namespace ProgrammatorDev\OpenWeatherMap\Helper;`
`4`	`4`
`5`		`-trait ReflectionTrait`
	`5`	`+class ReflectionHelper`
`6`	`6`	`{`
`7`		`- private function getClassConstants(string $className): array`
	`7`	`+ public static function getClassConstants(string $className): array`
`8`	`8`	`{`
`9`	`9`	`$class = new \ReflectionClass($className);`
`10`	`10`	`$constants = $class->getConstants();`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,11 @@`
`5`	`5`	`use ProgrammatorDev\Api\Method;`
`6`	`6`	`use ProgrammatorDev\OpenWeatherMap\Entity\Geocoding\ZipLocation;`
`7`	`7`	`use ProgrammatorDev\OpenWeatherMap\Entity\Location;`
`8`		`-use ProgrammatorDev\OpenWeatherMap\Util\EntityTrait;`
	`8`	`+use ProgrammatorDev\OpenWeatherMap\Helper\EntityHelper;`
`9`	`9`	`use Psr\Http\Client\ClientExceptionInterface;`
`10`	`10`
`11`	`11`	`class GeocodingResource extends Resource`
`12`	`12`	`{`
`13`		`- use EntityTrait;`
`14`		`-`
`15`	`13`	`private const NUM_RESULTS = 5;`
`16`	`14`
`17`	`15`	`/**`
`@@ -31,7 +29,7 @@ public function getByLocationName(string $locationName, int $numResults = self::`
`31`	`29`	`]`
`32`	`30`	`);`
`33`	`31`
`34`		`- return $this->createEntityList(Location::class, $data);`
	`32`	`+ return EntityHelper::createEntityList(Location::class, $data);`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`/**`
`@@ -70,6 +68,6 @@ public function getByCoordinate(float $latitude, float $longitude, int $numResul`
`70`	`68`	`]`
`71`	`69`	`);`
`72`	`70`
`73`		`- return $this->createEntityList(Location::class, $data);`
	`71`	`+ return EntityHelper::createEntityList(Location::class, $data);`
`74`	`72`	`}`
`75`	`73`	`}`