PHPOffice / PhpSpreadsheet

Documentation/Examples/Reader/exampleReader19.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 //	$inputFileType = 'Gnumeric';
 $inputFileName = './sampleData/example1.xls';
 
-echo 'Loading file ',pathinfo($inputFileName,PATHINFO_BASENAME),' information using IOFactory with a defined reader type of ',$inputFileType,'<br />';
+echo 'Loading file ', pathinfo($inputFileName, PATHINFO_BASENAME), ' information using IOFactory with a defined reader type of ', $inputFileType, '<br />';
 
 $objReader = PHPExcel_IOFactory::createReader($inputFileType);
 $worksheetData = $objReader->listWorksheetInfo($inputFileName);

Documentation/Examples/index.php

Spacing +8 added lines, -8 removed lines

@@ -17,15 +17,15 @@ 
 

 <?php

 

-$exampleTypeList = glob('./*',GLOB_ONLYDIR);

+$exampleTypeList = glob('./*', GLOB_ONLYDIR);

 

-foreach($exampleTypeList as $exampleType) {

+foreach ($exampleTypeList as $exampleType) {

 

-	echo '<h1>PHPExcel ' . pathinfo($exampleType,PATHINFO_BASENAME) . ' Examples</h1>';

+	echo '<h1>PHPExcel ' . pathinfo($exampleType, PATHINFO_BASENAME) . ' Examples</h1>';

 

-	$exampleList = glob('./'.$exampleType.'/*.php');

+	$exampleList = glob('./' . $exampleType . '/*.php');

 

-	foreach($exampleList as $exampleFile) {

+	foreach ($exampleList as $exampleFile) {

 		$fileData = file_get_contents($exampleFile);

 

 		$h1Pattern = '#<h1>(.*?)</h1>#';

@@ -35,10 +35,10 @@ 
 			$h1Text = $out[1];

 			$h2Text = (preg_match($h2Pattern, $fileData, $out)) ? $out[1] : '';

 

-			echo '<a href="',$exampleFile,'">',$h1Text,'</a><br />';

+			echo '<a href="', $exampleFile, '">', $h1Text, '</a><br />';

 			if (($h2Text > '') &&

-				(pathinfo($exampleType,PATHINFO_BASENAME) != 'Calculations')) {

-				echo $h2Text,'<br />';

+				(pathinfo($exampleType, PATHINFO_BASENAME) != 'Calculations')) {

+				echo $h2Text, '<br />';

 			}

 		}

 

src/PhpSpreadsheet/Calculation/Database.php

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
 
         if (is_numeric($field)) {
             $keys = array_keys($fieldNames);
-            return $keys[$field-1];
+            return $keys[$field - 1];
         }
         $key = array_search($field, $fieldNames);
         return ($key) ? $key : null;
@@ -92,7 +92,7 @@ 
             $testConditionCount = 0;
             foreach ($criteria as $row => $criterion) {
                 if ($criterion[$key] > '') {
-                    $testCondition[] = '[:'.$criteriaName.']'.Functions::ifCondition($criterion[$key]);
+                    $testCondition[] = '[:' . $criteriaName . ']' . Functions::ifCondition($criterion[$key]);
                     $testConditionCount++;
                 }
             }
@@ -124,7 +124,7 @@ 
                 }
             }
             //    evaluate the criteria against the row data
-            $result = \PHPExcel\Calculation::getInstance()->_calculateFormulaValue('='.$testConditionList);
+            $result = \PHPExcel\Calculation::getInstance()->_calculateFormulaValue('=' . $testConditionList);
             //    If the row failed to meet the criteria, remove it from the database
             if (!$result) {
                 unset($database[$dataRow]);

src/PhpSpreadsheet/Calculation/Financial.php

Spacing +99 added lines, -99 removed lines

@@ -71,10 +71,10 @@ 
         $eom = self::isLastDayOfMonth($result);
 
         while ($settlement < \PHPExcel\Shared\Date::PHPToExcel($result)) {
-            $result->modify('-'.$months.' months');
+            $result->modify('-' . $months . ' months');
         }
         if ($next) {
-            $result->modify('+'.$months.' months');
+            $result->modify('+' . $months . ' months');
         }
 
         if ($eom) {
@@ -137,7 +137,7 @@ 
     {
         $pmt = self::PMT($rate, $nper, $pv, $fv, $type);
         $capital = $pv;
-        for ($i = 1; $i<= $per; ++$i) {
+        for ($i = 1; $i <= $per; ++$i) {
             $interest = ($type && $i == 1) ? 0 : -$capital * $rate;
             $principal = $pmt - $interest;
             $capital += $principal;
@@ -183,18 +183,18 @@ 
      */
     public static function ACCRINT($issue, $firstinterest, $settlement, $rate, $par = 1000, $frequency = 1, $basis = 0)
     {
-        $issue        = Functions::flattenSingleValue($issue);
-        $firstinterest    = Functions::flattenSingleValue($firstinterest);
-        $settlement    = Functions::flattenSingleValue($settlement);
-        $rate        = Functions::flattenSingleValue($rate);
-        $par        = (is_null($par))        ? 1000 :    Functions::flattenSingleValue($par);
-        $frequency    = (is_null($frequency))    ? 1    :         Functions::flattenSingleValue($frequency);
-        $basis        = (is_null($basis))        ? 0    :        Functions::flattenSingleValue($basis);
+        $issue = Functions::flattenSingleValue($issue);
+        $firstinterest = Functions::flattenSingleValue($firstinterest);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $rate = Functions::flattenSingleValue($rate);
+        $par = (is_null($par)) ? 1000 : Functions::flattenSingleValue($par);
+        $frequency    = (is_null($frequency)) ? 1 : Functions::flattenSingleValue($frequency);
+        $basis        = (is_null($basis)) ? 0 : Functions::flattenSingleValue($basis);
 
         //    Validate
         if ((is_numeric($rate)) && (is_numeric($par))) {
-            $rate    = (float) $rate;
-            $par    = (float) $par;
+            $rate = (float) $rate;
+            $par = (float) $par;
             if (($rate <= 0) || ($par <= 0)) {
                 return Functions::NAN();
             }
@@ -235,16 +235,16 @@ 
      */
     public static function ACCRINTM($issue, $settlement, $rate, $par = 1000, $basis = 0)
     {
-        $issue        = Functions::flattenSingleValue($issue);
-        $settlement    = Functions::flattenSingleValue($settlement);
-        $rate        = Functions::flattenSingleValue($rate);
-        $par        = (is_null($par))    ? 1000 :    Functions::flattenSingleValue($par);
-        $basis        = (is_null($basis))    ? 0 :        Functions::flattenSingleValue($basis);
+        $issue = Functions::flattenSingleValue($issue);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $rate = Functions::flattenSingleValue($rate);
+        $par = (is_null($par)) ? 1000 : Functions::flattenSingleValue($par);
+        $basis = (is_null($basis)) ? 0 : Functions::flattenSingleValue($basis);
 
         //    Validate
         if ((is_numeric($rate)) && (is_numeric($par))) {
-            $rate    = (float) $rate;
-            $par    = (float) $par;
+            $rate = (float) $rate;
+            $par = (float) $par;
             if (($rate <= 0) || ($par <= 0)) {
                 return Functions::NAN();
             }
@@ -292,13 +292,13 @@ 
      */
     public static function AMORDEGRC($cost, $purchased, $firstPeriod, $salvage, $period, $rate, $basis = 0)
     {
-        $cost            = Functions::flattenSingleValue($cost);
-        $purchased        = Functions::flattenSingleValue($purchased);
+        $cost = Functions::flattenSingleValue($cost);
+        $purchased = Functions::flattenSingleValue($purchased);
         $firstPeriod    = Functions::flattenSingleValue($firstPeriod);
         $salvage        = Functions::flattenSingleValue($salvage);
-        $period            = floor(Functions::flattenSingleValue($period));
-        $rate            = Functions::flattenSingleValue($rate);
-        $basis            = (is_null($basis))    ? 0 :    (int) Functions::flattenSingleValue($basis);
+        $period = floor(Functions::flattenSingleValue($period));
+        $rate = Functions::flattenSingleValue($rate);
+        $basis = (is_null($basis)) ? 0 : (int) Functions::flattenSingleValue($basis);
 
         //    The depreciation coefficients are:
         //    Life of assets (1/rate)        Depreciation coefficient
@@ -628,10 +628,10 @@ 
      */
     public static function COUPNCD($settlement, $maturity, $frequency, $basis = 0)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
         $frequency    = (int) Functions::flattenSingleValue($frequency);
-        $basis        = (is_null($basis))    ? 0 :    (int) Functions::flattenSingleValue($basis);
+        $basis        = (is_null($basis)) ? 0 : (int) Functions::flattenSingleValue($basis);
 
         if (is_string($settlement = DateTime::getDateValue($settlement))) {
             return Functions::VALUE();
@@ -685,10 +685,10 @@ 
      */
     public static function COUPNUM($settlement, $maturity, $frequency, $basis = 0)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
         $frequency    = (int) Functions::flattenSingleValue($frequency);
-        $basis        = (is_null($basis))    ? 0 :    (int) Functions::flattenSingleValue($basis);
+        $basis        = (is_null($basis)) ? 0 : (int) Functions::flattenSingleValue($basis);
 
         if (is_string($settlement = DateTime::getDateValue($settlement))) {
             return Functions::VALUE();
@@ -757,10 +757,10 @@ 
      */
     public static function COUPPCD($settlement, $maturity, $frequency, $basis = 0)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
         $frequency    = (int) Functions::flattenSingleValue($frequency);
-        $basis        = (is_null($basis))    ? 0 :    (int) Functions::flattenSingleValue($basis);
+        $basis        = (is_null($basis)) ? 0 : (int) Functions::flattenSingleValue($basis);
 
         if (is_string($settlement = DateTime::getDateValue($settlement))) {
             return Functions::VALUE();
@@ -804,10 +804,10 @@ 
     {
         $rate    = Functions::flattenSingleValue($rate);
         $nper    = (int) Functions::flattenSingleValue($nper);
-        $pv        = Functions::flattenSingleValue($pv);
-        $start    = (int) Functions::flattenSingleValue($start);
-        $end    = (int) Functions::flattenSingleValue($end);
-        $type    = (int) Functions::flattenSingleValue($type);
+        $pv = Functions::flattenSingleValue($pv);
+        $start = (int) Functions::flattenSingleValue($start);
+        $end = (int) Functions::flattenSingleValue($end);
+        $type = (int) Functions::flattenSingleValue($type);
 
         // Validate parameters
         if ($type != 0 && $type != 1) {
@@ -852,10 +852,10 @@ 
     {
         $rate    = Functions::flattenSingleValue($rate);
         $nper    = (int) Functions::flattenSingleValue($nper);
-        $pv        = Functions::flattenSingleValue($pv);
-        $start    = (int) Functions::flattenSingleValue($start);
-        $end    = (int) Functions::flattenSingleValue($end);
-        $type    = (int) Functions::flattenSingleValue($type);
+        $pv = Functions::flattenSingleValue($pv);
+        $start = (int) Functions::flattenSingleValue($start);
+        $end = (int) Functions::flattenSingleValue($end);
+        $type = (int) Functions::flattenSingleValue($type);
 
         // Validate parameters
         if ($type != 0 && $type != 1) {
@@ -904,10 +904,10 @@ 
     public static function DB($cost, $salvage, $life, $period, $month = 12)
     {
         $cost        = Functions::flattenSingleValue($cost);
-        $salvage    = Functions::flattenSingleValue($salvage);
+        $salvage = Functions::flattenSingleValue($salvage);
         $life        = Functions::flattenSingleValue($life);
-        $period        = Functions::flattenSingleValue($period);
-        $month        = Functions::flattenSingleValue($month);
+        $period = Functions::flattenSingleValue($period);
+        $month = Functions::flattenSingleValue($month);
 
         //    Validate
         if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period)) && (is_numeric($month))) {
@@ -972,7 +972,7 @@ 
     public static function DDB($cost, $salvage, $life, $period, $factor = 2.0)
     {
         $cost        = Functions::flattenSingleValue($cost);
-        $salvage    = Functions::flattenSingleValue($salvage);
+        $salvage = Functions::flattenSingleValue($salvage);
         $life        = Functions::flattenSingleValue($life);
         $period        = Functions::flattenSingleValue($period);
         $factor        = Functions::flattenSingleValue($factor);
@@ -1034,7 +1034,7 @@ 
     public static function DISC($settlement, $maturity, $price, $redemption, $basis = 0)
     {
         $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
+        $maturity = Functions::flattenSingleValue($maturity);
         $price        = Functions::flattenSingleValue($price);
         $redemption    = Functions::flattenSingleValue($redemption);
         $basis        = Functions::flattenSingleValue($basis);
@@ -1042,7 +1042,7 @@ 
         //    Validate
         if ((is_numeric($price)) && (is_numeric($redemption)) && (is_numeric($basis))) {
             $price        = (float) $price;
-            $redemption    = (float) $redemption;
+            $redemption = (float) $redemption;
             $basis        = (int) $basis;
             if (($price <= 0) || ($redemption <= 0)) {
                 return Functions::NAN();
@@ -1077,8 +1077,8 @@ 
      */
     public static function DOLLARDE($fractional_dollar = null, $fraction = 0)
     {
-        $fractional_dollar    = Functions::flattenSingleValue($fractional_dollar);
-        $fraction            = (int)Functions::flattenSingleValue($fraction);
+        $fractional_dollar = Functions::flattenSingleValue($fractional_dollar);
+        $fraction = (int) Functions::flattenSingleValue($fraction);
 
         // Validate parameters
         if (is_null($fractional_dollar) || $fraction < 0) {
@@ -1114,8 +1114,8 @@ 
      */
     public static function DOLLARFR($decimal_dollar = null, $fraction = 0)
     {
-        $decimal_dollar    = Functions::flattenSingleValue($decimal_dollar);
-        $fraction        = (int)Functions::flattenSingleValue($fraction);
+        $decimal_dollar = Functions::flattenSingleValue($decimal_dollar);
+        $fraction = (int) Functions::flattenSingleValue($fraction);
 
         // Validate parameters
         if (is_null($decimal_dollar) || $fraction < 0) {
@@ -1150,8 +1150,8 @@ 
      */
     public static function EFFECT($nominal_rate = 0, $npery = 0)
     {
-        $nominal_rate    = Functions::flattenSingleValue($nominal_rate);
-        $npery            = (int)Functions::flattenSingleValue($npery);
+        $nominal_rate = Functions::flattenSingleValue($nominal_rate);
+        $npery = (int) Functions::flattenSingleValue($npery);
 
         // Validate parameters
         if ($nominal_rate <= 0 || $npery < 1) {
@@ -1188,8 +1188,8 @@ 
     {
         $rate    = Functions::flattenSingleValue($rate);
         $nper    = Functions::flattenSingleValue($nper);
-        $pmt    = Functions::flattenSingleValue($pmt);
-        $pv        = Functions::flattenSingleValue($pv);
+        $pmt = Functions::flattenSingleValue($pmt);
+        $pv = Functions::flattenSingleValue($pv);
         $type    = Functions::flattenSingleValue($type);
 
         // Validate parameters
@@ -1220,8 +1220,8 @@ 
      */
     public static function FVSCHEDULE($principal, $schedule)
     {
-        $principal    = Functions::flattenSingleValue($principal);
-        $schedule    = Functions::flattenArray($schedule);
+        $principal = Functions::flattenSingleValue($principal);
+        $schedule = Functions::flattenArray($schedule);
 
         foreach ($schedule as $rate) {
             $principal *= 1 + $rate;
@@ -1256,16 +1256,16 @@ 
     public static function INTRATE($settlement, $maturity, $investment, $redemption, $basis = 0)
     {
         $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
+        $maturity = Functions::flattenSingleValue($maturity);
         $investment    = Functions::flattenSingleValue($investment);
         $redemption    = Functions::flattenSingleValue($redemption);
-        $basis        = Functions::flattenSingleValue($basis);
+        $basis = Functions::flattenSingleValue($basis);
 
         //    Validate
         if ((is_numeric($investment)) && (is_numeric($redemption)) && (is_numeric($basis))) {
             $investment    = (float) $investment;
             $redemption    = (float) $redemption;
-            $basis        = (int) $basis;
+            $basis = (int) $basis;
             if (($investment <= 0) || ($redemption <= 0)) {
                 return Functions::NAN();
             }
@@ -1300,7 +1300,7 @@ 
     public static function IPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0)
     {
         $rate    = Functions::flattenSingleValue($rate);
-        $per    = (int) Functions::flattenSingleValue($per);
+        $per = (int) Functions::flattenSingleValue($per);
         $nper    = (int) Functions::flattenSingleValue($nper);
         $pv        = Functions::flattenSingleValue($pv);
         $fv        = Functions::flattenSingleValue($fv);
@@ -1419,7 +1419,7 @@ 
 
         // Calculate
         $principlePayment = ($principleRemaining * 1.0) / ($numberPeriods * 1.0);
-        for ($i=0; $i <= $period; ++$i) {
+        for ($i = 0; $i <= $period; ++$i) {
             $returnValue = $interestRate * $principleRemaining * -1;
             $principleRemaining -= $principlePayment;
             // principle needs to be 0 after the last payment, don't let floating point screw it up
@@ -1452,9 +1452,9 @@ 
         if (!is_array($values)) {
             return Functions::VALUE();
         }
-        $values                = Functions::flattenArray($values);
-        $finance_rate        = Functions::flattenSingleValue($finance_rate);
-        $reinvestment_rate    = Functions::flattenSingleValue($reinvestment_rate);
+        $values = Functions::flattenArray($values);
+        $finance_rate = Functions::flattenSingleValue($finance_rate);
+        $reinvestment_rate = Functions::flattenSingleValue($reinvestment_rate);
         $n = count($values);
 
         $rr = 1.0 + $reinvestment_rate;
@@ -1491,8 +1491,8 @@ 
      */
     public static function NOMINAL($effect_rate = 0, $npery = 0)
     {
-        $effect_rate    = Functions::flattenSingleValue($effect_rate);
-        $npery            = (int)Functions::flattenSingleValue($npery);
+        $effect_rate = Functions::flattenSingleValue($effect_rate);
+        $npery = (int) Functions::flattenSingleValue($npery);
 
         // Validate parameters
         if ($effect_rate <= 0 || $npery < 1) {
@@ -1518,11 +1518,11 @@ 
      */
     public static function NPER($rate = 0, $pmt = 0, $pv = 0, $fv = 0, $type = 0)
     {
-        $rate    = Functions::flattenSingleValue($rate);
-        $pmt    = Functions::flattenSingleValue($pmt);
+        $rate = Functions::flattenSingleValue($rate);
+        $pmt = Functions::flattenSingleValue($pmt);
         $pv        = Functions::flattenSingleValue($pv);
         $fv        = Functions::flattenSingleValue($fv);
-        $type    = Functions::flattenSingleValue($type);
+        $type = Functions::flattenSingleValue($type);
 
         // Validate parameters
         if ($type != 0 && $type != 1) {
@@ -1539,7 +1539,7 @@ 
         if ($pmt == 0) {
             return Functions::NAN();
         }
-        return (-$pv -$fv) / $pmt;
+        return (-$pv - $fv) / $pmt;
     }
 
     /**
@@ -1619,7 +1619,7 @@ 
     public static function PPMT($rate, $per, $nper, $pv, $fv = 0, $type = 0)
     {
         $rate    = Functions::flattenSingleValue($rate);
-        $per    = (int) Functions::flattenSingleValue($per);
+        $per = (int) Functions::flattenSingleValue($per);
         $nper    = (int) Functions::flattenSingleValue($nper);
         $pv        = Functions::flattenSingleValue($pv);
         $fv        = Functions::flattenSingleValue($fv);
@@ -1641,13 +1641,13 @@ 
 
     public static function PRICE($settlement, $maturity, $rate, $yield, $redemption, $frequency, $basis = 0)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
+        $settlement = Functions::flattenSingleValue($settlement);
         $maturity    = Functions::flattenSingleValue($maturity);
         $rate        = (float) Functions::flattenSingleValue($rate);
         $yield        = (float) Functions::flattenSingleValue($yield);
-        $redemption    = (float) Functions::flattenSingleValue($redemption);
+        $redemption = (float) Functions::flattenSingleValue($redemption);
         $frequency    = (int) Functions::flattenSingleValue($frequency);
-        $basis        = (is_null($basis))    ? 0 :    (int) Functions::flattenSingleValue($basis);
+        $basis        = (is_null($basis)) ? 0 : (int) Functions::flattenSingleValue($basis);
 
         if (is_string($settlement = DateTime::getDateValue($settlement))) {
             return Functions::VALUE();
@@ -1667,9 +1667,9 @@ 
         $n = self::COUPNUM($settlement, $maturity, $frequency, $basis);
         $a = self::COUPDAYBS($settlement, $maturity, $frequency, $basis);
 
-        $baseYF    = 1.0 + ($yield / $frequency);
+        $baseYF = 1.0 + ($yield / $frequency);
         $rfp    = 100 * ($rate / $frequency);
-        $de    = $dsc / $e;
+        $de = $dsc / $e;
 
         $result = $redemption / pow($baseYF, (--$n + $de));
         for ($k = 0; $k <= $n; ++$k) {
@@ -1706,7 +1706,7 @@ 
         $maturity    = Functions::flattenSingleValue($maturity);
         $discount    = (float) Functions::flattenSingleValue($discount);
         $redemption    = (float) Functions::flattenSingleValue($redemption);
-        $basis        = (int) Functions::flattenSingleValue($basis);
+        $basis = (int) Functions::flattenSingleValue($basis);
 
         //    Validate
         if ((is_numeric($discount)) && (is_numeric($redemption)) && (is_numeric($basis))) {
@@ -1747,7 +1747,7 @@ 
      */
     public static function PRICEMAT($settlement, $maturity, $issue, $rate, $yield, $basis = 0)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
+        $settlement = Functions::flattenSingleValue($settlement);
         $maturity    = Functions::flattenSingleValue($maturity);
         $issue        = Functions::flattenSingleValue($issue);
         $rate        = Functions::flattenSingleValue($rate);
@@ -1806,8 +1806,8 @@ 
     {
         $rate    = Functions::flattenSingleValue($rate);
         $nper    = Functions::flattenSingleValue($nper);
-        $pmt    = Functions::flattenSingleValue($pmt);
-        $fv        = Functions::flattenSingleValue($fv);
+        $pmt = Functions::flattenSingleValue($pmt);
+        $fv = Functions::flattenSingleValue($fv);
         $type    = Functions::flattenSingleValue($type);
 
         // Validate parameters
@@ -1855,12 +1855,12 @@ 
      **/
     public static function RATE($nper, $pmt, $pv, $fv = 0.0, $type = 0, $guess = 0.1)
     {
-        $nper    = (int) Functions::flattenSingleValue($nper);
-        $pmt    = Functions::flattenSingleValue($pmt);
+        $nper = (int) Functions::flattenSingleValue($nper);
+        $pmt = Functions::flattenSingleValue($pmt);
         $pv        = Functions::flattenSingleValue($pv);
-        $fv        = (is_null($fv))    ? 0.0    :    Functions::flattenSingleValue($fv);
-        $type    = (is_null($type))    ? 0        :    (int) Functions::flattenSingleValue($type);
-        $guess    = (is_null($guess))    ? 0.1    :    Functions::flattenSingleValue($guess);
+        $fv        = (is_null($fv)) ? 0.0 : Functions::flattenSingleValue($fv);
+        $type = (is_null($type)) ? 0 : (int) Functions::flattenSingleValue($type);
+        $guess = (is_null($guess)) ? 0.1 : Functions::flattenSingleValue($guess);
 
         $rate = $guess;
         if (abs($rate) < FINANCIAL_PRECISION) {
@@ -1922,7 +1922,7 @@ 
         $maturity    = Functions::flattenSingleValue($maturity);
         $investment    = (float) Functions::flattenSingleValue($investment);
         $discount    = (float) Functions::flattenSingleValue($discount);
-        $basis        = (int) Functions::flattenSingleValue($basis);
+        $basis = (int) Functions::flattenSingleValue($basis);
 
         //    Validate
         if ((is_numeric($investment)) && (is_numeric($discount)) && (is_numeric($basis))) {
@@ -1935,7 +1935,7 @@ 
                 return $daysBetweenSettlementAndMaturity;
             }
 
-            return $investment / ( 1 - ($discount * $daysBetweenSettlementAndMaturity));
+            return $investment / (1 - ($discount * $daysBetweenSettlementAndMaturity));
         }
         return Functions::VALUE();
     }
@@ -1954,7 +1954,7 @@ 
     public static function SLN($cost, $salvage, $life)
     {
         $cost        = Functions::flattenSingleValue($cost);
-        $salvage    = Functions::flattenSingleValue($salvage);
+        $salvage = Functions::flattenSingleValue($salvage);
         $life        = Functions::flattenSingleValue($life);
 
         // Calculate
@@ -1982,9 +1982,9 @@ 
     public static function SYD($cost, $salvage, $life, $period)
     {
         $cost        = Functions::flattenSingleValue($cost);
-        $salvage    = Functions::flattenSingleValue($salvage);
+        $salvage = Functions::flattenSingleValue($salvage);
         $life        = Functions::flattenSingleValue($life);
-        $period        = Functions::flattenSingleValue($period);
+        $period = Functions::flattenSingleValue($period);
 
         // Calculate
         if ((is_numeric($cost)) && (is_numeric($salvage)) && (is_numeric($life)) && (is_numeric($period))) {
@@ -2011,7 +2011,7 @@ 
      */
     public static function TBILLEQ($settlement, $maturity, $discount)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
+        $settlement = Functions::flattenSingleValue($settlement);
         $maturity    = Functions::flattenSingleValue($maturity);
         $discount    = Functions::flattenSingleValue($discount);
 
@@ -2050,7 +2050,7 @@ 
      */
     public static function TBILLPRICE($settlement, $maturity, $discount)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
+        $settlement = Functions::flattenSingleValue($settlement);
         $maturity    = Functions::flattenSingleValue($maturity);
         $discount    = Functions::flattenSingleValue($discount);
 
@@ -2103,9 +2103,9 @@ 
      */
     public static function TBILLYIELD($settlement, $maturity, $price)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
-        $price        = Functions::flattenSingleValue($price);
+        $settlement = Functions::flattenSingleValue($settlement);
+        $maturity = Functions::flattenSingleValue($maturity);
+        $price = Functions::flattenSingleValue($price);
 
         //    Validate
         if (is_numeric($price)) {
@@ -2216,7 +2216,7 @@ 
         if ((!is_array($values)) || (!is_array($dates))) {
             return Functions::VALUE();
         }
-        $values    = Functions::flattenArray($values);
+        $values = Functions::flattenArray($values);
         $dates    = Functions::flattenArray($dates);
         $valCount = count($values);
         if ($valCount != count($dates)) {
@@ -2259,7 +2259,7 @@ 
     public static function YIELDDISC($settlement, $maturity, $price, $redemption, $basis = 0)
     {
         $settlement    = Functions::flattenSingleValue($settlement);
-        $maturity    = Functions::flattenSingleValue($maturity);
+        $maturity = Functions::flattenSingleValue($maturity);
         $price        = Functions::flattenSingleValue($price);
         $redemption    = Functions::flattenSingleValue($redemption);
         $basis        = (int) Functions::flattenSingleValue($basis);
@@ -2308,7 +2308,7 @@ 
      */
     public static function YIELDMAT($settlement, $maturity, $issue, $rate, $price, $basis = 0)
     {
-        $settlement    = Functions::flattenSingleValue($settlement);
+        $settlement = Functions::flattenSingleValue($settlement);
         $maturity    = Functions::flattenSingleValue($maturity);
         $issue        = Functions::flattenSingleValue($issue);
         $rate        = Functions::flattenSingleValue($rate);

src/PhpSpreadsheet/Calculation/Statistical.php

Spacing +38 added lines, -38 removed lines

@@ -167,10 +167,10 @@ 
         $frac = $h;
         $m     = 1;
         $delta = 0.0;
-        while ($m <= MAX_ITERATIONS && abs($delta-1.0) > PRECISION) {
+        while ($m <= MAX_ITERATIONS && abs($delta - 1.0) > PRECISION) {
             $m2 = 2 * $m;
             // even index for d
-            $d = $m * ($q - $m) * $x / ( ($p_minus + $m2) * ($p + $m2));
+            $d = $m * ($q - $m) * $x / (($p_minus + $m2) * ($p + $m2));
             $h = 1.0 + $d * $h;
             if (abs($h) < XMININ) {
                 $h = XMININ;
@@ -314,7 +314,7 @@ 
             341747634550.7377132798597,
             446315818741.9713286462081
         );
-        static $lg_c  = array(
+        static $lg_c = array(
             -0.001910444077728,
             8.4171387781295e-4,
             -5.952379913043012e-4,
@@ -428,14 +428,14 @@ 
     {
         static $max = 32;
         $summer = 0;
-        for ($n=0; $n<=$max; ++$n) {
+        for ($n = 0; $n <= $max; ++$n) {
             $divisor = $a;
-            for ($i=1; $i<=$n; ++$i) {
+            for ($i = 1; $i <= $n; ++$i) {
                 $divisor *= ($a + $i);
             }
             $summer += (pow($x, $n) / $divisor);
         }
-        return pow($x, $a) * exp(0-$x) * $summer;
+        return pow($x, $a) * exp(0 - $x) * $summer;
     }
 
 
@@ -463,7 +463,7 @@ 
         $tmp -= ($x + 0.5) * log($tmp);
 
         $summer = $p0;
-        for ($j=1; $j<=6; ++$j) {
+        for ($j = 1; $j <= 6; ++$j) {
             $summer += ($p[$j] / ++$y);
         }
         return exp(0 - $tmp + log(SQRT2PI * $summer / $x));
@@ -527,8 +527,8 @@ 
         );
 
         //    Define lower and upper region break-points.
-        $p_low = 0.02425;            //Use lower region approx. below this
-        $p_high = 1 - $p_low;        //Use upper region approx. above this
+        $p_low = 0.02425; //Use lower region approx. below this
+        $p_high = 1 - $p_low; //Use upper region approx. above this
 
         if (0 < $p && $p < $p_low) {
             //    Rational approximation for lower region.
@@ -868,7 +868,7 @@ 
             if (!is_numeric($arg)) {
                 $arg = \PHPExcel\Calculation::wrapResult(strtoupper($arg));
             }
-            $testCondition = '='.$arg.$condition;
+            $testCondition = '=' . $arg . $condition;
             if (\PHPExcel\Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                 if ((is_null($returnValue)) || ($arg > $returnValue)) {
                     $returnValue += $arg;
@@ -1015,7 +1015,7 @@ 
                     }
                     return $summer;
                 } else {
-                    return MathTrig::COMBIN($trials, $value) * pow($probability, $value) * pow(1 - $probability, $trials - $value) ;
+                    return MathTrig::COMBIN($trials, $value) * pow($probability, $value) * pow(1 - $probability, $trials - $value);
                 }
             }
         }
@@ -1047,7 +1047,7 @@ 
                 }
                 return Functions::NAN();
             }
-            return 1 - (self::incompleteGamma($degrees/2, $value/2) / self::gamma($degrees/2));
+            return 1 - (self::incompleteGamma($degrees / 2, $value / 2) / self::gamma($degrees / 2));
         }
         return Functions::VALUE();
     }
@@ -1072,7 +1072,7 @@ 
             $xHi = 0;
 
             $x = $xNew = 1;
-            $dx    = 1;
+            $dx = 1;
             $i = 0;
 
             while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
@@ -1289,7 +1289,7 @@ 
             if (!is_numeric($arg)) {
                 $arg = \PHPExcel\Calculation::wrapResult(strtoupper($arg));
             }
-            $testCondition = '='.$arg.$condition;
+            $testCondition = '=' . $arg . $condition;
             if (\PHPExcel\Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                 // Is it a value within our criteria
                 ++$returnValue;
@@ -1517,9 +1517,9 @@ 
      */
     public static function EXPONDIST($value, $lambda, $cumulative)
     {
-        $value    = Functions::flattenSingleValue($value);
-        $lambda    = Functions::flattenSingleValue($lambda);
-        $cumulative    = Functions::flattenSingleValue($cumulative);
+        $value = Functions::flattenSingleValue($value);
+        $lambda = Functions::flattenSingleValue($lambda);
+        $cumulative = Functions::flattenSingleValue($cumulative);
 
         if ((is_numeric($value)) && (is_numeric($lambda))) {
             if (($value < 0) || ($lambda < 0)) {
@@ -1527,9 +1527,9 @@ 
             }
             if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
                 if ($cumulative) {
-                    return 1 - exp(0-$value*$lambda);
+                    return 1 - exp(0 - $value * $lambda);
                 } else {
-                    return $lambda * exp(0-$value*$lambda);
+                    return $lambda * exp(0 - $value * $lambda);
                 }
             }
         }
@@ -1549,13 +1549,13 @@ 
      */
     public static function FISHER($value)
     {
-        $value    = Functions::flattenSingleValue($value);
+        $value = Functions::flattenSingleValue($value);
 
         if (is_numeric($value)) {
             if (($value <= -1) || ($value >= 1)) {
                 return Functions::NAN();
             }
-            return 0.5 * log((1+$value)/(1-$value));
+            return 0.5 * log((1 + $value) / (1 - $value));
         }
         return Functions::VALUE();
     }
@@ -1573,7 +1573,7 @@ 
      */
     public static function FISHERINV($value)
     {
-        $value    = Functions::flattenSingleValue($value);
+        $value = Functions::flattenSingleValue($value);
 
         if (is_numeric($value)) {
             return (exp(2 * $value) - 1) / (exp(2 * $value) + 1);
@@ -1594,7 +1594,7 @@ 
      */
     public static function FORECAST($xValue, $yValues, $xValues)
     {
-        $xValue    = Functions::flattenSingleValue($xValue);
+        $xValue = Functions::flattenSingleValue($xValue);
         if (!is_numeric($xValue)) {
             return Functions::VALUE();
         } elseif (!self::checkTrendArrays($yValues, $xValues)) {
@@ -1640,7 +1640,7 @@ 
                 if ($cumulative) {
                     return self::incompleteGamma($a, $value / $b) / self::gamma($a);
                 } else {
-                    return (1 / (pow($b, $a) * self::gamma($a))) * pow($value, $a-1) * exp(0-($value / $b));
+                    return (1 / (pow($b, $a) * self::gamma($a))) * pow($value, $a - 1) * exp(0 - ($value / $b));
                 }
             }
         }
@@ -1720,7 +1720,7 @@ 
      */
     public static function GAMMALN($value)
     {
-        $value    = Functions::flattenSingleValue($value);
+        $value = Functions::flattenSingleValue($value);
 
         if (is_numeric($value)) {
             if ($value <= 0) {
@@ -1753,7 +1753,7 @@ 
 
         $aMean = MathTrig::PRODUCT($aArgs);
         if (is_numeric($aMean) && ($aMean > 0)) {
-            $aCount = self::COUNT($aArgs) ;
+            $aCount = self::COUNT($aArgs);
             if (self::MIN($aArgs) > 0) {
                 return pow($aMean, (1 / $aCount));
             }
@@ -1943,7 +1943,7 @@ 
 
             // Return
             if ($count > 3) {
-                return $summer * ($count * ($count+1) / (($count-1) * ($count-2) * ($count-3))) - (3 * pow($count-1, 2) / (($count-2) * ($count-3)));
+                return $summer * ($count * ($count + 1) / (($count - 1) * ($count - 2) * ($count - 3))) - (3 * pow($count - 1, 2) / (($count - 2) * ($count - 3)));
             }
         }
         return Functions::DIV0();
@@ -2281,7 +2281,7 @@ 
             if (!is_numeric($arg)) {
                 $arg = \PHPExcel\Calculation::wrapResult(strtoupper($arg));
             }
-            $testCondition = '='.$arg.$condition;
+            $testCondition = '=' . $arg . $condition;
             if (\PHPExcel\Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                 if ((is_null($returnValue)) || ($arg > $returnValue)) {
                     $returnValue = $arg;
@@ -2440,7 +2440,7 @@ 
             if (!is_numeric($arg)) {
                 $arg = \PHPExcel\Calculation::wrapResult(strtoupper($arg));
             }
-            $testCondition = '='.$arg.$condition;
+            $testCondition = '=' . $arg . $condition;
             if (\PHPExcel\Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                 if ((is_null($returnValue)) || ($arg < $returnValue)) {
                     $returnValue = $arg;
@@ -2697,14 +2697,14 @@ 
             if ($mValueCount > 0) {
                 sort($mArgs);
                 $count = self::COUNT($mArgs);
-                $index = $entry * ($count-1);
+                $index = $entry * ($count - 1);
                 $iBase = floor($index);
                 if ($index == $iBase) {
                     return $mArgs[$index];
                 } else {
                     $iNext = $iBase + 1;
                     $iProportion = $index - $iBase;
-                    return $mArgs[$iBase] + (($mArgs[$iNext] - $mArgs[$iBase]) * $iProportion) ;
+                    return $mArgs[$iBase] + (($mArgs[$iNext] - $mArgs[$iBase]) * $iProportion);
                 }
             }
         }
@@ -2816,9 +2816,9 @@ 
                     for ($i = 0; $i <= floor($value); ++$i) {
                         $summer += pow($mean, $i) / MathTrig::FACT($i);
                     }
-                    return exp(0-$mean) * $summer;
+                    return exp(0 - $mean) * $summer;
                 } else {
-                    return (exp(0-$mean) * pow($mean, $value)) / MathTrig::FACT($value);
+                    return (exp(0 - $mean) * pow($mean, $value)) / MathTrig::FACT($value);
                 }
             }
         }
@@ -2954,7 +2954,7 @@ 
         }
 
         if ($count > 2) {
-            return $summer * ($count / (($count-1) * ($count-2)));
+            return $summer * ($count / (($count - 1) * ($count - 2)));
         }
         return Functions::DIV0();
     }
@@ -3050,7 +3050,7 @@ 
             if ($stdDev <= 0) {
                 return Functions::NAN();
             }
-            return ($value - $mean) / $stdDev ;
+            return ($value - $mean) / $stdDev;
         }
         return Functions::VALUE();
     }
@@ -3294,7 +3294,7 @@ 
     public static function TDIST($value, $degrees, $tails)
     {
         $value        = Functions::flattenSingleValue($value);
-        $degrees    = floor(Functions::flattenSingleValue($degrees));
+        $degrees = floor(Functions::flattenSingleValue($degrees));
         $tails        = floor(Functions::flattenSingleValue($tails));
 
         if ((is_numeric($value)) && (is_numeric($degrees)) && (is_numeric($tails))) {
@@ -3364,7 +3364,7 @@ 
             $xHi = 0;
 
             $x = $xNew = 1;
-            $dx    = 1;
+            $dx = 1;
             $i = 0;
 
             while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
@@ -3469,7 +3469,7 @@ 
             }
             $discard = floor(self::COUNT($mArgs) * $percent / 2);
             sort($mArgs);
-            for ($i=0; $i < $discard; ++$i) {
+            for ($i = 0; $i < $discard; ++$i) {
                 array_pop($mArgs);
                 array_shift($mArgs);
             }

src/PhpSpreadsheet/Calculation/TextData.php

Spacing +17 added lines, -17 removed lines

@@ -33,18 +33,18 @@ 
 
     private static function unicodeToOrd($c)
     {
-        if (ord($c{0}) >=0 && ord($c{0}) <= 127) {
+        if (ord($c{0}) >= 0 && ord($c{0}) <= 127) {
             return ord($c{0});
         } elseif (ord($c{0}) >= 192 && ord($c{0}) <= 223) {
-            return (ord($c{0})-192)*64 + (ord($c{1})-128);
+            return (ord($c{0}) - 192) * 64 + (ord($c{1}) - 128);
         } elseif (ord($c{0}) >= 224 && ord($c{0}) <= 239) {
-            return (ord($c{0})-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128);
+            return (ord($c{0}) - 224) * 4096 + (ord($c{1}) - 128) * 64 + (ord($c{2}) - 128);
         } elseif (ord($c{0}) >= 240 && ord($c{0}) <= 247) {
-            return (ord($c{0})-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128);
+            return (ord($c{0}) - 240) * 262144 + (ord($c{1}) - 128) * 4096 + (ord($c{2}) - 128) * 64 + (ord($c{3}) - 128);
         } elseif (ord($c{0}) >= 248 && ord($c{0}) <= 251) {
-            return (ord($c{0})-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128);
+            return (ord($c{0}) - 248) * 16777216 + (ord($c{1}) - 128) * 262144 + (ord($c{2}) - 128) * 4096 + (ord($c{3}) - 128) * 64 + (ord($c{4}) - 128);
         } elseif (ord($c{0}) >= 252 && ord($c{0}) <= 253) {
-            return (ord($c{0})-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128);
+            return (ord($c{0}) - 252) * 1073741824 + (ord($c{1}) - 128) * 16777216 + (ord($c{2}) - 128) * 262144 + (ord($c{3}) - 128) * 4096 + (ord($c{4}) - 128) * 64 + (ord($c{5}) - 128);
         } elseif (ord($c{0}) >= 254 && ord($c{0}) <= 255) {
             // error
             return Functions::VALUE();
@@ -67,7 +67,7 @@ 
         }
 
         if (function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding('&#'.intval($character).';', 'UTF-8', 'HTML-ENTITIES');
+            return mb_convert_encoding('&#' . intval($character) . ';', 'UTF-8', 'HTML-ENTITIES');
         } else {
             return chr(intval($character));
         }
@@ -82,7 +82,7 @@ 
      */
     public static function TRIMNONPRINTABLE($stringValue = '')
     {
-        $stringValue    = Functions::flattenSingleValue($stringValue);
+        $stringValue = Functions::flattenSingleValue($stringValue);
 
         if (is_bool($stringValue)) {
             return ($stringValue) ? \PHPExcel\Calculation::getTRUE() : \PHPExcel\Calculation::getFALSE();
@@ -130,7 +130,7 @@ 
         if (($characters === null) || ($characters === '')) {
             return Functions::VALUE();
         }
-        $characters    = Functions::flattenSingleValue($characters);
+        $characters = Functions::flattenSingleValue($characters);
         if (is_bool($characters)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
                 $characters = (int) $characters;
@@ -194,8 +194,8 @@ 
      */
     public static function DOLLAR($value = 0, $decimals = 2)
     {
-        $value        = Functions::flattenSingleValue($value);
-        $decimals    = is_null($decimals) ? 0 : Functions::flattenSingleValue($decimals);
+        $value = Functions::flattenSingleValue($value);
+        $decimals = is_null($decimals) ? 0 : Functions::flattenSingleValue($decimals);
 
         // Validate parameters
         if (!is_numeric($value) || !is_numeric($decimals)) {
@@ -209,7 +209,7 @@ 
         } else {
             $round = pow(10, abs($decimals));
             if ($value < 0) {
-                $round = 0-$round;
+                $round = 0 - $round;
             }
             $value = MathTrig::MROUND($value, $round);
         }
@@ -512,10 +512,10 @@ 
         $chars   = Functions::flattenSingleValue($chars);
         $newText = Functions::flattenSingleValue($newText);
 
-        $left = self::LEFT($oldText, $start-1);
-        $right = self::RIGHT($oldText, self::STRINGLENGTH($oldText)-($start+$chars)+1);
+        $left = self::LEFT($oldText, $start - 1);
+        $right = self::RIGHT($oldText, self::STRINGLENGTH($oldText) - ($start + $chars) + 1);
 
-        return $left.$newText.$right;
+        return $left . $newText . $right;
     }
 
 
@@ -545,9 +545,9 @@ 
             $pos = -1;
             while ($instance > 0) {
                 if (function_exists('mb_strpos')) {
-                    $pos = mb_strpos($text, $fromText, $pos+1, 'UTF-8');
+                    $pos = mb_strpos($text, $fromText, $pos + 1, 'UTF-8');
                 } else {
-                    $pos = strpos($text, $fromText, $pos+1);
+                    $pos = strpos($text, $fromText, $pos + 1);
                 }
                 if ($pos === false) {
                     break;

src/PhpSpreadsheet/Calculation/LookupRef.php

Spacing +19 added lines, -19 removed lines

@@ -63,28 +63,28 @@ 
 
         if ($sheetText > '') {
             if (strpos($sheetText, ' ') !== false) {
-                $sheetText = "'".$sheetText."'";
+                $sheetText = "'" . $sheetText . "'";
             }
-            $sheetText .='!';
+            $sheetText .= '!';
         }
         if ((!is_bool($referenceStyle)) || $referenceStyle) {
             $rowRelative = $columnRelative = '$';
-            $column = \PHPExcel\Cell::stringFromColumnIndex($column-1);
+            $column = \PHPExcel\Cell::stringFromColumnIndex($column - 1);
             if (($relativity == 2) || ($relativity == 4)) {
                 $columnRelative = '';
             }
             if (($relativity == 3) || ($relativity == 4)) {
                 $rowRelative = '';
             }
-            return $sheetText.$columnRelative.$column.$rowRelative.$row;
+            return $sheetText . $columnRelative . $column . $rowRelative . $row;
         } else {
             if (($relativity == 2) || ($relativity == 4)) {
-                $column = '['.$column.']';
+                $column = '[' . $column . ']';
             }
             if (($relativity == 3) || ($relativity == 4)) {
-                $row = '['.$row.']';
+                $row = '[' . $row . ']';
             }
-            return $sheetText.'R'.$row.'C'.$column;
+            return $sheetText . 'R' . $row . 'C' . $column;
         }
     }
 
@@ -262,7 +262,7 @@ 
         $args = func_get_args();
         $pCell = array_pop($args);
 
-        $linkURL     = (is_null($linkURL))     ? '' : Functions::flattenSingleValue($linkURL);
+        $linkURL     = (is_null($linkURL)) ? '' : Functions::flattenSingleValue($linkURL);
         $displayName = (is_null($displayName)) ? '' : Functions::flattenSingleValue($displayName);
 
         if ((!is_object($pCell)) || (trim($linkURL) == '')) {
@@ -300,7 +300,7 @@ 
      */
     public static function INDIRECT($cellAddress = null, \PHPExcel\Cell $pCell = null)
     {
-        $cellAddress    = Functions::flattenSingleValue($cellAddress);
+        $cellAddress = Functions::flattenSingleValue($cellAddress);
         if (is_null($cellAddress) || $cellAddress === '') {
             return Functions::REF();
         }
@@ -311,9 +311,9 @@ 
             list($cellAddress1, $cellAddress2) = explode(':', $cellAddress);
         }
 
-        if ((!preg_match('/^'.\PHPExcel\Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress1, $matches)) ||
-            ((!is_null($cellAddress2)) && (!preg_match('/^'.\PHPExcel\Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress2, $matches)))) {
-            if (!preg_match('/^'.\PHPExcel\Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $cellAddress1, $matches)) {
+        if ((!preg_match('/^' . \PHPExcel\Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress1, $matches)) ||
+            ((!is_null($cellAddress2)) && (!preg_match('/^' . \PHPExcel\Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress2, $matches)))) {
+            if (!preg_match('/^' . \PHPExcel\Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $cellAddress1, $matches)) {
                 return Functions::REF();
             }
 
@@ -420,9 +420,9 @@ 
         }
         $endCellColumn = \PHPExcel\Cell::stringFromColumnIndex($endCellColumn);
 
-        $cellAddress = $startCellColumn.$startCellRow;
+        $cellAddress = $startCellColumn . $startCellRow;
         if (($startCellColumn != $endCellColumn) || ($startCellRow != $endCellRow)) {
-            $cellAddress .= ':'.$endCellColumn.$endCellRow;
+            $cellAddress .= ':' . $endCellColumn . $endCellRow;
         }
 
         if ($sheetName !== null) {
@@ -497,7 +497,7 @@ 
     {
         $lookup_array = Functions::flattenArray($lookup_array);
         $lookup_value = Functions::flattenSingleValue($lookup_value);
-        $match_type    = (is_null($match_type)) ? 1 : (int) Functions::flattenSingleValue($match_type);
+        $match_type = (is_null($match_type)) ? 1 : (int) Functions::flattenSingleValue($match_type);
         //    MATCH is not case sensitive
         $lookup_value = strtolower($lookup_value);
 
@@ -529,7 +529,7 @@ 
                 $lookup_array[$i] = strtolower($lookupArrayValue);
             }
             if ((is_null($lookupArrayValue)) && (($match_type == 1) || ($match_type == -1))) {
-                $lookup_array = array_slice($lookup_array, 0, $i-1);
+                $lookup_array = array_slice($lookup_array, 0, $i - 1);
             }
         }
 
@@ -557,7 +557,7 @@ 
                     break;
                 } else {
                     // the previous cell was the match
-                    return $keySet[$i-1]+1;
+                    return $keySet[$i - 1] + 1;
                 }
             } elseif (($match_type == 1) && ($lookupArrayValue >= $lookup_value)) {
                 $i = array_search($i, $keySet);
@@ -567,7 +567,7 @@ 
                     break;
                 } else {
                     // the previous cell was the match
-                    return $keySet[$i-1]+1;
+                    return $keySet[$i - 1] + 1;
                 }
             }
         }
@@ -755,7 +755,7 @@ 
     {
         $lookup_value   = Functions::flattenSingleValue($lookup_value);
         $index_number   = Functions::flattenSingleValue($index_number);
-        $not_exact_match    = Functions::flattenSingleValue($not_exact_match);
+        $not_exact_match = Functions::flattenSingleValue($not_exact_match);
 
         // index_number must be greater than or equal to 1
         if ($index_number < 1) {

src/PhpSpreadsheet/Calculation/MathTrig.php

Spacing +29 added lines, -29 removed lines

@@ -57,7 +57,7 @@ 
 
     private static function romanCut($num, $n)
     {
-        return ($num - ($num % $n ) ) / $n;
+        return ($num - ($num % $n)) / $n;
     }
 
 
@@ -92,7 +92,7 @@ 
         $yCoordinate = ($yCoordinate !== null) ? $yCoordinate : 0.0;
 
         if (((is_numeric($xCoordinate)) || (is_bool($xCoordinate))) &&
-            ((is_numeric($yCoordinate)))  || (is_bool($yCoordinate))) {
+            ((is_numeric($yCoordinate))) || (is_bool($yCoordinate))) {
             $xCoordinate    = (float) $xCoordinate;
             $yCoordinate    = (float) $yCoordinate;
 
@@ -134,7 +134,7 @@ 
         }
 
         if ((is_numeric($number)) && (is_numeric($significance))) {
-            if (($number == 0.0 ) || ($significance == 0.0)) {
+            if (($number == 0.0) || ($significance == 0.0)) {
                 return 0.0;
             } elseif (self::SIGN($number) == self::SIGN($significance)) {
                 return ceil($number / $significance) * $significance;
@@ -163,8 +163,8 @@ 
      */
     public static function COMBIN($numObjs, $numInSet)
     {
-        $numObjs    = Functions::flattenSingleValue($numObjs);
-        $numInSet    = Functions::flattenSingleValue($numInSet);
+        $numObjs = Functions::flattenSingleValue($numObjs);
+        $numInSet = Functions::flattenSingleValue($numInSet);
 
         if ((is_numeric($numObjs)) && (is_numeric($numInSet))) {
             if ($numObjs < $numInSet) {
@@ -229,7 +229,7 @@ 
      */
     public static function FACT($factVal)
     {
-        $factVal    = Functions::flattenSingleValue($factVal);
+        $factVal = Functions::flattenSingleValue($factVal);
 
         if (is_numeric($factVal)) {
             if ($factVal < 0) {
@@ -246,7 +246,7 @@ 
             while ($factLoop > 1) {
                 $factorial *= $factLoop--;
             }
-            return $factorial ;
+            return $factorial;
         }
         return Functions::VALUE();
     }
@@ -267,10 +267,10 @@ 
      */
     public static function FACTDOUBLE($factVal)
     {
-        $factLoop    = Functions::flattenSingleValue($factVal);
+        $factLoop = Functions::flattenSingleValue($factVal);
 
         if (is_numeric($factLoop)) {
-            $factLoop    = floor($factLoop);
+            $factLoop = floor($factLoop);
             if ($factVal < 0) {
                 return Functions::NAN();
             }
@@ -279,7 +279,7 @@ 
                 $factorial *= $factLoop--;
                 --$factLoop;
             }
-            return $factorial ;
+            return $factorial;
         }
         return Functions::VALUE();
     }
@@ -301,12 +301,12 @@ 
      */
     public static function FLOOR($number, $significance = null)
     {
-        $number            = Functions::flattenSingleValue($number);
-        $significance    = Functions::flattenSingleValue($significance);
+        $number = Functions::flattenSingleValue($number);
+        $significance = Functions::flattenSingleValue($significance);
 
         if ((is_null($significance)) &&
             (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC)) {
-            $significance = $number/abs($number);
+            $significance = $number / abs($number);
         }
 
         if ((is_numeric($number)) && (is_numeric($significance))) {
@@ -363,7 +363,7 @@ 
         }
 
         $mergedArray = $allValuesFactors[0];
-        for ($i=1; $i < $allValuesCount; ++$i) {
+        for ($i = 1; $i < $allValuesCount; ++$i) {
             $mergedArray = array_intersect_key($mergedArray, $allValuesFactors[$i]);
         }
         $mergedArrayValues = count($mergedArray);
@@ -417,7 +417,7 @@ 
      */
     public static function INT($number)
     {
-        $number    = Functions::flattenSingleValue($number);
+        $number = Functions::flattenSingleValue($number);
 
         if (is_null($number)) {
             return 0;
@@ -500,8 +500,8 @@ 
      */
     public static function logBase($number = null, $base = 10)
     {
-        $number    = Functions::flattenSingleValue($number);
-        $base    = (is_null($base)) ? 10 : (float) Functions::flattenSingleValue($base);
+        $number = Functions::flattenSingleValue($number);
+        $base = (is_null($base)) ? 10 : (float) Functions::flattenSingleValue($base);
 
         if ((!is_numeric($base)) || (!is_numeric($number))) {
             return Functions::VALUE();
@@ -927,8 +927,8 @@ 
 
     public static function ROMAN($aValue, $style = 0)
     {
-        $aValue    = Functions::flattenSingleValue($aValue);
-        $style    = (is_null($style))    ? 0 :    (integer) Functions::flattenSingleValue($style);
+        $aValue = Functions::flattenSingleValue($aValue);
+        $style = (is_null($style)) ? 0 : (integer) Functions::flattenSingleValue($style);
         if ((!is_numeric($aValue)) || ($aValue < 0) || ($aValue >= 4000)) {
             return Functions::VALUE();
         }
@@ -954,7 +954,7 @@ 
         $t = self::romanCut($aValue, 10);
         $aValue %= 10;
 
-        return $roman.$mill[$m].$cent[$c].$tens[$t].$ones[$aValue];
+        return $roman . $mill[$m] . $cent[$c] . $tens[$t] . $ones[$aValue];
     }
 
 
@@ -1060,7 +1060,7 @@ 
      */
     public static function SIGN($number)
     {
-        $number    = Functions::flattenSingleValue($number);
+        $number = Functions::flattenSingleValue($number);
 
         if (is_bool($number)) {
             return (int) $number;
@@ -1085,13 +1085,13 @@ 
      */
     public static function SQRTPI($number)
     {
-        $number    = Functions::flattenSingleValue($number);
+        $number = Functions::flattenSingleValue($number);
 
         if (is_numeric($number)) {
             if ($number < 0) {
                 return Functions::NAN();
             }
-            return sqrt($number * M_PI) ;
+            return sqrt($number * M_PI);
         }
         return Functions::VALUE();
     }
@@ -1204,7 +1204,7 @@ 
                 $arg = \PHPExcel\Calculation::wrapResult(strtoupper($arg));
             }
 
-            $testCondition = '='.$arg.$condition;
+            $testCondition = '=' . $arg . $condition;
             if (\PHPExcel\Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                 // Is it a value within our criteria
                 $returnValue += $sumArgs[$key];
@@ -1251,7 +1251,7 @@ 
                 if (!is_numeric($arg)) {
                     $arg = \PHPExcel\Calculation::wrapResult(strtoupper($arg));
                 }
-                $testCondition = '='.$arg.$condition;
+                $testCondition = '=' . $arg . $condition;
                 if (\PHPExcel\Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                     // Is it a value within our criteria
                     $returnValue += $sumArgs[$key];
@@ -1281,7 +1281,7 @@ 
         $wrkArray = Functions::flattenArray(array_shift($arrayList));
         $wrkCellCount = count($wrkArray);
 
-        for ($i=0; $i< $wrkCellCount; ++$i) {
+        for ($i = 0; $i < $wrkCellCount; ++$i) {
             if ((!is_numeric($wrkArray[$i])) || (is_string($wrkArray[$i]))) {
                 $wrkArray[$i] = 0;
             }
@@ -1421,8 +1421,8 @@ 
      */
     public static function TRUNC($value = 0, $digits = 0)
     {
-        $value    = Functions::flattenSingleValue($value);
-        $digits    = Functions::flattenSingleValue($digits);
+        $value = Functions::flattenSingleValue($value);
+        $digits = Functions::flattenSingleValue($digits);
 
         // Validate parameters
         if ((!is_numeric($value)) || (!is_numeric($digits))) {
@@ -1433,7 +1433,7 @@ 
         // Truncate
         $adjust = pow(10, $digits);
 
-        if (($digits > 0) && (rtrim(intval((abs($value) - abs(intval($value))) * $adjust), '0') < $adjust/10)) {
+        if (($digits > 0) && (rtrim(intval((abs($value) - abs(intval($value))) * $adjust), '0') < $adjust / 10)) {
             return $value;
         }
 

src/PhpSpreadsheet/Calculation/Functions.php

Spacing +4 added lines, -4 removed lines

@@ -549,7 +549,7 @@ 
             case 'integer':
                 return $value;
             case 'boolean':
-                return (integer)$value;
+                return (integer) $value;
             case 'string':
                 //    Errors
                 if ((strlen($value) > 0) && ($value{0} == '#')) {
@@ -620,7 +620,7 @@ 
     public static function flattenArray($array)
     {
         if (!is_array($array)) {
-            return (array)$array;
+            return (array) $array;
         }
 
         $arrayValues = array();
@@ -653,7 +653,7 @@ 
     public static function flattenArrayIndexed($array)
     {
         if (!is_array($array)) {
-            return (array)$array;
+            return (array) $array;
         }
 
         $arrayValues = array();
@@ -738,7 +738,7 @@ 
             return $ret;
         }
 
-        foreach ((array)$search as $key => $s) {
+        foreach ((array) $search as $key => $s) {
             if ($s == '' && $s !== 0) {
                 continue;
             }