Merge pull request #2 from rugaard/develop

Fix incorrect namespaces of Unit classes (#1).
rugaard · Jul 15, 2020 · 99188ec · 99188ec
2 parents 31adedc + a96153b
commit 99188ec
Show file tree

Hide file tree

Showing 24 changed files with 74 additions and 74 deletions.
diff --git a/src/DTO/Measurements/Humidity.php b/src/DTO/Measurements/Humidity.php
@@ -5,7 +5,7 @@
 
 use Rugaard\DMI\Contracts\Unit;
 use Rugaard\DMI\DTO\AbstractDTO;
-use Rugaard\DMI\DTO\Units\Percentage;
+use Rugaard\DMI\Units\Percentage;
 
 /**
  * Class Humidity.
@@ -105,4 +105,4 @@ public function __toString() : string
     {
         return round($this->getValue()) . $this->getUnit();
     }
-}
+}
diff --git a/src/DTO/Measurements/Precipitation.php b/src/DTO/Measurements/Precipitation.php
@@ -5,7 +5,7 @@
 
 use Rugaard\DMI\Contracts\Unit;
 use Rugaard\DMI\DTO\AbstractDTO;
-use Rugaard\DMI\DTO\Units\Length\Millimeter;
+use Rugaard\DMI\Units\Length\Millimeter;
 
 /**
  * Class Precipitation.
@@ -228,4 +228,4 @@ public function __toString() : string
     {
         return number_format(round($this->getValue(), 1), 1, '.', '') . ' ' . $this->getUnit();
     }
-}
+}
diff --git a/src/DTO/Measurements/Pressure.php b/src/DTO/Measurements/Pressure.php
@@ -5,7 +5,7 @@
 
 use Rugaard\DMI\Contracts\Unit;
 use Rugaard\DMI\DTO\AbstractDTO;
-use Rugaard\DMI\DTO\Units\Pressure\Hectopascal;
+use Rugaard\DMI\Units\Pressure\Hectopascal;
 
 /**
  * Class Pressure.
@@ -105,4 +105,4 @@ public function __toString() : string
     {
         return round($this->getValue()) . ' ' . $this->getUnit();
     }
-}
+}
diff --git a/src/DTO/Measurements/Temperature.php b/src/DTO/Measurements/Temperature.php
@@ -5,7 +5,7 @@
 
 use Rugaard\DMI\Contracts\Unit;
 use Rugaard\DMI\DTO\AbstractDTO;
-use Rugaard\DMI\DTO\Units\Temperature\Celsius;
+use Rugaard\DMI\Units\Temperature\Celsius;
 
 /**
  * Class Temperature.
@@ -171,4 +171,4 @@ public function __toString() : string
     {
         return floor($this->getValue()) . $this->getUnit();
     }
-}
+}
diff --git a/src/DTO/Measurements/Visibility.php b/src/DTO/Measurements/Visibility.php
@@ -5,7 +5,7 @@
 
 use Rugaard\DMI\Contracts\Unit;
 use Rugaard\DMI\DTO\AbstractDTO;
-use Rugaard\DMI\DTO\Units\Length\Meter;
+use Rugaard\DMI\Units\Length\Meter;
 
 /**
  * Class Visibility.
@@ -105,4 +105,4 @@ public function __toString() : string
     {
         return floor($this->getValue()) . ' ' . $this->getUnit();
     }
-}
+}
diff --git a/src/DTO/Measurements/Wind/Gust.php b/src/DTO/Measurements/Wind/Gust.php
@@ -5,7 +5,7 @@
 
 use Rugaard\DMI\Contracts\Unit;
 use Rugaard\DMI\DTO\AbstractDTO;
-use Rugaard\DMI\DTO\Units\Speed\MetersPerSecond;
+use Rugaard\DMI\Units\Speed\MetersPerSecond;
 
 /**
  * Class Gust.
@@ -105,4 +105,4 @@ public function __toString() : string
     {
         return number_format(round($this->getValue(), 1), 1, '.', '') . ' ' . $this->getUnit();
     }
-}
+}
diff --git a/src/DTO/Measurements/Wind/Speed.php b/src/DTO/Measurements/Wind/Speed.php
@@ -5,7 +5,7 @@
 
 use Rugaard\DMI\Contracts\Unit;
 use Rugaard\DMI\DTO\AbstractDTO;
-use Rugaard\DMI\DTO\Units\Speed\MetersPerSecond;
+use Rugaard\DMI\Units\Speed\MetersPerSecond;
 
 /**
  * Class Speed.
@@ -171,4 +171,4 @@ public function __toString() : string
     {
         return number_format(round($this->getValue(), 1), 1, '.', '') . ' ' . $this->getUnit();
     }
-}
+}
diff --git a/src/Support/Units.php b/src/Support/Units.php
@@ -2,15 +2,15 @@
 declare(strict_types=1);
 
 use Rugaard\DMI\Contracts\Unit;
-use Rugaard\DMI\DTO\Units\Bearing;
-use Rugaard\DMI\DTO\Units\Percentage;
-use Rugaard\DMI\DTO\Units\Length\Centimeter;
-use Rugaard\DMI\DTO\Units\Length\Meter;
-use Rugaard\DMI\DTO\Units\Length\Millimeter;
-use Rugaard\DMI\DTO\Units\Pressure\Hectopascal;
-use Rugaard\DMI\DTO\Units\Speed\MetersPerSecond;
-use Rugaard\DMI\DTO\Units\Temperature\Celsius;
-use Rugaard\DMI\DTO\Units\Time\Hour;
+use Rugaard\DMI\Units\Bearing;
+use Rugaard\DMI\Units\Percentage;
+use Rugaard\DMI\Units\Length\Centimeter;
+use Rugaard\DMI\Units\Length\Meter;
+use Rugaard\DMI\Units\Length\Millimeter;
+use Rugaard\DMI\Units\Pressure\Hectopascal;
+use Rugaard\DMI\Units\Speed\MetersPerSecond;
+use Rugaard\DMI\Units\Temperature\Celsius;
+use Rugaard\DMI\Units\Time\Hour;
 
 if (!function_exists('getUnitByAbbreviation')) {
     /**
@@ -59,4 +59,4 @@ function getUnitByAbbreviation(string $unitAbbreviation) :? Unit
                 return null;
         }
     }
-}
+}
diff --git a/src/Units/Bearing.php b/src/Units/Bearing.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace Rugaard\DMI\DTO\Units;
+namespace Rugaard\DMI\Units;
 
 use Rugaard\DMI\Contracts\Unit;
 
 /**
  * Class Bearing.
  *
- * @package Rugaard\DMI\DTO\Units
+ * @package Rugaard\DMI\Units
  */
 class Bearing implements Unit
 {
@@ -55,4 +55,4 @@ public function __toString() : string
     {
         return $this->getAbbreviation();
     }
-}
+}
diff --git a/src/Units/Length/Centimeter.php b/src/Units/Length/Centimeter.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace Rugaard\DMI\DTO\Units\Length;
+namespace Rugaard\DMI\Units\Length;
 
 use Rugaard\DMI\Contracts\Unit;
 
 /**
  * Class Centimeter.
  *
- * @package Rugaard\DMI\DTO\Units\Length
+ * @package Rugaard\DMI\Units\Length
  */
 class Centimeter implements Unit
 {
@@ -55,4 +55,4 @@ public function __toString() : string
     {
         return $this->getAbbreviation();
     }
-}
+}
diff --git a/src/Units/Length/Meter.php b/src/Units/Length/Meter.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace Rugaard\DMI\DTO\Units\Length;
+namespace Rugaard\DMI\Units\Length;
 
 use Rugaard\DMI\Contracts\Unit;
 
 /**
  * Class Meter.
  *
- * @package Rugaard\DMI\DTO\Units\Length
+ * @package Rugaard\DMI\Units\Length
  */
 class Meter implements Unit
 {
@@ -55,4 +55,4 @@ public function __toString() : string
     {
         return $this->getAbbreviation();
     }
-}
+}
diff --git a/src/Units/Length/Millimeter.php b/src/Units/Length/Millimeter.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace Rugaard\DMI\DTO\Units\Length;
+namespace Rugaard\DMI\Units\Length;
 
 use Rugaard\DMI\Contracts\Unit;
 
 /**
  * Class Millimeter.
  *
- * @package Rugaard\DMI\DTO\Units\Length
+ * @package Rugaard\DMI\Units\Length
  */
 class Millimeter implements Unit
 {
@@ -55,4 +55,4 @@ public function __toString() : string
     {
         return $this->getAbbreviation();
     }
-}
+}
diff --git a/src/Units/Percentage.php b/src/Units/Percentage.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace Rugaard\DMI\DTO\Units;
+namespace Rugaard\DMI\Units;
 
 use Rugaard\DMI\Contracts\Unit;
 
 /**
  * Class Percentage.
  *
- * @package Rugaard\DMI\DTO\Units
+ * @package Rugaard\DMI\Units
  */
 class Percentage implements Unit
 {
@@ -55,4 +55,4 @@ public function __toString() : string
     {
         return $this->getAbbreviation();
     }
-}
+}
diff --git a/src/Units/Pressure/Hectopascal.php b/src/Units/Pressure/Hectopascal.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace Rugaard\DMI\DTO\Units\Pressure;
+namespace Rugaard\DMI\Units\Pressure;
 
 use Rugaard\DMI\Contracts\Unit;
 
 /**
  * Class Hectopascal.
  *
- * @package Rugaard\DMI\DTO\Units\Pressure
+ * @package Rugaard\DMI\Units\Pressure
  */
 class Hectopascal implements Unit
 {
@@ -55,4 +55,4 @@ public function __toString() : string
     {
         return $this->getAbbreviation();
     }
-}
+}
diff --git a/src/Units/Speed/MetersPerSecond.php b/src/Units/Speed/MetersPerSecond.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace Rugaard\DMI\DTO\Units\Speed;
+namespace Rugaard\DMI\Units\Speed;
 
 use Rugaard\DMI\Contracts\Unit;
 
 /**
  * Class MetresPerSecond.
  *
- * @package Rugaard\DMI\DTO\Units\Speed
+ * @package Rugaard\DMI\Units\Speed
  */
 class MetersPerSecond implements Unit
 {
@@ -55,4 +55,4 @@ public function __toString() : string
     {
         return $this->getAbbreviation();
     }
-}
+}
diff --git a/src/Units/Temperature/Celsius.php b/src/Units/Temperature/Celsius.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace Rugaard\DMI\DTO\Units\Temperature;
+namespace Rugaard\DMI\Units\Temperature;
 
 use Rugaard\DMI\Contracts\Unit;
 
 /**
  * Class Celsius.
  *
- * @package Rugaard\DMI\DTO\Units
+ * @package Rugaard\DMI\Units\Temperatures
  */
 class Celsius implements Unit
 {
@@ -55,4 +55,4 @@ public function __toString() : string
     {
         return $this->getAbbreviation();
     }
-}
+}
diff --git a/src/Units/Time/Hour.php b/src/Units/Time/Hour.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace Rugaard\DMI\DTO\Units\Time;
+namespace Rugaard\DMI\Units\Time;
 
 use Rugaard\DMI\Contracts\Unit;
 
 /**
  * Class Hour.
  *
- * @package Rugaard\DMI\DTO\Units\Time
+ * @package Rugaard\DMI\Units\Time
  */
 class Hour implements Unit
 {
@@ -55,4 +55,4 @@ public function __toString() : string
     {
         return $this->getAbbreviation();
     }
-}
+}
diff --git a/tests/DTO/Measurements/HumidityTest.php b/tests/DTO/Measurements/HumidityTest.php
@@ -4,8 +4,8 @@
 namespace Rugaard\DMI\Tests\DTO\Measurements;
 
 use Rugaard\DMI\DTO\Measurements\Humidity;
