– the lambdas are no longer stored in the GLOBAL array, but served fr…

…om a dedicated class instead
uruba · Jan 10, 2016 · e5b2102 · e5b2102
1 parent 717a9a3
commit e5b2102
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 33 deletions.
diff --git a/src/Calculators/AnnuityCalculator.php b/src/Calculators/AnnuityCalculator.php
@@ -6,6 +6,7 @@
     use Exception;
     use FinanCalc\Constants\AnnuityPaymentTypes;
     use FinanCalc\Constants\AnnuityValueTypes;
+    use FinanCalc\Constants\Lambdas;
     use FinanCalc\Interfaces\Calculator\CalculatorAbstract;
     use FinanCalc\Utils\Helpers;
     use FinanCalc\Utils\MathFuncs;
@@ -72,14 +73,14 @@ function __construct($annuitySinglePaymentAmount,
          * @param $annuitySinglePaymentAmount
          */
         public function setAnnuitySinglePaymentAmount($annuitySinglePaymentAmount) {
-            $this->setProperty("annuitySinglePaymentAmount", $annuitySinglePaymentAmount, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("annuitySinglePaymentAmount", $annuitySinglePaymentAmount, Lambdas::checkIfPositive());
         }
 
         /**
          * @param $annuityNoOfCompoundingPeriods
          */
         public function setAnnuityNoOfCompoundingPeriods($annuityNoOfCompoundingPeriods) {
-            $this->setProperty("annuityNoOfCompoundingPeriods", $annuityNoOfCompoundingPeriods, $GLOBALS["FINANCALC_FUNC_CHECK_IF_NOT_NEGATIVE"]);
+            $this->setProperty("annuityNoOfCompoundingPeriods", $annuityNoOfCompoundingPeriods, Lambdas::checkIfNotNegative());
 
             if ($this->annuityPeriodLength !== null) {
                 $this->setAnnuityPeriodLength($this->annuityPeriodLength);
@@ -103,7 +104,7 @@ public function setAnnuityPeriodLength(TimeSpan $annuityPeriodLength) {
          * @param $annuityInterest
          */
         public function setAnnuityInterest($annuityInterest) {
-            $this->setProperty("annuityInterest", $annuityInterest, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("annuityInterest", $annuityInterest, Lambdas::checkIfPositive());
         }
 
         /**

diff --git a/src/Calculators/BondDurationCalculator.php b/src/Calculators/BondDurationCalculator.php
@@ -2,6 +2,7 @@
 
 namespace FinanCalc\Calculators {
 
+    use FinanCalc\Constants\Lambdas;
     use FinanCalc\Interfaces\Calculator\BondCalculatorAbstract;
     use FinanCalc\Utils\MathFuncs;
 
@@ -66,7 +67,7 @@ function __construct($bondFaceValue,
          * @param $bondAnnualYield
          */
         public function setBondAnnualYield($bondAnnualYield) {
-            $this->setProperty("bondAnnualYield", $bondAnnualYield, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("bondAnnualYield", $bondAnnualYield, Lambdas::checkIfPositive());
         }
 
         /**

diff --git a/src/Calculators/BondFairValueCalculator.php b/src/Calculators/BondFairValueCalculator.php
@@ -2,6 +2,7 @@
 
 namespace FinanCalc\Calculators {
 
+    use FinanCalc\Constants\Lambdas;
     use FinanCalc\Interfaces\Calculator\BondCalculatorAbstract;
     use FinanCalc\Utils\MathFuncs;
 
@@ -61,7 +62,7 @@ function __construct($bondFaceValue,
          * @param $bondVIR
          */
         public function setBondVIR($bondVIR) {
-            $this->setProperty("bondVIR", $bondVIR, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("bondVIR", $bondVIR, Lambdas::checkIfPositive());
         }
 
         /**

diff --git a/src/Calculators/BondYTMCalculator.php b/src/Calculators/BondYTMCalculator.php
@@ -2,6 +2,7 @@
 
 namespace FinanCalc\Calculators {
 
+    use FinanCalc\Constants\Lambdas;
     use FinanCalc\Interfaces\Calculator\BondCalculatorAbstract;
     use FinanCalc\Utils\MathFuncs;
 
@@ -61,7 +62,7 @@ function __construct($bondFaceValue,
          * @param $bondMarketValue
          */
         public function setBondMarketValue($bondMarketValue) {
-                $this->setProperty("bondMarketValue", $bondMarketValue, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+                $this->setProperty("bondMarketValue", $bondMarketValue, Lambdas::checkIfPositive());
         }
 
         /**

diff --git a/src/Calculators/DebtAmortizator.php b/src/Calculators/DebtAmortizator.php
@@ -3,6 +3,7 @@
 namespace FinanCalc\Calculators {
 
     use DateTime;
+    use FinanCalc\Constants\Lambdas;
     use FinanCalc\Interfaces\Calculator\CalculatorAbstract;
     use FinanCalc\Utils\MathFuncs;
     use FinanCalc\Utils\Time\TimeSpan;
@@ -70,21 +71,21 @@ function __construct($debtPrincipal,
          * @param $debtPrincipal
          */
         private function setDebtPrincipalWithoutRecalculation($debtPrincipal) {
-            $this->setProperty("debtPrincipal", $debtPrincipal, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("debtPrincipal", $debtPrincipal, Lambdas::checkIfPositive());
         }
 
         /**
          * @param $debtNoOfCompoundingPeriods
          */
         private function setDebtNoOfCompoundingPeriodsWithoutRecalculation($debtNoOfCompoundingPeriods) {
-            $this->setProperty("debtNoOfCompoundingPeriods", $debtNoOfCompoundingPeriods, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("debtNoOfCompoundingPeriods", $debtNoOfCompoundingPeriods, Lambdas::checkIfPositive());
         }
 
         /**
          * @param $debtInterest
          */
         private function setDebtInterestWithoutRecalculation($debtInterest) {
-            $this->setProperty("debtInterest", $debtInterest, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("debtInterest", $debtInterest, Lambdas::checkIfPositive());
         }
 
         /**
@@ -107,7 +108,7 @@ public function setDebtNoOfCompoundingPeriods($debtNoOfCompoundingPeriods) {
          * @param $debtPeriodLength
          */
         public function setDebtPeriodLength(TimeSpan $debtPeriodLength) {
-            $this->setProperty("debtPeriodLength", $debtPeriodLength, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("debtPeriodLength", $debtPeriodLength, Lambdas::checkIfPositive());
         }
 
         /**

diff --git a/src/Calculators/SimpleDiscountCalculator.php b/src/Calculators/SimpleDiscountCalculator.php
@@ -2,6 +2,7 @@
 
 namespace FinanCalc\Calculators {
 
+    use FinanCalc\Constants\Lambdas;
     use FinanCalc\Interfaces\Calculator\CalculatorAbstract;
     use FinanCalc\Utils\MathFuncs;
     use FinanCalc\Utils\Time\TimeSpan;
@@ -36,21 +37,21 @@ function __construct($amountDue,
          * @param $amountDue
          */
         public function setAmountDue($amountDue) {
-            $this->setProperty("amountDue", $amountDue, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("amountDue", $amountDue, Lambdas::checkIfPositive());
         }
 
         /**
          * @param $annualDiscountRate
          */
         public function setAnnualDiscountRate($annualDiscountRate) {
-            $this->setProperty("annualDiscountRate", $annualDiscountRate, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("annualDiscountRate", $annualDiscountRate, Lambdas::checkIfPositive());
         }
 
         /**
          * @param TimeSpan $time
          */
         public function setTime(TimeSpan $time) {
-            $this->setProperty("time", $time, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("time", $time, Lambdas::checkIfPositive());
         }
 
         /**

diff --git a/src/Calculators/SimpleInterestCalculator.php b/src/Calculators/SimpleInterestCalculator.php
@@ -3,6 +3,7 @@
 namespace FinanCalc\Calculators {
 
     use Exception;
+    use FinanCalc\Constants\Lambdas;
     use FinanCalc\Interfaces\Calculator\CalculatorAbstract;
     use FinanCalc\Utils\MathFuncs;
     use FinanCalc\Utils\Time\TimeSpan;
@@ -38,21 +39,21 @@ function __construct($principal,
          * @param $principal
          */
         public function setPrincipal($principal) {
-            $this->setProperty("principal", $principal, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("principal", $principal, Lambdas::checkIfPositive());
         }
 
         /**
          * @param $annualInterestRate
          */
         public function setAnnualInterestRate($annualInterestRate) {
-            $this->setProperty("annualInterestRate", $annualInterestRate, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("annualInterestRate", $annualInterestRate, Lambdas::checkIfPositive());
         }
 
         /**
          * @param TimeSpan $time
          */
         public function setTime(TimeSpan $time) {
-            $this->setProperty("time", $time, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("time", $time, Lambdas::checkIfPositive());
         }
 
         /**

diff --git a/src/Calculators/StockDividendDiscountModelCalculator.php b/src/Calculators/StockDividendDiscountModelCalculator.php
@@ -3,6 +3,7 @@
 namespace FinanCalc\Calculators {
 
     use Exception;
+    use FinanCalc\Constants\Lambdas;
     use FinanCalc\Constants\StockDDMTypes;
     use FinanCalc\Interfaces\Calculator\CalculatorAbstract;
     use FinanCalc\Utils\Helpers;
@@ -69,14 +70,14 @@ public function setDividendDiscountModelType(StockDDMTypes $dividendDiscountMode
          * @param $stockVIR
          */
         public function setStockVIR($stockVIR){
-            $this->setProperty("stockVIR", $stockVIR, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("stockVIR", $stockVIR, Lambdas::checkIfPositive());
         }
 
         /**
          * @param $stockAnnualDividendsValue
          */
         public function setStockAnnualDividendsValue($stockAnnualDividendsValue) {
-            $this->setProperty("stockAnnualDividendsValue", $stockAnnualDividendsValue, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("stockAnnualDividendsValue", $stockAnnualDividendsValue, Lambdas::checkIfPositive());
         }
 
         /**

diff --git a/src/Calculators/StockInvestmentRatiosCalculator.php b/src/Calculators/StockInvestmentRatiosCalculator.php
@@ -2,6 +2,7 @@
 
 namespace FinanCalc\Calculators {
 
+    use FinanCalc\Constants\Lambdas;
     use FinanCalc\Interfaces\Calculator\CalculatorAbstract;
     use FinanCalc\Utils\MathFuncs;
 
@@ -47,21 +48,21 @@ function __construct($totalDividends,
          * @param $totalDividends
          */
         public function setTotalDividends($totalDividends) {
-            $this->setProperty("totalDividends", $totalDividends, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("totalDividends", $totalDividends, Lambdas::checkIfPositive());
         }
 
         /**
          * @param $earningsAfterTaxes
          */
         public function setEarningsAfterTaxes($earningsAfterTaxes) {
-            $this->setProperty("earningsAfterTaxes", $earningsAfterTaxes, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("earningsAfterTaxes", $earningsAfterTaxes, Lambdas::checkIfPositive());
         }
 
         /**
          * @param $noOfStocks
          */
         public function setNoOfStocks($noOfStocks) {
-            $this->setProperty("noOfStocks", $noOfStocks, $GLOBALS["FINANCALC_FUNC_CHECK_IF_POSITIVE"]);
+            $this->setProperty("noOfStocks", $noOfStocks, Lambdas::checkIfPositive());
         }
 
         /**

diff --git a/src/Constants/Lambdas.php b/src/Constants/Lambdas.php
@@ -0,0 +1,32 @@
+<?php
+namespace FinanCalc\Constants {
+
+    use FinanCalc\Utils\Helpers;
+
+    /**
+     * Class Lambdas
+     * @package FinanCalc\Constants
+     */
+    class Lambdas {
+
+        /**
+         * @return \Closure
+         */
+        public static function checkIfNotNegative() {
+            return function($param) {
+                Helpers::checkIfNotNegativeNumberOrThrowAnException($param);
+            };
+        }
+
+        /**
+         * @return \Closure
+         */
+        public static function checkIfPositive() {
+            return function($param) {
+                Helpers::checkIfPositiveNumberOrThrowAnException($param);
+            };
+        }
+
+    }
+}
+
diff --git a/src/init/bootstrap.php b/src/init/bootstrap.php
@@ -1,6 +1,5 @@
 <?php
 
 require_once('autoloader.php');
-require_once('lambdas.php');
 
 \FinanCalc\Utils\Config::init();
diff --git a/src/init/lambdas.php b/src/init/lambdas.php