– added manufactureInstance method to the CalculatorFactoryAbstract

uruba · Sep 4, 2015 · 4938f16 · 4938f16
1 parent 6790e34
commit 4938f16
Show file tree

Hide file tree

Showing 10 changed files with 233 additions and 144 deletions.
diff --git a/src/Calculators/Factories/AnnuityCalculatorFactory.php b/src/Calculators/Factories/AnnuityCalculatorFactory.php
@@ -19,11 +19,14 @@ class AnnuityCalculatorFactory extends CalculatorFactoryAbstract {
          * @return AnnuityCalculator
          */
         public function newYearlyAnnuity($annuitySinglePaymentAmount, $annuityNoOfCompoundingPeriods, $annuityInterest) {
-            return new AnnuityCalculator(
-                $annuitySinglePaymentAmount,
-                $annuityNoOfCompoundingPeriods,
-                TimeUtils::getDaysFromYears(1),
-                $annuityInterest);
+            return $this->manufactureInstance(
+                [
+                    $annuitySinglePaymentAmount,
+                    $annuityNoOfCompoundingPeriods,
+                    TimeUtils::getDaysFromYears(1),
+                    $annuityInterest
+                ]
+            );
         }
 
         /**
@@ -33,11 +36,14 @@ public function newYearlyAnnuity($annuitySinglePaymentAmount, $annuityNoOfCompou
          * @return AnnuityCalculator
          */
         public function newMonthlyAnnuity($annuitySinglePaymentAmount, $annuityNoOfCompoundingPeriods, $annuityInterest) {
-            return new AnnuityCalculator(
-                $annuitySinglePaymentAmount,
-                $annuityNoOfCompoundingPeriods,
-                TimeUtils::getDaysFromMonths(1),
-                $annuityInterest);
+            return $this->manufactureInstance(
+                [
+                    $annuitySinglePaymentAmount,
+                    $annuityNoOfCompoundingPeriods,
+                    TimeUtils::getDaysFromMonths(1),
+                    $annuityInterest
+                ]
+            );
         }
 
         /**
@@ -47,11 +53,14 @@ public function newMonthlyAnnuity($annuitySinglePaymentAmount, $annuityNoOfCompo
          * @return AnnuityCalculator
          */
         public function newDailyAnnuity($annuitySinglePaymentAmount, $annuityNoOfCompoundingPeriods, $annuityInterest) {
-            return new AnnuityCalculator(
-                $annuitySinglePaymentAmount,
-                $annuityNoOfCompoundingPeriods,
-                1,
-                $annuityInterest);
+            return $this->manufactureInstance(
+                [
+                    $annuitySinglePaymentAmount,
+                    $annuityNoOfCompoundingPeriods,
+                    1,
+                    $annuityInterest
+                ]
+            );
         }
 
         /**
@@ -60,11 +69,14 @@ public function newDailyAnnuity($annuitySinglePaymentAmount, $annuityNoOfCompoun
          * @return AnnuityCalculator
          */
         public function newPerpetuity($annuitySinglePaymentAmount, $annuityInterest) {
-            return new AnnuityCalculator(
-                $annuitySinglePaymentAmount,
-                0,
-                0,
-                $annuityInterest);
+            return $this->manufactureInstance(
+                [
+                    $annuitySinglePaymentAmount,
+                    0,
+                    0,
+                    $annuityInterest
+                ]
+            );
         }
     }
 }