-use Rugaard\DMI\DTO\Units\Length\Millimeter;
-use Rugaard\DMI\DTO\Units\Percentage;
+use Rugaard\DMI\Units\Length\Millimeter;
+use Rugaard\DMI\Units\Percentage;
 use Rugaard\DMI\Tests\AbstractTestCase;
 
 /**
@@ -76,4 +76,4 @@ public function testToString() : void
         $this->assertIsString((string) $dto);
         $this->assertEquals('69%', (string) $dto);
     }
-}
+}
diff --git a/tests/DTO/Measurements/PrecipitationTest.php b/tests/DTO/Measurements/PrecipitationTest.php
@@ -4,8 +4,8 @@
 namespace Rugaard\DMI\Tests\DTO\Measurements;
 
 use Rugaard\DMI\DTO\Measurements\Precipitation;
-use Rugaard\DMI\DTO\Units\Length\Meter;
-use Rugaard\DMI\DTO\Units\Length\Millimeter;
+use Rugaard\DMI\Units\Length\Meter;
+use Rugaard\DMI\Units\Length\Millimeter;
 use Rugaard\DMI\Tests\AbstractTestCase;
 use Tightenco\Collect\Support\Collection;
 
@@ -179,4 +179,4 @@ public function testToString() : void
         $this->assertIsString((string) $dto);
         $this->assertEquals('4.4 mm', (string) $dto);
     }
-}
+}