PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/CachedObjectStorage/APC.php

Spacing +4 added lines, -4 removed lines

@@ -106,11 +106,11 @@ 
                 return true;
             }
             //    Check if the requested entry still exists in apc
-            $success = apc_fetch($this->cachePrefix.$pCoord.'.cache');
+            $success = apc_fetch($this->cachePrefix . $pCoord . '.cache');
             if ($success === false) {
                 //    Entry no longer exists in APC, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
-                throw new \PhpSpreadsheet\Exception('Cell entry '.$pCoord.' no longer exists in APC cache');
+                throw new \PhpSpreadsheet\Exception('Cell entry ' . $pCoord . ' no longer exists in APC cache');
             }
             return true;
         }
@@ -138,7 +138,7 @@ 
             if ($obj === false) {
                 //    Entry no longer exists in APC, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
-                throw new \PhpSpreadsheet\Exception('Cell entry '.$pCoord.' no longer exists in APC cache');
+                throw new \PhpSpreadsheet\Exception('Cell entry ' . $pCoord . ' no longer exists in APC cache');
             }
         } else {
             //    Return null if requested entry doesn't exist in cache
@@ -179,7 +179,7 @@ 
     public function deleteCacheData($pCoord)
     {
         //    Delete the entry from APC
-        apc_delete($this->cachePrefix.$pCoord.'.cache');
+        apc_delete($this->cachePrefix . $pCoord . '.cache');
 
         //    Delete the entry from our cell address array
         parent::deleteCacheData($pCoord);

src/PhpSpreadsheet/CachedObjectStorage/Wincache.php

Spacing +17 added lines, -17 removed lines

@@ -54,15 +54,15 @@ 
             $this->currentObject->detach();
 
             $obj = serialize($this->currentObject);
-            if (wincache_ucache_exists($this->cachePrefix.$this->currentObjectID.'.cache')) {
-                if (!wincache_ucache_set($this->cachePrefix.$this->currentObjectID.'.cache', $obj, $this->cacheTime)) {
+            if (wincache_ucache_exists($this->cachePrefix . $this->currentObjectID . '.cache')) {
+                if (!wincache_ucache_set($this->cachePrefix . $this->currentObjectID . '.cache', $obj, $this->cacheTime)) {
                     $this->__destruct();
-                    throw new \PhpSpreadsheet\Exception('Failed to store cell '.$this->currentObjectID.' in WinCache');
+                    throw new \PhpSpreadsheet\Exception('Failed to store cell ' . $this->currentObjectID . ' in WinCache');
                 }
             } else {
-                if (!wincache_ucache_add($this->cachePrefix.$this->currentObjectID.'.cache', $obj, $this->cacheTime)) {
+                if (!wincache_ucache_add($this->cachePrefix . $this->currentObjectID . '.cache', $obj, $this->cacheTime)) {
                     $this->__destruct();
-                    throw new \PhpSpreadsheet\Exception('Failed to store cell '.$this->currentObjectID.' in WinCache');
+                    throw new \PhpSpreadsheet\Exception('Failed to store cell ' . $this->currentObjectID . ' in WinCache');
                 }
             }
             $this->currentCellIsDirty = false;
@@ -108,11 +108,11 @@ 
                 return true;
             }
             //    Check if the requested entry still exists in cache
-            $success = wincache_ucache_exists($this->cachePrefix.$pCoord.'.cache');
+            $success = wincache_ucache_exists($this->cachePrefix . $pCoord . '.cache');
             if ($success === false) {
                 //    Entry no longer exists in Wincache, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
-                throw new \PhpSpreadsheet\Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
+                throw new \PhpSpreadsheet\Exception('Cell entry ' . $pCoord . ' no longer exists in WinCache');
             }
             return true;
         }
@@ -138,11 +138,11 @@ 
         $obj = null;
         if (parent::isDataSet($pCoord)) {
             $success = false;
-            $obj = wincache_ucache_get($this->cachePrefix.$pCoord.'.cache', $success);
+            $obj = wincache_ucache_get($this->cachePrefix . $pCoord . '.cache', $success);
             if ($success === false) {
                 //    Entry no longer exists in WinCache, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
-                throw new \PhpSpreadsheet\Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
+                throw new \PhpSpreadsheet\Exception('Cell entry ' . $pCoord . ' no longer exists in WinCache');
             }
         } else {
             //    Return null if requested entry doesn't exist in cache
@@ -183,7 +183,7 @@ 
     public function deleteCacheData($pCoord)
     {
         //    Delete the entry from Wincache
-        wincache_ucache_delete($this->cachePrefix.$pCoord.'.cache');
+        wincache_ucache_delete($this->cachePrefix . $pCoord . '.cache');
 
         //    Delete the entry from our cell address array
         parent::deleteCacheData($pCoord);
@@ -205,15 +205,15 @@ 
         foreach ($cacheList as $cellID) {
             if ($cellID != $this->currentObjectID) {
                 $success = false;
-                $obj = wincache_ucache_get($this->cachePrefix.$cellID.'.cache', $success);
+                $obj = wincache_ucache_get($this->cachePrefix . $cellID . '.cache', $success);
                 if ($success === false) {
                     //    Entry no longer exists in WinCache, so clear it from the cache array
                     parent::deleteCacheData($cellID);
-                    throw new \PhpSpreadsheet\Exception('Cell entry '.$cellID.' no longer exists in Wincache');
+                    throw new \PhpSpreadsheet\Exception('Cell entry ' . $cellID . ' no longer exists in Wincache');
                 }
-                if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->cacheTime)) {
+                if (!wincache_ucache_add($newCachePrefix . $cellID . '.cache', $obj, $this->cacheTime)) {
                     $this->__destruct();
-                    throw new \PhpSpreadsheet\Exception('Failed to store cell '.$cellID.' in Wincache');
+                    throw new \PhpSpreadsheet\Exception('Failed to store cell ' . $cellID . ' in Wincache');
                 }
             }
         }
@@ -250,11 +250,11 @@ 
      */
     public function __construct(\PhpSpreadsheet\Worksheet $parent, $arguments)
     {
-        $cacheTime    = (isset($arguments['cacheTime']))    ? $arguments['cacheTime']    : 600;
+        $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600;
 
         if (is_null($this->cachePrefix)) {
             $baseUnique = $this->getUniqueID();
-            $this->cachePrefix = substr(md5($baseUnique), 0, 8).'.';
+            $this->cachePrefix = substr(md5($baseUnique), 0, 8) . '.';
             $this->cacheTime = $cacheTime;
 
             parent::__construct($parent);
@@ -268,7 +268,7 @@ 
     {
         $cacheList = $this->getCellList();
         foreach ($cacheList as $cellID) {
-            wincache_ucache_delete($this->cachePrefix.$cellID.'.cache');
+            wincache_ucache_delete($this->cachePrefix . $cellID . '.cache');
         }
     }
 

src/PhpSpreadsheet/CachedObjectStorage/DiscISAM.php

Spacing +3 added lines, -3 removed lines

@@ -146,7 +146,7 @@ 
         parent::copyCellCollection($parent);
         //    Get a new id for the new file name
         $baseUnique = $this->getUniqueID();
-        $newFileName = $this->cacheDirectory.'/PhpSpreadsheet.'.$baseUnique.'.cache';
+        $newFileName = $this->cacheDirectory . '/PhpSpreadsheet.' . $baseUnique . '.cache';
         //    Copy the existing cell cache file
         copy($this->fileName, $newFileName);
         $this->fileName = $newFileName;
@@ -181,14 +181,14 @@ 
      */
     public function __construct(\PhpSpreadsheet\Worksheet $parent, $arguments)
     {
-        $this->cacheDirectory    = ((isset($arguments['dir'])) && ($arguments['dir'] !== null))
+        $this->cacheDirectory = ((isset($arguments['dir'])) && ($arguments['dir'] !== null))
                                     ? $arguments['dir']
                                     : \PhpSpreadsheet\Shared\File::sysGetTempDir();
 
         parent::__construct($parent);
         if (is_null($this->fileHandle)) {
             $baseUnique = $this->getUniqueID();
-            $this->fileName = $this->cacheDirectory.'/PhpSpreadsheet.'.$baseUnique.'.cache';
+            $this->fileName = $this->cacheDirectory . '/PhpSpreadsheet.' . $baseUnique . '.cache';
             $this->fileHandle = fopen($this->fileName, 'a+');
         }
     }

src/PhpSpreadsheet/Chart/Renderer/JpGraph.php

Spacing +30 added lines, -30 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace PhpSpreadsheet\Chart\Renderer;
 
-require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'/jpgraph.php');
+require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . '/jpgraph.php');
 
 /**
  * Copyright (c) 2006 - 2016 PhpSpreadsheet
@@ -28,15 +28,15 @@ 
  */
 class JpGraph
 {
-    private static $width    = 640;
+    private static $width = 640;
 
     private static $height    = 480;
 
     private static $colourSet = [
-        'mediumpurple1',    'palegreen3',     'gold1',          'cadetblue1',
-        'darkmagenta',      'coral',          'dodgerblue3',    'eggplant',
-        'mediumblue',       'magenta',        'sandybrown',     'cyan',
-        'firebrick1',       'forestgreen',    'deeppink4',      'darkolivegreen',
+        'mediumpurple1', 'palegreen3', 'gold1', 'cadetblue1',
+        'darkmagenta', 'coral', 'dodgerblue3', 'eggplant',
+        'mediumblue', 'magenta', 'sandybrown', 'cyan',
+        'firebrick1', 'forestgreen', 'deeppink4', 'darkolivegreen',
         'goldenrod2'
     ];
 
@@ -185,21 +185,21 @@ 
             $legendOverlay = $legend->getOverlay();
             switch ($legendPosition) {
                 case 'r':
-                    $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center');    //    right
+                    $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center'); //    right
                     $this->graph->legend->SetColumns(1);
                     break;
                 case 'l':
-                    $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center');    //    left
+                    $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center'); //    left
                     $this->graph->legend->SetColumns(1);
                     break;
                 case 't':
-                    $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top');    //    top
+                    $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top'); //    top
                     break;
                 case 'b':
-                    $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom');    //    bottom
+                    $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); //    bottom
                     break;
                 default:
-                    $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top');    //    top-right
+                    $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); //    top-right
                     $this->graph->legend->SetColumns(1);
                     break;
             }
@@ -562,7 +562,7 @@ 
 
     private function renderAreaChart($groupCount, $dimensions = '2d')
     {
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php');
 
         $this->renderCartesianPlotArea();
 
@@ -574,7 +574,7 @@ 
 
     private function renderLineChart($groupCount, $dimensions = '2d')
     {
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php');
 
         $this->renderCartesianPlotArea();
 
@@ -586,7 +586,7 @@ 
 
     private function renderBarChart($groupCount, $dimensions = '2d')
     {
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_bar.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_bar.php');
 
         $this->renderCartesianPlotArea();
 
@@ -598,9 +598,9 @@ 
 
     private function renderScatterChart($groupCount)
     {
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_scatter.php');
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_regstat.php');
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_regstat.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php');
 
         $this->renderCartesianPlotArea('linlin');
 
@@ -612,7 +612,7 @@ 
 
     private function renderBubbleChart($groupCount)
     {
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_scatter.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php');
 
         $this->renderCartesianPlotArea('linlin');
 
@@ -624,9 +624,9 @@ 
 
     private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false)
     {
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_pie.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_pie.php');
         if ($dimensions == '3d') {
-            require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_pie3d.php');
+            require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_pie3d.php');
         }
 
         $this->renderPiePlotArea($doughnut);
@@ -672,7 +672,7 @@ 
                 }
 
                 if ($multiplePlots) {
-                    $seriesPlot->SetSize(($jLimit-$j) / ($jLimit * 4));
+                    $seriesPlot->SetSize(($jLimit - $j) / ($jLimit * 4));
                 }
 
                 if ($doughnut) {
@@ -701,7 +701,7 @@ 
 
     private function renderRadarChart($groupCount)
     {
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_radar.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_radar.php');
 
         $this->renderRadarPlotArea();
 
@@ -713,7 +713,7 @@ 
 
     private function renderStockChart($groupCount)
     {
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_stock.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_stock.php');
 
         $this->renderCartesianPlotArea('intint');
 
@@ -725,7 +725,7 @@ 
 
     private function renderContourChart($groupCount, $dimensions)
     {
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_contour.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_contour.php');
 
         $this->renderCartesianPlotArea('intint');
 
@@ -737,11 +737,11 @@ 
 
     private function renderCombinationChart($groupCount, $dimensions, $outputDestination)
     {
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php');
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_bar.php');
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_scatter.php');
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_regstat.php');
-        require_once(\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_bar.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_regstat.php');
+        require_once(\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php');
 
         $this->renderCartesianPlotArea();
 
@@ -861,7 +861,7 @@ 
                 $this->renderStockChart($groupCount, $dimensions);
                 break;
             default:
-                echo $chartType.' is not yet implemented<br />';
+                echo $chartType . ' is not yet implemented<br />';
                 return false;
         }
         $this->renderLegend();

src/PhpSpreadsheet/Calculation/Database.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,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;
@@ -89,7 +89,7 @@ 
             $testConditionCount = 0;
             foreach ($criteria as $row => $criterion) {
                 if ($criterion[$key] > '') {
-                    $testCondition[] = '[:'.$criteriaName.']'.Functions::ifCondition($criterion[$key]);
+                    $testCondition[] = '[:' . $criteriaName . ']' . Functions::ifCondition($criterion[$key]);
                     $testConditionCount++;
                 }
             }
@@ -121,7 +121,7 @@ 
                 }
             }
             //    evaluate the criteria against the row data
-            $result = \PhpSpreadsheet\Calculation::getInstance()->_calculateFormulaValue('='.$testConditionList);
+            $result = \PhpSpreadsheet\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/LookupRef.php

Spacing +19 added lines, -19 removed lines

@@ -60,28 +60,28 @@ 
 
         if ($sheetText > '') {
             if (strpos($sheetText, ' ') !== false) {
-                $sheetText = "'".$sheetText."'";
+                $sheetText = "'" . $sheetText . "'";
             }
-            $sheetText .='!';
+            $sheetText .= '!';
         }
         if ((!is_bool($referenceStyle)) || $referenceStyle) {
             $rowRelative = $columnRelative = '$';
-            $column = \PhpSpreadsheet\Cell::stringFromColumnIndex($column-1);
+            $column = \PhpSpreadsheet\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;
         }
     }
 
@@ -259,7 +259,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) == '')) {
@@ -297,7 +297,7 @@ 
      */
     public static function INDIRECT($cellAddress = null, \PhpSpreadsheet\Cell $pCell = null)
     {
-        $cellAddress    = Functions::flattenSingleValue($cellAddress);
+        $cellAddress = Functions::flattenSingleValue($cellAddress);
         if (is_null($cellAddress) || $cellAddress === '') {
             return Functions::REF();
         }
@@ -308,9 +308,9 @@ 
             list($cellAddress1, $cellAddress2) = explode(':', $cellAddress);
         }
 
-        if ((!preg_match('/^'.\PhpSpreadsheet\Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress1, $matches)) ||
-            ((!is_null($cellAddress2)) && (!preg_match('/^'.\PhpSpreadsheet\Calculation::CALCULATION_REGEXP_CELLREF.'$/i', $cellAddress2, $matches)))) {
-            if (!preg_match('/^'.\PhpSpreadsheet\Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $cellAddress1, $matches)) {
+        if ((!preg_match('/^' . \PhpSpreadsheet\Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress1, $matches)) ||
+            ((!is_null($cellAddress2)) && (!preg_match('/^' . \PhpSpreadsheet\Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress2, $matches)))) {
+            if (!preg_match('/^' . \PhpSpreadsheet\Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $cellAddress1, $matches)) {
                 return Functions::REF();
             }
 
@@ -417,9 +417,9 @@ 
         }
         $endCellColumn = \PhpSpreadsheet\Cell::stringFromColumnIndex($endCellColumn);
 
-        $cellAddress = $startCellColumn.$startCellRow;
+        $cellAddress = $startCellColumn . $startCellRow;
         if (($startCellColumn != $endCellColumn) || ($startCellRow != $endCellRow)) {
-            $cellAddress .= ':'.$endCellColumn.$endCellRow;
+            $cellAddress .= ':' . $endCellColumn . $endCellRow;
         }
 
         if ($sheetName !== null) {
@@ -494,7 +494,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);
 
@@ -526,7 +526,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);
             }
         }
 
@@ -554,7 +554,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);
@@ -564,7 +564,7 @@ 
                     break;
                 } else {
                     // the previous cell was the match
-                    return $keySet[$i-1]+1;
+                    return $keySet[$i - 1] + 1;
                 }
             }
         }
@@ -752,7 +752,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/DateTime.php

Spacing +44 added lines, -44 removed lines

@@ -126,10 +126,10 @@ 
 
         $adjustmentMonthsString = (string) $adjustmentMonths;
         if ($adjustmentMonths > 0) {
-            $adjustmentMonthsString = '+'.$adjustmentMonths;
+            $adjustmentMonthsString = '+' . $adjustmentMonths;
         }
         if ($adjustmentMonths != 0) {
-            $PHPDateObject->modify($adjustmentMonthsString.' months');
+            $PHPDateObject->modify($adjustmentMonthsString . ' months');
         }
         $nMonth = (int) $PHPDateObject->format('m');
         $nYear = (int) $PHPDateObject->format('Y');
@@ -137,7 +137,7 @@ 
         $monthDiff = ($nMonth - $oMonth) + (($nYear - $oYear) * 12);
         if ($monthDiff != $adjustmentMonths) {
             $adjustDays = (int) $PHPDateObject->format('d');
-            $adjustDaysString = '-'.$adjustDays.' days';
+            $adjustDaysString = '-' . $adjustDays . ' days';
             $PHPDateObject->modify($adjustDaysString);
         }
         return $PHPDateObject;
@@ -299,20 +299,20 @@ 
             (!is_numeric($day))) {
             return Functions::VALUE();
         }
-        $year    = (integer) $year;
+        $year = (integer) $year;
         $month    = (integer) $month;
-        $day    = (integer) $day;
+        $day = (integer) $day;
 
         $baseYear = \PhpSpreadsheet\Shared\Date::getExcelCalendar();
         // Validate parameters
-        if ($year < ($baseYear-1900)) {
+        if ($year < ($baseYear - 1900)) {
             return Functions::NAN();
         }
-        if ((($baseYear-1900) != 0) && ($year < $baseYear) && ($year >= 1900)) {
+        if ((($baseYear - 1900) != 0) && ($year < $baseYear) && ($year >= 1900)) {
             return Functions::NAN();
         }
 
-        if (($year < $baseYear) && ($year >= ($baseYear-1900))) {
+        if (($year < $baseYear) && ($year >= ($baseYear - 1900))) {
             $year += 1900;
         }
 
@@ -432,7 +432,7 @@ 
                 }
                 return (float) \PhpSpreadsheet\Shared\Date::formattedPHPToExcel($calendar, 1, $date, $hour, $minute, $second);
             case Functions::RETURNDATE_PHP_NUMERIC:
-                return (integer) \PhpSpreadsheet\Shared\Date::excelToTimestamp(\PhpSpreadsheet\Shared\Date::formattedPHPToExcel(1970, 1, 1, $hour, $minute, $second));    // -2147468400; //    -2147472000 + 3600
+                return (integer) \PhpSpreadsheet\Shared\Date::excelToTimestamp(\PhpSpreadsheet\Shared\Date::formattedPHPToExcel(1970, 1, 1, $hour, $minute, $second)); // -2147468400; //    -2147472000 + 3600
             case Functions::RETURNDATE_PHP_OBJECT:
                 $dayAdjust = 0;
                 if ($hour < 0) {
@@ -445,9 +445,9 @@ 
                     $dayAdjust = floor($hour / 24);
                     $hour = $hour % 24;
                 }
-                $phpDateObject = new \DateTime('1900-01-01 '.$hour.':'.$minute.':'.$second);
+                $phpDateObject = new \DateTime('1900-01-01 ' . $hour . ':' . $minute . ':' . $second);
                 if ($dayAdjust != 0) {
-                    $phpDateObject->modify($dayAdjust.' days');
+                    $phpDateObject->modify($dayAdjust . ' days');
                 }
                 return $phpDateObject;
         }
@@ -482,12 +482,12 @@ 
      */
     public static function DATEVALUE($dateValue = 1)
     {
-        $dateValueOrig= $dateValue;
+        $dateValueOrig = $dateValue;
         $dateValue = trim(Functions::flattenSingleValue($dateValue), '"');
         //    Strip any ordinals because they're allowed in Excel (English only)
         $dateValue = preg_replace('/(\d)(st|nd|rd|th)([ -\/])/Ui', '$1$3', $dateValue);
         //    Convert separators (/ . or space) to hyphens (should also handle dot used for ordinals in some countries, e.g. Denmark, Germany)
-        $dateValue    = str_replace(array('/', '.', '-', '  '), array(' ', ' ', ' ', ' '), $dateValue);
+        $dateValue = str_replace(array('/', '.', '-', '  '), array(' ', ' ', ' ', ' '), $dateValue);
 
         $yearFound = false;
         $t1 = explode(' ', $dateValue);
@@ -541,9 +541,9 @@ 
             if ($testVal1 < 31 && $testVal2 < 12 && $testVal3 < 12 && strlen($testVal3) == 2) {
                 $testVal3 += 2000;
             }
-            $PHPDateArray = date_parse($testVal1.'-'.$testVal2.'-'.$testVal3);
+            $PHPDateArray = date_parse($testVal1 . '-' . $testVal2 . '-' . $testVal3);
             if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
-                $PHPDateArray = date_parse($testVal2.'-'.$testVal1.'-'.$testVal3);
+                $PHPDateArray = date_parse($testVal2 . '-' . $testVal1 . '-' . $testVal3);
                 if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
                     return Functions::VALUE();
                 }
@@ -583,7 +583,7 @@ 
                 case Functions::RETURNDATE_PHP_NUMERIC:
                     return (integer) \PhpSpreadsheet\Shared\Date::excelToTimestamp($excelDateValue);
                 case Functions::RETURNDATE_PHP_OBJECT:
-                    return new \DateTime($PHPDateArray['year'].'-'.$PHPDateArray['month'].'-'.$PHPDateArray['day'].' 00:00:00');
+                    return new \DateTime($PHPDateArray['year'] . '-' . $PHPDateArray['month'] . '-' . $PHPDateArray['day'] . ' 00:00:00');
             }
         }
         return Functions::VALUE();
@@ -618,7 +618,7 @@ 
         $timeValue = str_replace(array('/', '.'), array('-', '-'), $timeValue);
 
         $arraySplit = preg_split('/[\/:\-\s]/', $timeValue);
-        if ((count($arraySplit) == 2 ||count($arraySplit) == 3) && $arraySplit[0] > 24) {
+        if ((count($arraySplit) == 2 || count($arraySplit) == 3) && $arraySplit[0] > 24) {
             $arraySplit[0] = ($arraySplit[0] % 24);
             $timeValue = implode(':', $arraySplit);
         }
@@ -642,9 +642,9 @@ 
                 case Functions::RETURNDATE_EXCEL:
                     return (float) $excelDateValue;
                 case Functions::RETURNDATE_PHP_NUMERIC:
-                    return (integer) $phpDateValue = \PhpSpreadsheet\Shared\Date::excelToTimestamp($excelDateValue+25569) - 3600;
+                    return (integer) $phpDateValue = \PhpSpreadsheet\Shared\Date::excelToTimestamp($excelDateValue + 25569) - 3600;
                 case Functions::RETURNDATE_PHP_OBJECT:
-                    return new \DateTime('1900-01-01 '.$PHPDateArray['hour'].':'.$PHPDateArray['minute'].':'.$PHPDateArray['second']);
+                    return new \DateTime('1900-01-01 ' . $PHPDateArray['hour'] . ':' . $PHPDateArray['minute'] . ':' . $PHPDateArray['second']);
             }
         }
         return Functions::VALUE();