diff --git a/src/Calculators/Factories/BondDurationCalculatorFactory.php b/src/Calculators/Factories/BondDurationCalculatorFactory.php
@@ -22,11 +22,14 @@ class BondDurationCalculatorFactory extends CalculatorFactoryAbstract {
          * @return BondDurationCalculator
          */
         public function newAnnualCouponsBond($bondFaceValue, $bondAnnualCouponRate, $bondAnnualYield, $bondYearsToMaturity) {
-            return new BondDurationCalculator(
-                $bondFaceValue,
-                $bondAnnualCouponRate,
-                $bondAnnualYield,
-                $bondYearsToMaturity);
+            return $this->manufactureInstance(
+                [
+                    $bondFaceValue,
+                    $bondAnnualCouponRate,
+                    $bondAnnualYield,
+                    $bondYearsToMaturity
+                ]
+            );
         }
 
         /**
@@ -37,12 +40,15 @@ public function newAnnualCouponsBond($bondFaceValue, $bondAnnualCouponRate, $bon
          * @return BondDurationCalculator
          */
         public function newSemiAnnualCouponsBond($bondFaceValue, $bondAnnualCouponRate, $bondAnnualYield, $bondYearsToMaturity) {
-            return new BondDurationCalculator(
-                $bondFaceValue,
-                $bondAnnualCouponRate,
-                $bondAnnualYield,
-                $bondYearsToMaturity,
-                2);
+            return $this->manufactureInstance(
+                [
+                    $bondFaceValue,
+                    $bondAnnualCouponRate,
+                    $bondAnnualYield,
+                    $bondYearsToMaturity,
+                    2
+                ]
+            );
         }
 
 
@@ -54,12 +60,15 @@ public function newSemiAnnualCouponsBond($bondFaceValue, $bondAnnualCouponRate,
          * @return BondDurationCalculator
          */
         public function newQuarterlyCouponsBond($bondFaceValue, $bondAnnualCouponRate, $bondAnnualYield, $bondYearsToMaturity) {
-            return new BondDurationCalculator(
-                $bondFaceValue,
-                $bondAnnualCouponRate,
-                $bondAnnualYield,
-                $bondYearsToMaturity,
-                4);
+            return $this->manufactureInstance(
+                [
+                    $bondFaceValue,
+                    $bondAnnualCouponRate,
+                    $bondAnnualYield,
+                    $bondYearsToMaturity,
+                    4
+                ]
+            );
         }
 
 
@@ -71,12 +80,15 @@ public function newQuarterlyCouponsBond($bondFaceValue, $bondAnnualCouponRate, $
          * @return BondDurationCalculator
          */
         public function newMonthlyCouponsBond($bondFaceValue, $bondAnnualCouponRate, $bondAnnualYield, $bondYearsToMaturity) {
-            return new BondDurationCalculator(
-                $bondFaceValue,
-                $bondAnnualCouponRate,
-                $bondAnnualYield,
-                $bondYearsToMaturity,
-                12);
+            return $this->manufactureInstance(
+                [
+                    $bondFaceValue,
+                    $bondAnnualCouponRate,
+                    $bondAnnualYield,
+                    $bondYearsToMaturity,
+                    12
+                ]
+            );
         }
 
 
@@ -89,12 +101,15 @@ public function newMonthlyCouponsBond($bondFaceValue, $bondAnnualCouponRate, $bo
          * @return BondDurationCalculator
          */
         public function newCustomCouponFrequencyBond($bondFaceValue, $bondAnnualCouponRate, $bondAnnualYield, $bondYearsToMaturity, $bondPaymentFrequency) {
-            return new BondDurationCalculator(
-                $bondFaceValue,
-                $bondAnnualCouponRate,
-                $bondAnnualYield,
-                $bondYearsToMaturity,
-                $bondPaymentFrequency);
+            return $this->manufactureInstance(
+                [
+                    $bondFaceValue,
+                    $bondAnnualCouponRate,
+                    $bondAnnualYield,
+                    $bondYearsToMaturity,
+                    $bondPaymentFrequency
+                ]
+            );
         }
 
     }

diff --git a/src/Calculators/Factories/BondFairValueCalculatorFactory.php b/src/Calculators/Factories/BondFairValueCalculatorFactory.php
@@ -21,11 +21,14 @@ class BondFairValueCalculatorFactory extends CalculatorFactoryAbstract {
          * @return BondFairValueCalculator
          */
         public function newAnnualCouponsBond($bondFaceValue, $bondAnnualCouponRate, $bondVIR, $bondYearsToMaturity) {
-            return new BondFairValueCalculator(
-                $bondFaceValue,
-                $bondAnnualCouponRate,
-                $bondVIR,
-                $bondYearsToMaturity);
+            return $this->manufactureInstance(
+                [
+                    $bondFaceValue,
+                    $bondAnnualCouponRate,
+                    $bondVIR,
+                    $bondYearsToMaturity
+                ]
+            );
         }
 
         /**
@@ -36,12 +39,15 @@ public function newAnnualCouponsBond($bondFaceValue, $bondAnnualCouponRate, $bon
          * @return BondFairValueCalculator
          */
         public function newSemiAnnualCouponsBond($bondFaceValue, $bondAnnualCouponRate, $bondVIR, $bondYearsToMaturity) {
-            return new BondFairValueCalculator(
-                $bondFaceValue,
-                $bondAnnualCouponRate,
-                $bondVIR,
-                $bondYearsToMaturity,
-                2);
+            return $this->manufactureInstance(
+                [
+                    $bondFaceValue,
+                    $bondAnnualCouponRate,
+                    $bondVIR,
+                    $bondYearsToMaturity,
+                    2
+                ]
+            );
         }
 
         /**
@@ -52,12 +58,15 @@ public function newSemiAnnualCouponsBond($bondFaceValue, $bondAnnualCouponRate,
          * @return BondFairValueCalculator
          */
         public function newQuarterlyCouponsBond($bondFaceValue, $bondAnnualCouponRate, $bondVIR, $bondYearsToMaturity) {
-            return new BondFairValueCalculator(
-                $bondFaceValue,
-                $bondAnnualCouponRate,
-                $bondVIR,
-                $bondYearsToMaturity,
-                4);
+            return $this->manufactureInstance(
+                [
+                    $bondFaceValue,
+                    $bondAnnualCouponRate,
+                    $bondVIR,
+                    $bondYearsToMaturity,
+                    4
+                ]
+            );
         }
 
         /**
@@ -68,12 +77,15 @@ public function newQuarterlyCouponsBond($bondFaceValue, $bondAnnualCouponRate, $
          * @return BondFairValueCalculator
          */
         public function newMonthlyCouponsBond($bondFaceValue, $bondAnnualCouponRate, $bondVIR, $bondYearsToMaturity) {
-            return new BondFairValueCalculator(
-                $bondFaceValue,
-                $bondAnnualCouponRate,
-                $bondVIR,
-                $bondYearsToMaturity,
-                12);
+            return $this->manufactureInstance(
+                [
+                    $bondFaceValue,
+                    $bondAnnualCouponRate,
+                    $bondVIR,
+                    $bondYearsToMaturity,
+                    12
+                ]
+            );
         }
 
         /**
@@ -85,12 +97,15 @@ public function newMonthlyCouponsBond($bondFaceValue, $bondAnnualCouponRate, $bo
          * @return BondFairValueCalculator
          */
         public function newCustomCouponFrequencyBond($bondFaceValue, $bondAnnualCouponRate, $bondVIR, $bondYearsToMaturity, $bondPaymentFrequency) {
-            return new BondFairValueCalculator(
-                $bondFaceValue,
-                $bondAnnualCouponRate,
-                $bondVIR,
-                $bondYearsToMaturity,
-                $bondPaymentFrequency);
+            return $this->manufactureInstance(
+                [
+                    $bondFaceValue,
+                    $bondAnnualCouponRate,
+                    $bondVIR,
+                    $bondYearsToMaturity,
+                    $bondPaymentFrequency
+                ]
+            );
         }
     }
 }