PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Cell.php

Spacing +10 added lines, -10 removed lines

@@ -291,7 +291,7 @@ 
 //echo 'Calculation Exception: '.$ex->getMessage().PHP_EOL;
                 $result = '#N/A';
                 throw new Calculation\Exception(
-                    $this->getWorksheet()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage()
+                    $this->getWorksheet()->getTitle() . '!' . $this->getCoordinate() . ' -> ' . $ex->getMessage()
                 );
             }
 
@@ -586,14 +586,14 @@ 
     public static function coordinateFromString($pCoordinateString = 'A1')
     {
         if (preg_match("/^([$]?[A-Z]{1,3})([$]?\d{1,7})$/", $pCoordinateString, $matches)) {
-            return array($matches[1],$matches[2]);
+            return array($matches[1], $matches[2]);
         } elseif ((strpos($pCoordinateString, ':') !== false) || (strpos($pCoordinateString, ',') !== false)) {
             throw new Exception('Cell coordinate string can not be a range of cells');
         } elseif ($pCoordinateString == '') {
             throw new Exception('Cell coordinate can not be zero-length string');
         }
 
-        throw new Exception('Invalid cell coordinate '.$pCoordinateString);
+        throw new Exception('Invalid cell coordinate ' . $pCoordinateString);
     }
 
     /**
@@ -733,11 +733,11 @@ 
 
         // Calculate range outer borders
         $rangeStart = self::coordinateFromString($rangeA);
-        $rangeEnd    = self::coordinateFromString($rangeB);
+        $rangeEnd = self::coordinateFromString($rangeB);
 
         // Translate column into index
-        $rangeStart[0]    = self::columnIndexFromString($rangeStart[0]);
-        $rangeEnd[0]    = self::columnIndexFromString($rangeEnd[0]);
+        $rangeStart[0] = self::columnIndexFromString($rangeStart[0]);
+        $rangeEnd[0] = self::columnIndexFromString($rangeEnd[0]);
 
         return array($rangeStart, $rangeEnd);
     }
@@ -753,7 +753,7 @@ 
         // Calculate range outer borders
         list($rangeStart, $rangeEnd) = self::rangeBoundaries($pRange);
 
-        return array( ($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1) );
+        return array(($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1));
     }
 
     /**
@@ -780,7 +780,7 @@ 
             list($rangeA, $rangeB) = explode(':', $pRange);
         }
 
-        return array( self::coordinateFromString($rangeA), self::coordinateFromString($rangeB));
+        return array(self::coordinateFromString($rangeA), self::coordinateFromString($rangeB));
     }
 
     /**
@@ -885,7 +885,7 @@ 
                 }
 
                 // Range...
-                list($rangeStart, $rangeEnd)    = $range;
+                list($rangeStart, $rangeEnd) = $range;
                 sscanf($rangeStart, '%[A-Z]%d', $startCol, $startRow);
                 sscanf($rangeEnd, '%[A-Z]%d', $endCol, $endRow);
                 ++$endCol;
@@ -897,7 +897,7 @@ 
                 // Loop cells
                 while ($currentCol != $endCol) {
                     while ($currentRow <= $endRow) {
-                        $returnValue[] = $currentCol.$currentRow;
+                        $returnValue[] = $currentCol . $currentRow;
                         ++$currentRow;
                     }
                     ++$currentCol;

src/PhpSpreadsheet/Chart/Renderer/JpGraph.php

Spacing +30 added lines, -30 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace PHPExcel\Chart\Renderer;
 
-require_once(\PHPExcel\Settings::getChartRendererPath().'/jpgraph.php');
+require_once(\PHPExcel\Settings::getChartRendererPath() . '/jpgraph.php');
 
 /**
  * PHPExcel_Chart_Renderer_jpgraph
@@ -31,15 +31,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'
     ];
 
@@ -188,21 +188,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;
             }
@@ -565,7 +565,7 @@ 
 
     private function renderAreaChart($groupCount, $dimensions = '2d')
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_line.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_line.php');
 
         $this->renderCartesianPlotArea();
 
@@ -577,7 +577,7 @@ 
 
     private function renderLineChart($groupCount, $dimensions = '2d')
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_line.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_line.php');
 
         $this->renderCartesianPlotArea();
 
@@ -589,7 +589,7 @@ 
 
     private function renderBarChart($groupCount, $dimensions = '2d')
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_bar.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_bar.php');
 
         $this->renderCartesianPlotArea();
 
@@ -601,9 +601,9 @@ 
 
     private function renderScatterChart($groupCount)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_scatter.php');
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_regstat.php');
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_line.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_scatter.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_regstat.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_line.php');
 
         $this->renderCartesianPlotArea('linlin');
 
@@ -615,7 +615,7 @@ 
 
     private function renderBubbleChart($groupCount)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_scatter.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_scatter.php');
 
         $this->renderCartesianPlotArea('linlin');
 
@@ -627,9 +627,9 @@ 
 
     private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_pie.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_pie.php');
         if ($dimensions == '3d') {
-            require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_pie3d.php');
+            require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_pie3d.php');
         }
 
         $this->renderPiePlotArea($doughnut);
@@ -675,7 +675,7 @@ 
                 }
 
                 if ($multiplePlots) {
-                    $seriesPlot->SetSize(($jLimit-$j) / ($jLimit * 4));
+                    $seriesPlot->SetSize(($jLimit - $j) / ($jLimit * 4));
                 }
 
                 if ($doughnut) {
@@ -704,7 +704,7 @@ 
 
     private function renderRadarChart($groupCount)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_radar.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_radar.php');
 
         $this->renderRadarPlotArea();
 
@@ -716,7 +716,7 @@ 
 
     private function renderStockChart($groupCount)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_stock.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_stock.php');
 
         $this->renderCartesianPlotArea('intint');
 
@@ -728,7 +728,7 @@ 
 
     private function renderContourChart($groupCount, $dimensions)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_contour.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_contour.php');
 
         $this->renderCartesianPlotArea('intint');
 
@@ -740,11 +740,11 @@ 
 
     private function renderCombinationChart($groupCount, $dimensions, $outputDestination)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_line.php');
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_bar.php');
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_scatter.php');
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_regstat.php');
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_line.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_line.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_bar.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_scatter.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_regstat.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_line.php');
 
         $this->renderCartesianPlotArea();
 
@@ -864,7 +864,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/Chart/DataSeries.php

Spacing +2 added lines, -2 removed lines

@@ -38,14 +38,14 @@
     const TYPE_PIECHART        = 'pieChart';
     const TYPE_PIECHART_3D     = 'pie3DChart';
     const TYPE_DOUGHTNUTCHART  = 'doughnutChart';
-    const TYPE_DONUTCHART      = self::TYPE_DOUGHTNUTCHART;    //    Synonym
+    const TYPE_DONUTCHART      = self::TYPE_DOUGHTNUTCHART; //    Synonym
     const TYPE_SCATTERCHART    = 'scatterChart';
     const TYPE_SURFACECHART    = 'surfaceChart';
     const TYPE_SURFACECHART_3D = 'surface3DChart';
     const TYPE_RADARCHART      = 'radarChart';
     const TYPE_BUBBLECHART     = 'bubbleChart';
     const TYPE_STOCKCHART      = 'stockChart';
-    const TYPE_CANDLECHART     = self::TYPE_STOCKCHART;       //    Synonym
+    const TYPE_CANDLECHART     = self::TYPE_STOCKCHART; //    Synonym
 
     const GROUPING_CLUSTERED       = 'clustered';
     const GROUPING_STACKED         = 'stacked';

src/PhpSpreadsheet/Chart/Legend.php

Spacing +6 added lines, -6 removed lines

@@ -30,12 +30,12 @@
 class Legend
 {
     /** Legend positions */
