Merge pull request #47 from programmatordev/OPA-50-remove-with-prefix-from-traits

Remove "with" prefix from traits

Author: andrepimpao

src/Endpoint/AbstractEndpoint.php

@@ -6,7 +6,7 @@
 use Http\Client\Common\Plugin\LoggerPlugin;
 use Http\Client\Exception;
 use ProgrammatorDev\OpenWeatherMap\Config;
-use ProgrammatorDev\OpenWeatherMap\Endpoint\Util\WithCacheTtlTrait;
+use ProgrammatorDev\OpenWeatherMap\Endpoint\Util\CacheTtlTrait;
 use ProgrammatorDev\OpenWeatherMap\Entity\Error;
 use ProgrammatorDev\OpenWeatherMap\Exception\BadRequestException;
 use ProgrammatorDev\OpenWeatherMap\Exception\NotFoundException;
@@ -24,7 +24,7 @@
 
 class AbstractEndpoint
 {
- use WithCacheTtlTrait;
+ use CacheTtlTrait;
 
  private Config $config;
 

src/Endpoint/OneCallEndpoint.php

@@ -3,8 +3,8 @@
 namespace ProgrammatorDev\OpenWeatherMap\Endpoint;
 
 use Http\Client\Exception;
-use ProgrammatorDev\OpenWeatherMap\Endpoint\Util\WithLanguageTrait;
-use ProgrammatorDev\OpenWeatherMap\Endpoint\Util\WithUnitSystemTrait;
+use ProgrammatorDev\OpenWeatherMap\Endpoint\Util\LanguageTrait;
+use ProgrammatorDev\OpenWeatherMap\Endpoint\Util\UnitSystemTrait;
 use ProgrammatorDev\OpenWeatherMap\Entity\OneCall\WeatherAggregate;
 use ProgrammatorDev\OpenWeatherMap\Entity\OneCall\WeatherLocation;
 use ProgrammatorDev\OpenWeatherMap\Entity\OneCall\OneCall;
@@ -18,8 +18,8 @@
 
 class OneCallEndpoint extends AbstractEndpoint
 {
- use WithUnitSystemTrait;
- use WithLanguageTrait;
+ use UnitSystemTrait;
+ use LanguageTrait;
 
  /**
  * @throws Exception

src/Endpoint/Util/WithCacheTtlTrait.php renamed to src/Endpoint/Util/CacheTtlTrait.php

@@ -2,7 +2,7 @@
 
 namespace ProgrammatorDev\OpenWeatherMap\Endpoint\Util;
 
-trait WithCacheTtlTrait
+trait CacheTtlTrait
 {
  public function withCacheTtl(int $seconds): static
  {

src/Endpoint/Util/WithLanguageTrait.php renamed to src/Endpoint/Util/LanguageTrait.php

@@ -6,7 +6,7 @@
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
 use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
-trait WithLanguageTrait
+trait LanguageTrait
 {
  /**
  * @throws ValidationException

src/Endpoint/Util/WithUnitSystemTrait.php renamed to src/Endpoint/Util/UnitSystemTrait.php

@@ -6,7 +6,7 @@
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
 use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
-trait WithUnitSystemTrait
+trait UnitSystemTrait
 {
  /**
  * @throws ValidationException

src/Endpoint/WeatherEndpoint.php

@@ -3,8 +3,8 @@
 namespace ProgrammatorDev\OpenWeatherMap\Endpoint;
 
 use Http\Client\Exception;
-use ProgrammatorDev\OpenWeatherMap\Endpoint\Util\WithLanguageTrait;
-use ProgrammatorDev\OpenWeatherMap\Endpoint\Util\WithUnitSystemTrait;
+use ProgrammatorDev\OpenWeatherMap\Endpoint\Util\LanguageTrait;
+use ProgrammatorDev\OpenWeatherMap\Endpoint\Util\UnitSystemTrait;
 use ProgrammatorDev\OpenWeatherMap\Entity\Weather\WeatherLocation;
 use ProgrammatorDev\OpenWeatherMap\Entity\Weather\WeatherLocationList;
 use ProgrammatorDev\OpenWeatherMap\Exception\BadRequestException;
@@ -17,8 +17,8 @@
 
 class WeatherEndpoint extends AbstractEndpoint
 {
- use WithUnitSystemTrait;
- use WithLanguageTrait;
+ use UnitSystemTrait;
+ use LanguageTrait;
 
  private const NUM_RESULTS = 40;
 

tests/WithCacheTtlTest.php renamed to tests/CacheTtlTraitTest.php

@@ -2,7 +2,7 @@
 
 namespace ProgrammatorDev\OpenWeatherMap\Test;
 
-class WithCacheTtlTest extends AbstractTest
+class CacheTtlTraitTest extends AbstractTest
 {
  public function testWithCacheTtl()
  {

tests/WithLanguageTest.php renamed to tests/LanguageTraitTest.php

@@ -5,7 +5,7 @@
 use PHPUnit\Framework\Attributes\DataProviderExternal;
 use ProgrammatorDev\OpenWeatherMap\Test\DataProvider\InvalidParamDataProvider;
 
-class WithLanguageTest extends AbstractTest
+class LanguageTraitTest extends AbstractTest
 {
  public function testWithLanguage()
  {

tests/WithUnitSystemTest.php renamed to tests/UnitSystemTraitTest.php

@@ -5,7 +5,7 @@
 use PHPUnit\Framework\Attributes\DataProviderExternal;
 use ProgrammatorDev\OpenWeatherMap\Test\DataProvider\InvalidParamDataProvider;
 
-class WithUnitSystemTest extends AbstractTest
+class UnitSystemTraitTest extends AbstractTest
 {
  public function testWithUnitSystem()
  {