Merge pull request #16 from kyamashiro/chapter16

complete chapter16
kyamashiro · Nov 18, 2018 · 750fc9d · 750fc9d
2 parents dec4ae5 + e1c1cef
commit 750fc9d
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/src/Money/Expression.php b/src/Money/Expression.php
@@ -10,7 +10,9 @@
 
 interface Expression
 {
-    public function reduce(Bank $bank, string $to): Money;
+    function reduce(Bank $bank, string $to): Money;
 
-    public function plus(Expression $added): Expression;
+    function plus(Expression $added): Expression;
+
+    function times(int $multiplier): Expression;
 }
diff --git a/src/Money/Sum.php b/src/Money/Sum.php
@@ -40,6 +40,11 @@ public function reduce(Bank $bank, string $to): Money
 
     public function plus(Expression $added): Expression
     {
-        return null;
+        return new Sum($this, $added);
+    }
+
+    public function times(int $multiplier): Expression
+    {
+        return new Sum($this->augend->times($multiplier), $this->addend->times($multiplier));
     }
 }
diff --git a/src/Test/Test.php b/src/Test/Test.php
@@ -88,9 +88,36 @@ public function testMixedAddition()
         $bank = new Bank();
         $bank->addRate("CHF", "USD", 2);
         $result = $bank->reduce($fiveBucks->plus($tenFrancs), "USD");
-        var_dump($result);
-        var_dump(Money::dollar(10));
         //15USDが返ってくる
         $this->assertEquals(Money::dollar(10), $result);
     }
+
+    public function testSumPlusMoney()
+    {
+        $fiveBucks = Money::dollar(5);
+        $tenFrancs = Money::franc(10);
+        $bank = new Bank();
+        $bank->addRate("CHF", "USD", 2);
+        $sum = (new Sum($fiveBucks, $tenFrancs))->plus($fiveBucks);
+        $result = $bank->reduce($sum, "USD");
+        $this->assertEquals(Money::dollar(15), $result);
+    }
+
+    public function testSumTimes()
+    {
+        $fiveBucks = Money::dollar(5);
+        $tenFrancs = Money::franc(10);
+        $bank = new Bank();
+        $bank->addRate("CHF", "USD", 2);
+        $sum = (new Sum($fiveBucks, $tenFrancs))->times(2);
+        $result = $bank->reduce($sum, "USD");
+        $this->assertEquals(Money::dollar(20), $result);
+    }
+
+//    public function testPlusSameCurrencyReturnsMoney()
+//    {
+//        $sum = Money::dollar(1)->plus(Money::dollar(1));
+//        var_dump($sum);
+//        $this->assertTrue($sum instanceof Money);
+//    }
 }