-    const XL_LEGEND_POSITION_BOTTOM = -4107;    //    Below the chart.
-    const XL_LEGEND_POSITION_CORNER = 2;        //    In the upper right-hand corner of the chart border.
-    const XL_LEGEND_POSITION_CUSTOM = -4161;    //    A custom position.
-    const XL_LEGEND_POSITION_LEFT   = -4131;    //    Left of the chart.
-    const XL_LEGEND_POSITION_RIGHT  = -4152;    //    Right of the chart.
-    const XL_LEGEND_POSITION_TOP    = -4160;    //    Above the chart.
+    const XL_LEGEND_POSITION_BOTTOM = -4107; //    Below the chart.
+    const XL_LEGEND_POSITION_CORNER = 2; //    In the upper right-hand corner of the chart border.
+    const XL_LEGEND_POSITION_CUSTOM = -4161; //    A custom position.
+    const XL_LEGEND_POSITION_LEFT   = -4131; //    Left of the chart.
+    const XL_LEGEND_POSITION_RIGHT  = -4152; //    Right of the chart.
+    const XL_LEGEND_POSITION_TOP    = -4160; //    Above the chart.
 
     const POSITION_RIGHT    = 'r';
     const POSITION_LEFT     = 'l';

src/PhpSpreadsheet/Chart/DataSeriesValues.php