@@ -719,7 +719,7 @@ 
             case 'MD':
                 if ($endDays < $startDays) {
                     $retVal = $endDays;
-                    $PHPEndDateObject->modify('-'.$endDays.' days');
+                    $PHPEndDateObject->modify('-' . $endDays . ' days');
                     $adjustDays = $PHPEndDateObject->format('j');
                     $retVal += ($adjustDays - $startDays);
                 } else {
@@ -787,8 +787,8 @@ 
      */
     public static function DAYS360($startDate = 0, $endDate = 0, $method = false)
     {
-        $startDate    = Functions::flattenSingleValue($startDate);
-        $endDate    = Functions::flattenSingleValue($endDate);
+        $startDate = Functions::flattenSingleValue($startDate);
+        $endDate = Functions::flattenSingleValue($endDate);
 
         if (is_string($startDate = self::getDateValue($startDate))) {
             return Functions::VALUE();
@@ -843,9 +843,9 @@ 
      */
     public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0)
     {
-        $startDate    = Functions::flattenSingleValue($startDate);
-        $endDate    = Functions::flattenSingleValue($endDate);
-        $method        = Functions::flattenSingleValue($method);
+        $startDate = Functions::flattenSingleValue($startDate);
+        $endDate = Functions::flattenSingleValue($endDate);
+        $method = Functions::flattenSingleValue($method);
 
         if (is_string($startDate = self::getDateValue($startDate))) {
             return Functions::VALUE();
@@ -940,8 +940,8 @@ 
     public static function NETWORKDAYS($startDate, $endDate)
     {
         //    Retrieve the mandatory start and end date that are referenced in the function definition
-        $startDate    = Functions::flattenSingleValue($startDate);
-        $endDate    = Functions::flattenSingleValue($endDate);
+        $startDate = Functions::flattenSingleValue($startDate);
+        $endDate = Functions::flattenSingleValue($endDate);
         //    Flush the mandatory start and end date that are referenced in the function definition, and get the optional days
         $dateArgs = Functions::flattenArray(func_get_args());
         array_shift($dateArgs);
@@ -1027,8 +1027,8 @@ 
     public static function WORKDAY($startDate, $endDays)
     {
         //    Retrieve the mandatory start date and days that are referenced in the function definition
-        $startDate    = Functions::flattenSingleValue($startDate);
-        $endDays    = Functions::flattenSingleValue($endDays);
+        $startDate = Functions::flattenSingleValue($startDate);
+        $endDays = Functions::flattenSingleValue($endDays);
         //    Flush the mandatory start date and days that are referenced in the function definition, and get the optional days
         $dateArgs = Functions::flattenArray(func_get_args());
         array_shift($dateArgs);
@@ -1050,7 +1050,7 @@ 
 
         $startDoW = self::DAYOFWEEK($startDate, 3);
         if (self::DAYOFWEEK($startDate, 3) >= 5) {
-            $startDate += ($decrementing) ? -$startDoW + 4: 7 - $startDoW;
+            $startDate += ($decrementing) ? -$startDoW + 4 : 7 - $startDoW;
             ($decrementing) ? $endDays++ : $endDays--;
         }
 
@@ -1060,7 +1060,7 @@ 
         //    Adjust the calculated end date if it falls over a weekend
         $endDoW = self::DAYOFWEEK($endDate, 3);
         if ($endDoW >= 5) {
-            $endDate += ($decrementing) ? -$endDoW + 4: 7 - $endDoW;
+            $endDate += ($decrementing) ? -$endDoW + 4 : 7 - $endDoW;
         }
 
         //    Test any extra holiday parameters
@@ -1131,7 +1131,7 @@ 
      */
     public static function DAYOFMONTH($dateValue = 1)
     {
-        $dateValue    = Functions::flattenSingleValue($dateValue);
+        $dateValue = Functions::flattenSingleValue($dateValue);
 
         if ($dateValue === null) {
             $dateValue = 1;
@@ -1245,8 +1245,8 @@ 
      */
     public static function WEEKOFYEAR($dateValue = 1, $method = 1)
     {
-        $dateValue    = Functions::flattenSingleValue($dateValue);
-        $method        = Functions::flattenSingleValue($method);
+        $dateValue = Functions::flattenSingleValue($dateValue);
+        $method = Functions::flattenSingleValue($method);
 
         if (!is_numeric($method)) {
             return Functions::VALUE();
@@ -1291,7 +1291,7 @@ 
      */
     public static function MONTHOFYEAR($dateValue = 1)
     {
-        $dateValue    = Functions::flattenSingleValue($dateValue);
+        $dateValue = Functions::flattenSingleValue($dateValue);
 
         if (empty($dateValue)) {
             $dateValue = 1;
@@ -1324,7 +1324,7 @@ 
      */
     public static function YEAR($dateValue = 1)
     {
-        $dateValue    = Functions::flattenSingleValue($dateValue);
+        $dateValue = Functions::flattenSingleValue($dateValue);
 
         if ($dateValue === null) {
             $dateValue = 1;
@@ -1356,7 +1356,7 @@ 
      */
     public static function HOUROFDAY($timeValue = 0)
     {
-        $timeValue    = Functions::flattenSingleValue($timeValue);
+        $timeValue = Functions::flattenSingleValue($timeValue);
 
         if (!is_numeric($timeValue)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
@@ -1397,7 +1397,7 @@ 
      */
     public static function MINUTEOFHOUR($timeValue = 0)
     {
-        $timeValue = $timeTester    = Functions::flattenSingleValue($timeValue);
+        $timeValue = $timeTester = Functions::flattenSingleValue($timeValue);
 
         if (!is_numeric($timeValue)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
@@ -1438,7 +1438,7 @@ 
      */
     public static function SECONDOFMINUTE($timeValue = 0)
     {
-        $timeValue    = Functions::flattenSingleValue($timeValue);
+        $timeValue = Functions::flattenSingleValue($timeValue);
 
         if (!is_numeric($timeValue)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) {
@@ -1485,8 +1485,8 @@ 
      */
     public static function EDATE($dateValue = 1, $adjustmentMonths = 0)
     {
-        $dateValue            = Functions::flattenSingleValue($dateValue);
-        $adjustmentMonths    = Functions::flattenSingleValue($adjustmentMonths);
+        $dateValue = Functions::flattenSingleValue($dateValue);
+        $adjustmentMonths = Functions::flattenSingleValue($adjustmentMonths);
 
         if (!is_numeric($adjustmentMonths)) {
             return Functions::VALUE();
@@ -1531,8 +1531,8 @@ 
      */
     public static function EOMONTH($dateValue = 1, $adjustmentMonths = 0)
     {
-        $dateValue            = Functions::flattenSingleValue($dateValue);
-        $adjustmentMonths    = Functions::flattenSingleValue($adjustmentMonths);
+        $dateValue = Functions::flattenSingleValue($dateValue);
+        $adjustmentMonths = Functions::flattenSingleValue($adjustmentMonths);
 
         if (!is_numeric($adjustmentMonths)) {
             return Functions::VALUE();
@@ -1544,7 +1544,7 @@ 
         }
 
         // Execute function
-        $PHPDateObject = self::adjustDateByMonths($dateValue, $adjustmentMonths+1);
+        $PHPDateObject = self::adjustDateByMonths($dateValue, $adjustmentMonths + 1);
         $adjustDays = (int) $PHPDateObject->format('d');
         $adjustDaysString = '-' . $adjustDays . ' days';
         $PHPDateObject->modify($adjustDaysString);