Merge pull request #1 from Spudley/master

Adding temperature conversions, plus bugfixing the calculations to support it

Author: pimlie

src/Traits/HasFactor.php

@@ -33,13 +33,13 @@ protected function toBaseValue($value = null)
     {
         if($value === null) $value = $this->value;
 
-        $value*= self::getFactor();
-        
         $addition = self::getAddition();
         if ($addition !== false) {
             $value+= $addition;
         }
 
+        $value*= self::getFactor();
+        
         return $value;
     }
 }

src/Traits/HasRelativeFactor.php

@@ -24,7 +24,7 @@ protected function fromBaseValue($baseValue)
 
         $addition = self::getAddition();
         if ($addition !== false) {
-            $value+= $addition;
+            $value-= $addition;
         }
 
         return $value;
@@ -34,13 +34,13 @@ protected function toBaseValue($value = null)
     {
         if($value === null) $value = $this->value;
 
-        $baseValue = $value / self::getFactor();
-        
         $addition = self::getAddition();
         if ($addition !== false) {
-            $value-= $addition;
+            $value+= $addition;
         }
 
+        $baseValue = $value / self::getFactor();
+        
         return parent::toBaseValue($baseValue);
     }
 }

src/Unit/Temperature.php

@@ -0,0 +1,12 @@
+<?php
+namespace PhpUnitConversion\Unit;
+
+use PhpUnitConversion\Unit;
+use PhpUnitConversion\UnitType;
+
+class Temperature extends Unit
+{
+    const TYPE = UnitType::TEMPERATURE;
+
+    const BASE_UNIT = Temperature\Celsius::class;
+}

src/Unit/Temperature/Celsius.php

@@ -0,0 +1,14 @@
+<?php
+namespace PhpUnitConversion\Unit\Temperature;
+
+use PhpUnitConversion\System\Metric;
+use PhpUnitConversion\Unit\Temperature;
+use PhpUnitConversion\Traits\BaseUnit;
+
+class Celsius extends Temperature implements Metric
+{
+    use BaseUnit;
+    
+    const SYMBOL = '°C';
+    const LABEL = 'celsius';
+}

src/Unit/Temperature/Fahrenheit.php

@@ -0,0 +1,18 @@
+<?php
+namespace PhpUnitConversion\Unit\Temperature;
+
+use PhpUnitConversion\System\Imperial;
+use PhpUnitConversion\System\USC;
+use PhpUnitConversion\Unit\Temperature;
+use PhpUnitConversion\Traits\HasFactor;
+
+class Fahrenheit extends Celsius
+{
+    use HasFactor;
+    
+    const FACTOR = 0.555555556;
+    const ADDITION = -32;
+    
+    const SYMBOL = '°F';
+    const LABEL = 'farenheit';
+}

src/Unit/Temperature/Kelvin.php

@@ -0,0 +1,18 @@
+<?php
+namespace PhpUnitConversion\Unit\Temperature;
+
+use PhpUnitConversion\System\Metric;
+use PhpUnitConversion\Unit\Temperature;
+use PhpUnitConversion\Traits\BaseUnit;
+use PhpUnitConversion\Traits\HasFactor;
+
+class Kelvin extends Celsius
+{
+    use HasFactor;
+
+    const FACTOR = 1;
+    const ADDITION = -273.15;
+
+    const SYMBOL = 'K';
+    const LABEL = 'Kelvin';
+}

src/Unit/Temperature/Rankine.php

@@ -0,0 +1,18 @@
+<?php
+namespace PhpUnitConversion\Unit\Temperature;
+
+use PhpUnitConversion\System\Imperial;
+use PhpUnitConversion\System\USC;
+use PhpUnitConversion\Unit\Temperature;
+use PhpUnitConversion\Traits\HasRelativeFactor;
+
+class Rankine extends Fahrenheit
+{
+    use HasRelativeFactor;
+    
+    const FACTOR = 1;
+    const ADDITION = -459.67;
+    
+    const SYMBOL = '°R';
+    const LABEL = 'rankine';
+}

src/Unit/Temperature/Romer.php

@@ -0,0 +1,18 @@
+<?php
+namespace PhpUnitConversion\Unit\Temperature;
+
+use PhpUnitConversion\System\Metric;
+use PhpUnitConversion\Unit\Temperature;
+use PhpUnitConversion\Traits\BaseUnit;
+use PhpUnitConversion\Traits\HasFactor;
+
+class Romer extends Celsius
+{
+    use HasFactor;
+
+    const FACTOR = 1.9047619;
+    const ADDITION = -7.5;
+
+    const SYMBOL = '°Rø';
+    const LABEL = 'Rømer';
+}

src/UnitType.php

@@ -12,4 +12,5 @@ class UnitType extends Enum
     const AREA = 3;
     const VOLUME = 4;
     const TIME = 5;
+    const TEMPERATURE = 6;
 }

tests/Unit/TemperatureTest.php

@@ -0,0 +1,63 @@
+<?php
+namespace PhpUnitConversionTest\Unit;
+
+use PHPUnit\Framework\TestCase;
+use PhpUnitConversion\Unit\Temperature;
+
+class TemperatureTest extends TestCase
+{
+    public function testCelsiusToFahrenheit()
+    {
+        $tempUnit = new Temperature\Celsius(50);
+        $this->assertEquals('122.0 °F', Temperature\Fahrenheit::from($tempUnit)->format(1));
+    }
+
+    public function testFahrenheitToCelsius()
+    {
+        $tempUnit = new Temperature\Fahrenheit(50);
+        $this->assertEquals('10.0 °C', Temperature\Celsius::from($tempUnit)->format(1));
+    }
+
+    public function testCelsiusToKelvin()
+    {
+        $tempUnit = new Temperature\Celsius(50);
+        $this->assertEquals('323.15 K', Temperature\Kelvin::from($tempUnit)->format(2));
+    }
+
+    public function testKelvinToFahrenheit()
+    {
+        $tempUnit = new Temperature\Kelvin(50);
+        $this->assertEquals('-369.67 °F', Temperature\Fahrenheit::from($tempUnit)->format(2));
+    }
+
+    public function testRankineToFahrenheit()
+    {
+        $tempUnit = new Temperature\Rankine(50);
+        $this->assertEquals('-409.67 °F', Temperature\Fahrenheit::from($tempUnit)->format(2));
+    }
+
+    public function testFahrenheitToRankine()
+    {
+        $tempUnit = new Temperature\Fahrenheit(50);
+        $this->assertEquals('509.67 °R', Temperature\Rankine::from($tempUnit)->format(2));
+    }
+
+    public function testCelsiusToRankine()
+    {
+        $tempUnit = new Temperature\Celsius(75);
+        $this->assertEquals('626.67 °R', Temperature\Rankine::from($tempUnit)->format(2));
+    }
+
+    public function testCelsiusToRomer()
+    {
+        $tempUnit = new Temperature\Celsius(75);
+        $this->assertEquals('46.875 °Rø', Temperature\Romer::from($tempUnit)->format(3));
+    }
+
+    public function testRomerToRankine()
+    {
+        $tempUnit = new Temperature\Romer(50);
+        $this->assertEquals('637.38 °R', Temperature\Rankine::from($tempUnit)->format(2));
+    }
+
+}