Spacing +1 added lines, -1 removed lines

@@ -293,7 +293,7 @@
             $calcEngine = \PHPExcel\Calculation::getInstance($worksheet->getParent());
             $newDataValues = \PHPExcel\Calculation::unwrapResult(
                 $calcEngine->_calculateFormulaValue(
-                    '='.$this->dataSource,
+                    '=' . $this->dataSource,
                     null,
                     $worksheet->getCell('A1')
                 )

src/PhpSpreadsheet/CachedObjectStorageFactory.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
             return false;
         }
 
-        $cacheStorageClass = '\\PHPExcel\\CachedObjectStorage\\'.$method;
+        $cacheStorageClass = '\\PHPExcel\\CachedObjectStorage\\' . $method;
         if (!call_user_func([$cacheStorageClass, 'cacheMethodIsAvailable'])) {
             return false;
         }

src/PhpSpreadsheet/Style.php

Spacing +1 added lines, -1 removed lines

@@ -618,7 +618,7 @@
             $this->numberFormat->getHashCode() .
             $hashConditionals .
             $this->protection->getHashCode() .
-            ($this->quotePrefix  ? 't' : 'f') .
+            ($this->quotePrefix ? 't' : 'f') .
             __CLASS__
         );
     }

src/PhpSpreadsheet/Spreadsheet.php

Spacing +4 added lines, -4 removed lines

@@ -289,16 +289,16 @@ 
             case 'names':
             case 'data':
                 if (is_array($this->ribbonBinObjects) && array_key_exists($What, $this->ribbonBinObjects)) {
-                    $ReturnData=$this->ribbonBinObjects[$What];
+                    $ReturnData = $this->ribbonBinObjects[$What];
                 }
                 break;
             case 'types':
                 if (is_array($this->ribbonBinObjects) &&
                     array_key_exists('data', $this->ribbonBinObjects) && is_array($this->ribbonBinObjects['data'])) {
-                    $tmpTypes=array_keys($this->ribbonBinObjects['data']);
+                    $tmpTypes = array_keys($this->ribbonBinObjects['data']);
                     $ReturnData = array_unique(array_map(array($this, 'getExtensionOnly'), $tmpTypes));
                 } else {
-                    $ReturnData=array(); // the caller want an array... not null if empty
+                    $ReturnData = array(); // the caller want an array... not null if empty
                 }
                 break;
         }
@@ -787,7 +787,7 @@ 
             $this->namedRanges[$namedRange->getName()] = $namedRange;
         } else {
             // local scope
-            $this->namedRanges[$namedRange->getScope()->getTitle().'!'.$namedRange->getName()] = $namedRange;
+            $this->namedRanges[$namedRange->getScope()->getTitle() . '!' . $namedRange->getName()] = $namedRange;
         }
         return true;
     }

src/PhpSpreadsheet/Style/NumberFormat.php

Spacing +13 added lines, -13 removed lines

@@ -95,7 +95,7 @@ 
      *
      * @var string
      */
