Merge pull request #1 from elbgoods/ft-new-units

add more units

src/Enums/UnitTypeEnum.php

@@ -5,9 +5,9 @@
 use Elbgoods\LaravelUnitConverter\Unit;
 use Elbgoods\LaravelUnitConverter\UnitForwarder;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 use PhpUnitConversion\Map\Unit as UnitMap;
 use PhpUnitConversion\Unit as BaseUnit;
-use PhpUnitConversion\UnitType;
 use Spatie\Enum\Enum;
 
 /**
@@ -18,17 +18,29 @@
  * @method static self TIME()
  * @method static self TEMPERATURE()
  * @method static self AMOUNT()
+ * @method static self LUMINANCE()
+ * @method static self LUMINANCE_ANSI()
+ * @method static self LUMINOUS_FLUX()
+ * @method static self ANGLE()
+ * @method static self POWER()
+ * @method static self PERCENTAGE()
  */
 class UnitTypeEnum extends Enum
 {
     protected const MAP_INDEX = [
-        'MASS' => UnitType::MASS,
-        'LENGTH' => UnitType::LENGTH,
-        'AREA' => UnitType::AREA,
-        'VOLUME' => UnitType::VOLUME,
-        'TIME' => UnitType::TIME,
-        'TEMPERATURE' => UnitType::TEMPERATURE,
-        'AMOUNT' => UnitType::AMOUNT,
+        'MASS' => 1,
+        'LENGTH' => 2,
+        'AREA' => 3,
+        'VOLUME' => 4,
+        'TIME' => 5,
+        'TEMPERATURE' => 6,
+        'AMOUNT' => 7,
+        'LUMINANCE' => 8,
+        'LUMINANCE_ANSI' => 9,
+        'LUMINOUS_FLUX' => 10,
+        'ANGLE' => 11,
+        'POWER' => 12,
+        'PERCENTAGE' => 13,
     ];
 
     public function getValue(): string
@@ -38,7 +50,7 @@ public function getValue(): string
 
     public function getUnitTypeClass(): string
     {
-        return 'Elbgoods\\LaravelUnitConverter\\Units\\'.ucfirst($this->getValue());
+        return 'Elbgoods\\LaravelUnitConverter\\Units\\'.Str::studly($this->getValue());
     }
 
     public function getUnits(): array

src/Unit.php

@@ -12,7 +12,6 @@
 use PhpUnitConversion\System\USC;
 use PhpUnitConversion\Traits\BaseUnit as IsBaseUnit;
 use PhpUnitConversion\Unit as BaseUnit;
-use RuntimeException;
 
 /**
  * @method Unit to(Unit|string $target)
@@ -42,13 +41,7 @@ public static function fromBase(?float $value = null): self
 
     public function toBase(): self
     {
-        $base = $this->to($this->getBaseUnit()->class());
-
-        if ($base instanceof self) {
-            return $base;
-        }
-
-        throw new RuntimeException(sprintf('The base unit has to extend [%s].', self::class));
+        return $this->to($this->getBaseUnit()->class());
     }
 
     public function getType(): UnitTypeEnum

src/UnitConverterServiceProvider.php

@@ -21,7 +21,7 @@ public function boot(): void
         UnitMap::clear();
 
         if (config('unit-converter.default_units')) {
-            UnitMap::add(__DIR__.'/Units', __NAMESPACE__.'\\Units', null);
+            UnitMap::add(__DIR__.'/Units', __NAMESPACE__.'\\Units');
         }
 
         foreach (config('unit-converter.units') as $unitType => $units) {

src/Units/Angle.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units;
+
+use Elbgoods\LaravelUnitConverter\Unit;
+use Elbgoods\LaravelUnitConverter\Units\Angle\Radian;
+
+abstract class Angle extends Unit
+{
+    public const TYPE = 11;
+    public const BASE_UNIT = Radian::class;
+}

src/Units/Angle/Degree.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units\Angle;
+
+use Elbgoods\LaravelUnitConverter\Units\Angle;
+use PhpUnitConversion\System\Metric;
+
+class Degree extends Angle implements Metric
+{
+    public const FACTOR = M_PI / 180;
+
+    public const SYMBOL = '°';
+    public const LABEL = 'degree';
+}

src/Units/Angle/Radian.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units\Angle;
+
+use Elbgoods\LaravelUnitConverter\Units\Angle;
+use PhpUnitConversion\System\Metric;
+use PhpUnitConversion\Traits\BaseUnit;
+
+class Radian extends Angle implements Metric
+{
+    use BaseUnit;
+
+    public const SYMBOL = 'rad';
+    public const LABEL = 'radian';
+}

src/Units/Area.php

@@ -4,10 +4,9 @@
 
 use Elbgoods\LaravelUnitConverter\Unit;
 use Elbgoods\LaravelUnitConverter\Units\Area\SquareMeter;
-use PhpUnitConversion\UnitType;
 
 abstract class Area extends Unit
 {
-    public const TYPE = UnitType::AREA;
+    public const TYPE = 3;
     public const BASE_UNIT = SquareMeter::class;
 }

src/Units/Length.php

@@ -4,10 +4,9 @@
 
 use Elbgoods\LaravelUnitConverter\Unit;
 use Elbgoods\LaravelUnitConverter\Units\Length\Meter;
-use PhpUnitConversion\UnitType;
 
 abstract class Length extends Unit
 {
-    public const TYPE = UnitType::LENGTH;
+    public const TYPE = 2;
     public const BASE_UNIT = Meter::class;
 }

src/Units/Luminance.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units;
+
+use Elbgoods\LaravelUnitConverter\Unit;
+use Elbgoods\LaravelUnitConverter\Units\Luminance\CandelaPerSquareMeter;
+
+abstract class Luminance extends Unit
+{
+    public const TYPE = 8;
+    public const BASE_UNIT = CandelaPerSquareMeter::class;
+}

src/Units/Luminance/CandelaPerSquareMeter.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units\Luminance;
+
+use Elbgoods\LaravelUnitConverter\Units\Luminance;
+use PhpUnitConversion\System\Metric;
+use PhpUnitConversion\Traits\BaseUnit;
+
+class CandelaPerSquareMeter extends Luminance implements Metric
+{
+    use BaseUnit;
+
+    public const SYMBOL = 'cd/m2';
+    public const LABEL = 'candela per square meter';
+}

src/Units/Luminance/Nit.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units\Luminance;
+
+use Elbgoods\LaravelUnitConverter\Units\Luminance;
+use PhpUnitConversion\System\Metric;
+
+class Nit extends Luminance implements Metric
+{
+    public const SYMBOL = 'nt';
+    public const LABEL = 'nit';
+}

src/Units/LuminanceAnsi.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units;
+
+use Elbgoods\LaravelUnitConverter\Unit;
+use Elbgoods\LaravelUnitConverter\Units\LuminanceAnsi\AnsiLumen;
+
+abstract class LuminanceAnsi extends Unit
+{
+    public const TYPE = 9;
+    public const BASE_UNIT = AnsiLumen::class;
+}

src/Units/LuminanceAnsi/AnsiLumen.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units\LuminanceAnsi;
+
+use Elbgoods\LaravelUnitConverter\Units\LuminanceAnsi;
+use PhpUnitConversion\Traits\BaseUnit;
+
+class AnsiLumen extends LuminanceAnsi
+{
+    use BaseUnit;
+
+    public const SYMBOL = 'lm';
+    public const LABEL = 'ansi lumen';
+}

src/Units/LuminousFlux.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units;
+
+use Elbgoods\LaravelUnitConverter\Unit;
+use Elbgoods\LaravelUnitConverter\Units\LuminousFlux\Lumen;
+
+abstract class LuminousFlux extends Unit
+{
+    public const TYPE = 10;
+    public const BASE_UNIT = Lumen::class;
+}

src/Units/LuminousFlux/Lumen.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units\LuminousFlux;
+
+use Elbgoods\LaravelUnitConverter\Units\LuminousFlux;
+use PhpUnitConversion\Traits\BaseUnit;
+
+class Lumen extends LuminousFlux
+{
+    use BaseUnit;
+
+    public const SYMBOL = 'lm';
+    public const LABEL = 'lumen';
+}

src/Units/Mass.php

@@ -4,10 +4,9 @@
 
 use Elbgoods\LaravelUnitConverter\Unit;
 use Elbgoods\LaravelUnitConverter\Units\Mass\KiloGram;
-use PhpUnitConversion\UnitType;
 
 abstract class Mass extends Unit
 {
-    public const TYPE = UnitType::MASS;
+    public const TYPE = 1;
     public const BASE_UNIT = KiloGram::class;
 }

src/Units/Percentage.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units;
+
+use Elbgoods\LaravelUnitConverter\Unit;
+use Elbgoods\LaravelUnitConverter\Units\Percentage\Percent;
+
+abstract class Percentage extends Unit
+{
+    public const TYPE = 13;
+    public const BASE_UNIT = Percent::class;
+}

src/Units/Percentage/Percent.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units\Percentage;
+
+use Elbgoods\LaravelUnitConverter\Units\Percentage;
+use PhpUnitConversion\System\Metric;
+use PhpUnitConversion\Traits\BaseUnit;
+
+class Percent extends Percentage implements Metric
+{
+    use BaseUnit;
+
+    public const SYMBOL = '%';
+    public const LABEL = 'percent';
+}

src/Units/Power.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units;
+
+use Elbgoods\LaravelUnitConverter\Unit;
+use Elbgoods\LaravelUnitConverter\Units\Power\Watt;
+
+abstract class Power extends Unit
+{
+    public const TYPE = 12;
+    public const BASE_UNIT = Watt::class;
+}

src/Units/Power/KiloWatt.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units\Power;
+
+use Elbgoods\LaravelUnitConverter\Units\Power;
+use PhpUnitConversion\System\Metric;
+
+class KiloWatt extends Power implements Metric
+{
+    public const FACTOR = 1000;
+
+    public const SYMBOL = 'kW';
+    public const LABEL = 'kilowatt';
+}

src/Units/Power/Watt.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Elbgoods\LaravelUnitConverter\Units\Power;
+
+use Elbgoods\LaravelUnitConverter\Units\Power;
+use PhpUnitConversion\System\Metric;
+use PhpUnitConversion\Traits\BaseUnit;
+
+class Watt extends Power implements Metric
+{
+    use BaseUnit;
+
+    public const SYMBOL = 'W';
+    public const LABEL = 'watt';
+}

src/Units/Temperature.php

@@ -4,10 +4,9 @@
 
 use Elbgoods\LaravelUnitConverter\Unit;
 use Elbgoods\LaravelUnitConverter\Units\Temperature\Kelvin;
-use PhpUnitConversion\UnitType;
 
 abstract class Temperature extends Unit
 {
-    public const TYPE = UnitType::TEMPERATURE;
+    public const TYPE = 6;
     public const BASE_UNIT = Kelvin::class;
 }