uruba / FinanCalc

src/Utils/MathFuncs.php

Indentation +5 added lines, -5 removed lines

@@ -80,11 +80,11 @@
             return (string)number_format((float)$roundedNumber, $precision);
         }
         
-         /**
-         * @param $roundedNumber
-         * @param $precision
-         * @return string
-         */
+            /**
+             * @param $roundedNumber
+             * @param $precision
+             * @return string
+             */
         public static function round_up($roundedNumber, $precision = 2) 
         {
             return (string)ceil((float)$roundedNumber * pow(10, $precision)) / pow(10, $precision);

src/Calculators/DebtAmortizator.php

Indentation +19 added lines, -19 removed lines

@@ -297,7 +297,7 @@ 
         public function getDebtSingleRepayment_Rounded() {
             // single repayment 'K = PV/((1-v^n)/i)'
             return MathFuncs::round_up(
-            	MathFuncs::div(
+                MathFuncs::div(
                 $this->debtPrincipal,
                 MathFuncs::div(
                     MathFuncs::sub(
@@ -338,33 +338,33 @@ 
             return $repayments;
         }
 				
-				 /**
-         * @return array
-         */
+                    /**
+                     * @return array
+                     */
         public function getDebtRepaymentsAsArrays_Rounded()
         {
             $repayments = array();
             $i = 1;
             $balance = $this->debtPrincipal;            
             foreach ($this->debtRepayments as $repayment) {
-          			if($balance > $repayment->getTotalAmount()) {      
-										$totalAmount = MathFuncs::round_up($repayment->getTotalAmount(), 2);
-										$interestAmount = MathFuncs::round($repayment->getInterestAmount(), 2);
-										$principalAmount = MathFuncs::round($totalAmount - $interestAmount, 2);
-								}
-								else {
-										$interestAmount = MathFuncs::round($repayment->getInterestAmount(), 2);
-										$totalAmount = MathFuncs::round(MathFuncs::add($balance, $interestAmount), 2);
-										$principalAmount = MathFuncs::round($balance, 2);
-								}
+                        if($balance > $repayment->getTotalAmount()) {      
+                                        $totalAmount = MathFuncs::round_up($repayment->getTotalAmount(), 2);
+                                        $interestAmount = MathFuncs::round($repayment->getInterestAmount(), 2);
+                                        $principalAmount = MathFuncs::round($totalAmount - $interestAmount, 2);
+                                }
+                                else {
+                                        $interestAmount = MathFuncs::round($repayment->getInterestAmount(), 2);
+                                        $totalAmount = MathFuncs::round(MathFuncs::add($balance, $interestAmount), 2);
+                                        $principalAmount = MathFuncs::round($balance, 2);
+                                }
             		
-            		$beginningBalance = $balance;
-            		$endingBalance = MathFuncs::sub($balance, $principalAmount);
-            		$balance = MathFuncs::sub($balance, $principalAmount);
+                    $beginningBalance = $balance;
+                    $endingBalance = MathFuncs::sub($balance, $principalAmount);
+                    $balance = MathFuncs::sub($balance, $principalAmount);
             		
                 $repayments[$i++] = [
-                		"beginningBalance" => MathFuncs::round($beginningBalance, 2),
-                		"totalAmount" => $totalAmount,
+                        "beginningBalance" => MathFuncs::round($beginningBalance, 2),
+                        "totalAmount" => $totalAmount,
                     "principalAmount" => $principalAmount,
                     "interestAmount" => $interestAmount,
                     "endingBalance" => MathFuncs::round($endingBalance, 2)

Spacing +2 added lines, -2 removed lines

@@ -347,10 +347,10 @@
             $i = 1;
             $balance = $this->debtPrincipal;            
             foreach ($this->debtRepayments as $repayment) {
-          			if($balance > $repayment->getTotalAmount()) {      
+          			if ($balance > $repayment->getTotalAmount()) {      
 										$totalAmount = MathFuncs::round_up($repayment->getTotalAmount(), 2);
 										$interestAmount = MathFuncs::round($repayment->getInterestAmount(), 2);
-										$principalAmount = MathFuncs::round($totalAmount - $interestAmount, 2);
+										$principalAmount = MathFuncs::round($totalAmount-$interestAmount, 2);
 								}
 								else {
 										$interestAmount = MathFuncs::round($repayment->getInterestAmount(), 2);