-    protected $builtInFormatCode    = 0;
+    protected $builtInFormatCode = 0;
 
     /**
      * Create a new NumberFormat
@@ -283,7 +283,7 @@ 
             self::$builtInFormats[11] = '0.00E+00';
             self::$builtInFormats[12] = '# ?/?';
             self::$builtInFormats[13] = '# ??/??';
-            self::$builtInFormats[14] = 'm/d/yyyy';                     // Despite ECMA 'mm-dd-yy';
+            self::$builtInFormats[14] = 'm/d/yyyy'; // Despite ECMA 'mm-dd-yy';
             self::$builtInFormats[15] = 'd-mmm-yy';
             self::$builtInFormats[16] = 'd-mmm';
             self::$builtInFormats[17] = 'mmm-yy';
@@ -291,17 +291,17 @@ 
             self::$builtInFormats[19] = 'h:mm:ss AM/PM';
             self::$builtInFormats[20] = 'h:mm';
             self::$builtInFormats[21] = 'h:mm:ss';
-            self::$builtInFormats[22] = 'm/d/yyyy h:mm';                // Despite ECMA 'm/d/yy h:mm';
+            self::$builtInFormats[22] = 'm/d/yyyy h:mm'; // Despite ECMA 'm/d/yy h:mm';
 
-            self::$builtInFormats[37] = '#,##0_);(#,##0)';              //  Despite ECMA '#,##0 ;(#,##0)';
-            self::$builtInFormats[38] = '#,##0_);[Red](#,##0)';         //  Despite ECMA '#,##0 ;[Red](#,##0)';
-            self::$builtInFormats[39] = '#,##0.00_);(#,##0.00)';        //  Despite ECMA '#,##0.00;(#,##0.00)';
-            self::$builtInFormats[40] = '#,##0.00_);[Red](#,##0.00)';   //  Despite ECMA '#,##0.00;[Red](#,##0.00)';
+            self::$builtInFormats[37] = '#,##0_);(#,##0)'; //  Despite ECMA '#,##0 ;(#,##0)';
+            self::$builtInFormats[38] = '#,##0_);[Red](#,##0)'; //  Despite ECMA '#,##0 ;[Red](#,##0)';
+            self::$builtInFormats[39] = '#,##0.00_);(#,##0.00)'; //  Despite ECMA '#,##0.00;(#,##0.00)';
+            self::$builtInFormats[40] = '#,##0.00_);[Red](#,##0.00)'; //  Despite ECMA '#,##0.00;[Red](#,##0.00)';
 
             self::$builtInFormats[44] = '_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)';
             self::$builtInFormats[45] = 'mm:ss';
             self::$builtInFormats[46] = '[h]:mm:ss';
-            self::$builtInFormats[47] = 'mm:ss.0';                      //  Despite ECMA 'mmss.0';
+            self::$builtInFormats[47] = 'mm:ss.0'; //  Despite ECMA 'mmss.0';
             self::$builtInFormats[48] = '##0.0E+0';
             self::$builtInFormats[49] = '@';
 
@@ -520,8 +520,8 @@ 
 
         $GCD = \PHPExcel\Calculation\MathTrig::GCD($decimalPart, $decimalDivisor);
 
-        $adjustedDecimalPart = $decimalPart/$GCD;
-        $adjustedDecimalDivisor = $decimalDivisor/$GCD;
+        $adjustedDecimalPart = $decimalPart / $GCD;
+        $adjustedDecimalDivisor = $decimalDivisor / $GCD;
 
         if ((strpos($format, '0') !== false) || (strpos($format, '#') !== false) || (substr($format, 0, 3) == '? ?')) {
             if ($integerPart == 0) {
@@ -617,13 +617,13 @@ 
                 break;
             case 3:
                 $format = ($value > 0) ?
-                    $sections[0] : ( ($value < 0) ?
+                    $sections[0] : (($value < 0) ?
                         $sections[1] : $sections[2]);
                 $value = abs($value); // Use the absolute value
                 break;
             case 4:
                 $format = ($value > 0) ?
-                    $sections[0] : ( ($value < 0) ?
+                    $sections[0] : (($value < 0) ?
                         $sections[1] : $sections[2]);
                 $value = abs($value); // Use the absolute value
                 break;
@@ -684,7 +684,7 @@ 
 
                 if (preg_match('/#?.*\?\/\?/', $format, $m)) {
                     //echo 'Format mask is fractional '.$format.' <br />';
-                    if ($value != (int)$value) {
+                    if ($value != (int) $value) {
                         self::formatAsFraction($value, $format);
                     }
                 } else {