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

andrepimpao · web-flow · commit 8851367b1048 · 2023-08-29T18:47:16.000+01:00
Remove "with" prefix from traits
diff --git a/src/Endpoint/AbstractEndpoint.php b/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;
 
diff --git a/src/Endpoint/OneCallEndpoint.php b/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
diff --git a/src/Endpoint/Util/CacheTtlTrait.php b/src/Endpoint/Util/CacheTtlTrait.php
@@ -2,7 +2,7 @@
 
 namespace ProgrammatorDev\OpenWeatherMap\Endpoint\Util;
 
-trait WithCacheTtlTrait
+trait CacheTtlTrait
 {
     public function withCacheTtl(int $seconds): static
     {
diff --git a/src/Endpoint/Util/LanguageTrait.php b/src/Endpoint/Util/LanguageTrait.php
@@ -6,7 +6,7 @@
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
 use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
-trait WithLanguageTrait
+trait LanguageTrait
 {
     /**
      * @throws ValidationException
diff --git a/src/Endpoint/Util/UnitSystemTrait.php b/src/Endpoint/Util/UnitSystemTrait.php
@@ -6,7 +6,7 @@
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
 use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
-trait WithUnitSystemTrait
+trait UnitSystemTrait
 {
     /**
      * @throws ValidationException
diff --git a/src/Endpoint/WeatherEndpoint.php b/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;
 
diff --git a/tests/CacheTtlTraitTest.php b/tests/CacheTtlTraitTest.php
@@ -2,7 +2,7 @@
 
 namespace ProgrammatorDev\OpenWeatherMap\Test;
 
-class WithCacheTtlTest extends AbstractTest
+class CacheTtlTraitTest extends AbstractTest
 {
     public function testWithCacheTtl()
     {
diff --git a/tests/LanguageTraitTest.php b/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()
     {
diff --git a/tests/UnitSystemTraitTest.php b/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()
     {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace ProgrammatorDev\OpenWeatherMap\Endpoint\Util;`
`4`	`4`
`5`		`-trait WithCacheTtlTrait`
	`5`	`+trait CacheTtlTrait`
`6`	`6`	`{`
`7`	`7`	`public function withCacheTtl(int $seconds): static`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;`
`7`	`7`	`use ProgrammatorDev\YetAnotherPhpValidator\Validator;`
`8`	`8`
`9`		`-trait WithLanguageTrait`
	`9`	`+trait LanguageTrait`
`10`	`10`	`{`
`11`	`11`	`/**`
`12`	`12`	`* @throws ValidationException`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace ProgrammatorDev\OpenWeatherMap\Test;`
`4`	`4`
`5`		`-class WithCacheTtlTest extends AbstractTest`
	`5`	`+class CacheTtlTraitTest extends AbstractTest`
`6`	`6`	`{`
`7`	`7`	`public function testWithCacheTtl()`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use PHPUnit\Framework\Attributes\DataProviderExternal;`
`6`	`6`	`use ProgrammatorDev\OpenWeatherMap\Test\DataProvider\InvalidParamDataProvider;`
`7`	`7`
`8`		`-class WithLanguageTest extends AbstractTest`
	`8`	`+class LanguageTraitTest extends AbstractTest`
`9`	`9`	`{`
`10`	`10`	`public function testWithLanguage()`
`11`	`11`	`{`