Merge pull request PhpUnitsOfMeasure#10 from mauris/time

triplepoint · triplepoint · commit 7ecc279e5bf9 · 2013-07-08T22:21:39.000-07:00
Time unit implementation - reviewed the code and this looks ok to me.  Thanks Mauris.
diff --git a/source/PhpUnitsOfMeasure/PhysicalQuantity/Time.php b/source/PhpUnitsOfMeasure/PhysicalQuantity/Time.php
@@ -26,8 +26,72 @@ function ($x) {
                 return $x;
             }
         );
+        $new_unit->addAlias('sec');
+        $new_unit->addAlias('secs');
         $new_unit->addAlias('second');
         $new_unit->addAlias('seconds');
         $this->registerUnitOfMeasure($new_unit);
+
+        // Minutes
+        $new_unit = new UnitOfMeasure(
+            'm',
+            function ($x) {
+                return $x / 60;
+            },
+            function ($x) {
+                return $x * 60;
+            }
+        );
+        $new_unit->addAlias('min');
+        $new_unit->addAlias('mins');
+        $new_unit->addAlias('minute');
+        $new_unit->addAlias('minutes');
+        $this->registerUnitOfMeasure($new_unit);
+
+        // Hours
+        $new_unit = new UnitOfMeasure(
+            'h',
+            function ($x) {
+                return $x / 3600;
+            },
+            function ($x) {
+                return $x * 3600;
+            }
+        );
+        $new_unit->addAlias('hr');
+        $new_unit->addAlias('hrs');
+        $new_unit->addAlias('hour');
+        $new_unit->addAlias('hours');
+        $this->registerUnitOfMeasure($new_unit);
+
+        // Days
+        $new_unit = new UnitOfMeasure(
+            'd',
+            function ($x) {
+                return $x / 86400;
+            },
+            function ($x) {
+                return $x * 86400;
+            }
+        );
+        $new_unit->addAlias('day');
+        $new_unit->addAlias('days');
+        $this->registerUnitOfMeasure($new_unit);
+
+        // Weeks, understood as 7 days
+        $new_unit = new UnitOfMeasure(
+            'w',
+            function ($x) {
+                return $x / 604800;
+            },
+            function ($x) {
+                return $x * 604800;
+            }
+        );
+        $new_unit->addAlias('wk');
+        $new_unit->addAlias('wks');
+        $new_unit->addAlias('week');
+        $new_unit->addAlias('weeks');
+        $this->registerUnitOfMeasure($new_unit);
     }
 }
diff --git a/tests/PhpUnitsOfMeasureTest/PhysicalQuantity/TimeTest.php b/tests/PhpUnitsOfMeasureTest/PhysicalQuantity/TimeTest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace PhpUnitsOfMeasureTest\PhysicalQuantity;
+
+use PhpUnitsOfMeasure\PhysicalQuantity\Time;
+
+class TimeTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function testToSeconds()
+    {
+        $angle = new Time(5, 'm');
+        $this->assertEquals(300, $angle->toUnit('seconds'));
+    }
+
+    public function testToMinutes()
+    {
+        $angle = new Time(360, 'sec');
+        $this->assertEquals(6, $angle->toUnit('min'));
+    }
+
+    public function testToHours()
+    {
+        $angle = new Time(120, 'mins');
+        $this->assertEquals(2, $angle->toUnit('hrs'));
+    }
+
+    public function testToDays()
+    {
+        $angle = new Time(72, 'hours');
+        $this->assertEquals(3, $angle->toUnit('days'));
+    }
+
+    public function testToWeeks()
+    {
+        $angle = new Time(14, 'd');
+        $this->assertEquals(2, $angle->toUnit('week'));
+    }
+}
