Merge pull request #24 from programmatordev/OPA-25-provide-units-according-to-measurement-system

Provide units according to measurement system

Author: andrepimpao

src/Config.php

@@ -4,6 +4,8 @@
 
 use ProgrammatorDev\OpenWeatherMap\HttpClient\HttpClientBuilder;
 use ProgrammatorDev\OpenWeatherMap\HttpClient\Plugin\LoggerPlugin;
+use ProgrammatorDev\OpenWeatherMap\Language\Language;
+use ProgrammatorDev\OpenWeatherMap\MeasurementSystem\MeasurementSystem;
 use ProgrammatorDev\OpenWeatherMap\Validator\BlankValidatorTrait;
 use ProgrammatorDev\OpenWeatherMap\Validator\ChoiceValidatorTrait;
 use Psr\Cache\CacheItemPoolInterface;

src/Endpoint/Util/WithLanguageTrait.php

@@ -2,7 +2,7 @@
 
 namespace ProgrammatorDev\OpenWeatherMap\Endpoint\Util;
 
-use ProgrammatorDev\OpenWeatherMap\Language;
+use ProgrammatorDev\OpenWeatherMap\Language\Language;
 use ProgrammatorDev\OpenWeatherMap\Validator\ChoiceValidatorTrait;
 
 trait WithLanguageTrait

src/Endpoint/Util/WithMeasurementSystemTrait.php

@@ -2,7 +2,7 @@
 
 namespace ProgrammatorDev\OpenWeatherMap\Endpoint\Util;
 
-use ProgrammatorDev\OpenWeatherMap\MeasurementSystem;
+use ProgrammatorDev\OpenWeatherMap\MeasurementSystem\MeasurementSystem;
 use ProgrammatorDev\OpenWeatherMap\Validator\ChoiceValidatorTrait;
 
 trait WithMeasurementSystemTrait

src/HttpClient/Plugin/LoggerPlugin.php

@@ -6,14 +6,13 @@
 use Http\Client\Exception;
 use Http\Message\Formatter;
 use Http\Message\Formatter\SimpleFormatter;
+use Http\Promise\Promise;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;
 
 class LoggerPlugin implements Plugin
 {
-    use Plugin\VersionBridgePlugin;
-
     private LoggerInterface $logger;
 
     private Formatter $formatter;
@@ -27,7 +26,7 @@ public function __construct(LoggerInterface $logger, Formatter $formatter = null
     /**
      * @throws Exception
      */
-    protected function doHandleRequest(RequestInterface $request, callable $next, callable $first)
+    public function handleRequest(RequestInterface $request, callable $next, callable $first): Promise
     {
         $start = hrtime(true) / 1E6;
         $this->logger->info(

src/Language.php src/Language/Language.phpsrc/Language.php renamed to src/Language/Language.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ProgrammatorDev\OpenWeatherMap;
+namespace ProgrammatorDev\OpenWeatherMap\Language;
 
 class Language
 {

src/MeasurementSystem/Fahrenheit.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace ProgrammatorDev\OpenWeatherMap\MeasurementSystem;
+
+class Fahrenheit
+{
+    public const ATMOSPHERIC_PRESSURE_UNIT = 'hPa';
+    public const CLOUDINESS_UNIT = '%';
+    public const HUMIDITY_UNIT = '%';
+    public const POLLUTANT_CONCENTRATION_UNIT = 'μg/m3';
+    public const PRECIPITATION_UNIT = 'mm';
+    public const PRECIPITATION_PROBABILITY_UNIT = '%';
+    public const SPEED_UNIT = 'mph';
+    public const TEMPERATURE_UNIT = '°F';
+    public const VISIBILITY_UNIT = 'km';
+}

src/MeasurementSystem/Imperial.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace ProgrammatorDev\OpenWeatherMap\MeasurementSystem;
+
+class Imperial
+{
+    public const ATMOSPHERIC_PRESSURE_UNIT = 'hPa';
+    public const CLOUDINESS_UNIT = '%';
+    public const HUMIDITY_UNIT = '%';
+    public const POLLUTANT_CONCENTRATION_UNIT = 'μg/m3';
+    public const PRECIPITATION_UNIT = 'mm';
+    public const PRECIPITATION_PROBABILITY_UNIT = '%';
+    public const SPEED_UNIT = 'm/s';
+    public const TEMPERATURE_UNIT = '°C';
+    public const VISIBILITY_UNIT = 'km';
+}

src/MeasurementSystem.php …/MeasurementSystem/MeasurementSystem.phpsrc/MeasurementSystem.php renamed to src/MeasurementSystem/MeasurementSystem.php src/MeasurementSystem.php renamed to src/MeasurementSystem/MeasurementSystem.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ProgrammatorDev\OpenWeatherMap;
+namespace ProgrammatorDev\OpenWeatherMap\MeasurementSystem;
 
 class MeasurementSystem
 {

src/MeasurementSystem/Standard.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace ProgrammatorDev\OpenWeatherMap\MeasurementSystem;
+
+class Standard
+{
+    public const ATMOSPHERIC_PRESSURE_UNIT = 'hPa';
+    public const CLOUDINESS_UNIT = '%';
+    public const HUMIDITY_UNIT = '%';
+    public const POLLUTANT_CONCENTRATION_UNIT = 'μg/m3';
+    public const PRECIPITATION_UNIT = 'mm';
+    public const PRECIPITATION_PROBABILITY_UNIT = '%';
+    public const SPEED_UNIT = 'm/s';
+    public const TEMPERATURE_UNIT = 'K';
+    public const VISIBILITY_UNIT = 'km';
+}