PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Chart/Renderer/JpGraph.php

Doc Comments +62 added lines

@@ -60,6 +60,9 @@ 
 
     private static $plotMark = 0;
 
+    /**
+     * @param string $markerID
+     */
     private function formatPointMarker($seriesPlot, $markerID)
     {
         $plotMarkKeys = array_keys(self::$markSet);
@@ -87,6 +90,9 @@ 
         return $seriesPlot;
     }
 
+    /**
+     * @param integer $labelCount
+     */
     private function formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '')
     {
         $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode();
@@ -116,6 +122,9 @@ 
         return $datasetLabels;
     }
 
+    /**
+     * @param integer $seriesCount
+     */
     private function percentageSumCalculation($groupID, $seriesCount)
     {
         //    Adjust our values to a percentage value across all series in the group
@@ -146,6 +155,9 @@ 
         return $dataValues;
     }
 
+    /**
+     * @param \PhpOffice\PhpSpreadsheet\Chart\Title $captionElement
+     */
     private function getCaption($captionElement)
     {
         //    Read any caption
@@ -253,6 +265,9 @@ 
         $this->renderTitle();
     }
 
+    /**
+     * @param integer $groupID
+     */
     private function renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d')
     {
         $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
@@ -316,6 +331,9 @@ 
         $this->graph->Add($groupPlot);
     }
 
+    /**
+     * @param integer $groupID
+     */
     private function renderPlotBar($groupID, $dimensions = '2d')
     {
         $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
@@ -400,6 +418,10 @@ 
         $this->graph->Add($groupPlot);
     }
 
+    /**
+     * @param integer $groupID
+     * @param boolean $bubble
+     */
     private function renderPlotScatter($groupID, $bubble)
     {
         $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
@@ -445,6 +467,9 @@ 
         }
     }
 
+    /**
+     * @param integer $groupID
+     */
     private function renderPlotRadar($groupID)
     {
         $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
@@ -483,6 +508,9 @@ 
         }
     }
 
+    /**
+     * @param integer $groupID
+     */
     private function renderPlotContour($groupID)
     {
         $contourStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
@@ -503,6 +531,9 @@ 
         $this->graph->Add($seriesPlot);
     }
 
+    /**
+     * @param integer $groupID
+     */
     private function renderPlotStock($groupID)
     {
         $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
@@ -542,6 +573,9 @@ 
         $this->graph->Add($seriesPlot);
     }
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderAreaChart($groupCount, $dimensions = '2d')
     {
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
@@ -553,6 +587,9 @@ 
         }
     }
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderLineChart($groupCount, $dimensions = '2d')
     {
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
@@ -564,6 +601,9 @@ 
         }
     }
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderBarChart($groupCount, $dimensions = '2d')
     {
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_bar.php';
@@ -575,6 +615,9 @@ 
         }
     }
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderScatterChart($groupCount)
     {
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php';
@@ -588,6 +631,9 @@ 
         }
     }
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderBubbleChart($groupCount)
     {
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php';
@@ -599,6 +645,9 @@ 
         }
     }
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false)
     {
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_pie.php';
@@ -675,6 +724,9 @@ 
         }
     }
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderRadarChart($groupCount)
     {
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_radar.php';
@@ -686,6 +738,9 @@ 
         }
     }
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderStockChart($groupCount)
     {
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_stock.php';
@@ -697,6 +752,10 @@ 
         }
     }
 
+    /**
+     * @param integer $groupCount
+     * @param string|null $dimensions
+     */
     private function renderContourChart($groupCount, $dimensions)
     {
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_contour.php';
@@ -708,6 +767,9 @@ 
         }
     }
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderCombinationChart($groupCount, $dimensions, $outputDestination)
     {
         require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';

Spacing +19 added lines, -19 removed lines

@@ -544,7 +544,7 @@ 
 
     private function renderAreaChart($groupCount, $dimensions = '2d')
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
 
         $this->renderCartesianPlotArea();
 
@@ -555,7 +555,7 @@ 
 
     private function renderLineChart($groupCount, $dimensions = '2d')
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
 
         $this->renderCartesianPlotArea();
 
@@ -566,7 +566,7 @@ 
 
     private function renderBarChart($groupCount, $dimensions = '2d')
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_bar.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_bar.php';
 
         $this->renderCartesianPlotArea();
 
@@ -577,9 +577,9 @@ 
 
     private function renderScatterChart($groupCount)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_scatter.php';
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_regstat.php';
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_regstat.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
 
         $this->renderCartesianPlotArea('linlin');
 
@@ -590,7 +590,7 @@ 
 
     private function renderBubbleChart($groupCount)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_scatter.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php';
 
         $this->renderCartesianPlotArea('linlin');
 
@@ -601,9 +601,9 @@ 
 
     private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_pie.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_pie.php';
         if ($dimensions == '3d') {
-            require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_pie3d.php';
+            require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_pie3d.php';
         }
 
         $this->renderPiePlotArea($doughnut);
@@ -677,7 +677,7 @@ 
 
     private function renderRadarChart($groupCount)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_radar.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_radar.php';
 
         $this->renderRadarPlotArea();
 
@@ -688,7 +688,7 @@ 
 
     private function renderStockChart($groupCount)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_stock.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_stock.php';
 
         $this->renderCartesianPlotArea('intint');
 
@@ -699,7 +699,7 @@ 
 
     private function renderContourChart($groupCount, $dimensions)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_contour.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_contour.php';
 
         $this->renderCartesianPlotArea('intint');
 
@@ -710,11 +710,11 @@ 
 
     private function renderCombinationChart($groupCount, $dimensions, $outputDestination)
     {
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php';
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_bar.php';
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_scatter.php';
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_regstat.php';
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'jpgraph_line.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_bar.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_scatter.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_regstat.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . 'jpgraph_line.php';
 
         $this->renderCartesianPlotArea();
 
@@ -836,7 +836,7 @@ 
                 $this->renderStockChart($groupCount, $dimensions);
                 break;
             default:
-                echo $chartType.' is not yet implemented<br />';
+                echo $chartType . ' is not yet implemented<br />';
 
                 return false;
         }
@@ -855,6 +855,6 @@ 
         $this->graph = null;
         $this->chart = $chart;
 
-        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath().'/jpgraph.php';
+        require_once \PhpOffice\PhpSpreadsheet\Settings::getChartRendererPath() . '/jpgraph.php';
     }
 }

src/PhpSpreadsheet/Reader/Xlsx/Chart.php

Doc Comments +3 added lines

@@ -204,6 +204,9 @@
         return $chart;
     }
 
+    /**
+     * @param string $type
+     */
     private static function chartTitle($titleDetails, $namespacesChartMeta, $type)
     {
         $caption = [];

src/PhpSpreadsheet/Writer/Xlsx/Chart.php

Doc Comments +6 added lines

@@ -412,6 +412,8 @@ 
      * @param  string $id1
      * @param  string $id2
      * @param  bool $isMultiLevelSeries
+     * @param null|Axis $xAxis
+     * @param null|Axis $yAxis
      *
      * @throws  \PhpSpreadsheet\Writer\Exception
      */
@@ -534,6 +536,10 @@ 
      * @param  string $id1
      * @param  string $id2
      * @param  bool $isMultiLevelSeries
+     * @param null|Axis $xAxis
+     * @param null|Axis $yAxis
+     * @param null|GridLines $majorGridlines
+     * @param null|GridLines $minorGridlines
      *
      * @throws  \PhpSpreadsheet\Writer\Exception
      */

Spacing +5 added lines, -5 removed lines

@@ -246,7 +246,7 @@ 
         $catIsMultiLevelSeries = $valIsMultiLevelSeries = false;
         $plotGroupingType = '';
         foreach ($chartTypes as $chartType) {
-            $objWriter->startElement('c:'.$chartType);
+            $objWriter->startElement('c:' . $chartType);
 
             $groupCount = $plotArea->getPlotGroupCount();
             for ($i = 0; $i < $groupCount; ++$i) {
@@ -847,7 +847,7 @@ 
 
         if (!is_null($xAxis->getFillProperty('value'))) {
             $objWriter->startElement('a:solidFill');
-            $objWriter->startElement('a:'.$xAxis->getFillProperty('type'));
+            $objWriter->startElement('a:' . $xAxis->getFillProperty('type'));
             $objWriter->writeAttribute('val', $xAxis->getFillProperty('value'));
             $objWriter->startElement('a:alpha');
             $objWriter->writeAttribute('val', $xAxis->getFillProperty('alpha'));
@@ -864,7 +864,7 @@ 
 
         if (!is_null($xAxis->getLineProperty('value'))) {
             $objWriter->startElement('a:solidFill');
-            $objWriter->startElement('a:'.$xAxis->getLineProperty('type'));
+            $objWriter->startElement('a:' . $xAxis->getLineProperty('type'));
             $objWriter->writeAttribute('val', $xAxis->getLineProperty('value'));
             $objWriter->startElement('a:alpha');
             $objWriter->writeAttribute('val', $xAxis->getLineProperty('alpha'));
@@ -1304,13 +1304,13 @@ 
 
             $objWriter->endElement();
         } else {
-            $objWriter->startElement('c:'.$dataType.'Ref');
+            $objWriter->startElement('c:' . $dataType . 'Ref');
 
             $objWriter->startElement('c:f');
             $objWriter->writeRawData($plotSeriesValues->getDataSource());
             $objWriter->endElement();
 
-            $objWriter->startElement('c:'.$dataType.'Cache');
+            $objWriter->startElement('c:' . $dataType . 'Cache');
 
             if (($groupType != DataSeries::TYPE_PIECHART) && ($groupType != DataSeries::TYPE_PIECHART_3D) && ($groupType != DataSeries::TYPE_DONUTCHART)) {
                 if (($plotSeriesValues->getFormatCode() !== null) && ($plotSeriesValues->getFormatCode() !== '')) {

src/PhpSpreadsheet/Writer/Xlsx.php

Indentation +2 added lines, -2 removed lines

@@ -140,8 +140,8 @@
         }
 
         $hashTablesArray = ['stylesConditionalHashTable', 'fillHashTable', 'fontHashTable',
-                                  'bordersHashTable', 'numFmtHashTable', 'drawingHashTable',
-                                  'styleHashTable',
+                                    'bordersHashTable', 'numFmtHashTable', 'drawingHashTable',
+                                    'styleHashTable',
                                 ];
 
         // Set HashTable variables

Spacing +16 added lines, -16 removed lines

@@ -238,7 +238,7 @@ 
             // Try opening the ZIP file
             if ($objZip->open($pFilename, $zipOverWrite) !== true) {
                 if ($objZip->open($pFilename, $zipCreate) !== true) {
-                    throw new \PhpOffice\PhpSpreadsheet\Writer\WriteException('Could not open '.$pFilename.' for writing.');
+                    throw new \PhpOffice\PhpSpreadsheet\Writer\WriteException('Could not open ' . $pFilename . ' for writing.');
                 }
             }
 
@@ -264,13 +264,13 @@ 
                 $tmpRibbonTarget = $this->spreadSheet->getRibbonXMLData('target');
                 $objZip->addFromString($tmpRibbonTarget, $this->spreadSheet->getRibbonXMLData('data'));
                 if ($this->spreadSheet->hasRibbonBinObjects()) {
-                    $tmpRootPath = dirname($tmpRibbonTarget).'/';
+                    $tmpRootPath = dirname($tmpRibbonTarget) . '/';
                     $ribbonBinObjects = $this->spreadSheet->getRibbonBinObjects('data'); //the files to write
                     foreach ($ribbonBinObjects as $aPath => $aContent) {
-                        $objZip->addFromString($tmpRootPath.$aPath, $aContent);
+                        $objZip->addFromString($tmpRootPath . $aPath, $aContent);
                     }
                     //the rels for files
-                    $objZip->addFromString($tmpRootPath.'_rels/'.basename($tmpRibbonTarget).'.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet));
+                    $objZip->addFromString($tmpRootPath . '_rels/' . basename($tmpRibbonTarget) . '.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet));
                 }
             }
 
@@ -301,12 +301,12 @@ 
             $chartCount = 0;
             // Add worksheets
             for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
-                $objZip->addFromString('xl/worksheets/sheet'.($i + 1).'.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->spreadSheet->getSheet($i), $this->stringTable, $this->includeCharts));
+                $objZip->addFromString('xl/worksheets/sheet' . ($i + 1) . '.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->spreadSheet->getSheet($i), $this->stringTable, $this->includeCharts));
                 if ($this->includeCharts) {
                     $charts = $this->spreadSheet->getSheet($i)->getChartCollection();
                     if (count($charts) > 0) {
                         foreach ($charts as $chart) {
-                            $objZip->addFromString('xl/charts/chart'.($chartCount + 1).'.xml', $this->getWriterPart('Chart')->writeChart($chart, $this->preCalculateFormulas));
+                            $objZip->addFromString('xl/charts/chart' . ($chartCount + 1) . '.xml', $this->getWriterPart('Chart')->writeChart($chart, $this->preCalculateFormulas));
                             ++$chartCount;
                         }
                     }
@@ -317,7 +317,7 @@ 
             // Add worksheet relationships (drawings, ...)
             for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
                 // Add relationships
-                $objZip->addFromString('xl/worksheets/_rels/sheet'.($i + 1).'.xml.rels', $this->getWriterPart('Rels')->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts));
+                $objZip->addFromString('xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts));
 
                 $drawings = $this->spreadSheet->getSheet($i)->getDrawingCollection();
                 $drawingCount = count($drawings);
@@ -328,32 +328,32 @@ 
                 // Add drawing and image relationship parts
                 if (($drawingCount > 0) || ($chartCount > 0)) {
                     // Drawing relationships
-                    $objZip->addFromString('xl/drawings/_rels/drawing'.($i + 1).'.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->spreadSheet->getSheet($i), $chartRef1, $this->includeCharts));
+                    $objZip->addFromString('xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->spreadSheet->getSheet($i), $chartRef1, $this->includeCharts));
 
                     // Drawings
-                    $objZip->addFromString('xl/drawings/drawing'.($i + 1).'.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $chartRef2, $this->includeCharts));
+                    $objZip->addFromString('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $chartRef2, $this->includeCharts));
                 }
 
                 // Add comment relationship parts
                 if (count($this->spreadSheet->getSheet($i)->getComments()) > 0) {
                     // VML Comments
-                    $objZip->addFromString('xl/drawings/vmlDrawing'.($i + 1).'.vml', $this->getWriterPart('Comments')->writeVMLComments($this->spreadSheet->getSheet($i)));
+                    $objZip->addFromString('xl/drawings/vmlDrawing' . ($i + 1) . '.vml', $this->getWriterPart('Comments')->writeVMLComments($this->spreadSheet->getSheet($i)));
 
                     // Comments
-                    $objZip->addFromString('xl/comments'.($i + 1).'.xml', $this->getWriterPart('Comments')->writeComments($this->spreadSheet->getSheet($i)));
+                    $objZip->addFromString('xl/comments' . ($i + 1) . '.xml', $this->getWriterPart('Comments')->writeComments($this->spreadSheet->getSheet($i)));
                 }
 
                 // Add header/footer relationship parts
                 if (count($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages()) > 0) {
                     // VML Drawings
-                    $objZip->addFromString('xl/drawings/vmlDrawingHF'.($i + 1).'.vml', $this->getWriterPart('Drawing')->writeVMLHeaderFooterImages($this->spreadSheet->getSheet($i)));
+                    $objZip->addFromString('xl/drawings/vmlDrawingHF' . ($i + 1) . '.vml', $this->getWriterPart('Drawing')->writeVMLHeaderFooterImages($this->spreadSheet->getSheet($i)));
 
                     // VML Drawing relationships
-                    $objZip->addFromString('xl/drawings/_rels/vmlDrawingHF'.($i + 1).'.vml.rels', $this->getWriterPart('Rels')->writeHeaderFooterDrawingRelationships($this->spreadSheet->getSheet($i)));
+                    $objZip->addFromString('xl/drawings/_rels/vmlDrawingHF' . ($i + 1) . '.vml.rels', $this->getWriterPart('Rels')->writeHeaderFooterDrawingRelationships($this->spreadSheet->getSheet($i)));
 
                     // Media
                     foreach ($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages() as $image) {
-                        $objZip->addFromString('xl/media/'.$image->getIndexedFilename(), file_get_contents($image->getPath()));
+                        $objZip->addFromString('xl/media/' . $image->getIndexedFilename(), file_get_contents($image->getPath()));
                     }
                 }
             }
@@ -377,7 +377,7 @@ 
                         $imageContents = file_get_contents($imagePath);
                     }
 
-                    $objZip->addFromString('xl/media/'.str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
+                    $objZip->addFromString('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
                 } elseif ($this->getDrawingHashTable()->getByIndex($i) instanceof MemoryDrawing) {
                     ob_start();
                     call_user_func(
@@ -387,7 +387,7 @@ 
                     $imageContents = ob_get_contents();
                     ob_end_clean();
 
-                    $objZip->addFromString('xl/media/'.str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
+                    $objZip->addFromString('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
                 }
             }
 

src/PhpSpreadsheet/Reader/Xls.php

Doc Comments +5 added lines, -5 removed lines

@@ -5157,7 +5157,7 @@ 
      * is in one piece.
      * Moves to next current position in data stream to start of next record different from a CONtINUE record
      *
-     * @return array
+     * @return integer|null
      */
     private function getSplicedRecordData()
     {
@@ -5421,7 +5421,7 @@ 
      * @param string $formulaData Formula data
      * @param string $baseCell Base cell, only needed when formula contains tRefN tokens, e.g. with shared formulas
      * @throws Exception
-     * @return array
+     * @return string
      */
     private function getNextToken($formulaData, $baseCell = 'A1')
     {
@@ -6989,7 +6989,7 @@ 
      * section 2.5.15
      *
      * @param string $subData
-     * @return array
+     * @return string
      */
     private function readBIFF8CellRangeAddressList($subData)
     {
@@ -7100,7 +7100,7 @@ 
      * section 2.5.8
      *
      * @param string $arrayData
-     * @return array
+     * @return string
      */
     private static function readBIFF8ConstantArray($arrayData)
     {
@@ -7138,7 +7138,7 @@ 
      * returns e.g. array('value' => '5', 'size' => 9)
      *
      * @param string $valueData
-     * @return array
+     * @return string
      */
     private static function readBIFF8Constant($valueData)
     {

Spacing +47 added lines, -47 removed lines

@@ -424,7 +424,7 @@ 
     {
         // Check if file exists
         if (!file_exists($pFilename)) {
-            throw new Exception('Could not open '.$pFilename.' for reading! File does not exist.');
+            throw new Exception('Could not open ' . $pFilename . ' for reading! File does not exist.');
         }
 
         try {
@@ -451,7 +451,7 @@ 
     {
         // Check if file exists
         if (!file_exists($pFilename)) {
-            throw new Exception('Could not open '.$pFilename.' for reading! File does not exist.');
+            throw new Exception('Could not open ' . $pFilename . ' for reading! File does not exist.');
         }
 
         $worksheetNames = [];
@@ -508,7 +508,7 @@ 
     {
         // Check if file exists
         if (!file_exists($pFilename)) {
-            throw new Exception('Could not open '.$pFilename.' for reading! File does not exist.');
+            throw new Exception('Could not open ' . $pFilename . ' for reading! File does not exist.');
         }
 
         $worksheetInfo = [];
@@ -1085,7 +1085,7 @@ 
                     list($column, $row) = \PhpOffice\PhpSpreadsheet\Cell::coordinateFromString($cell);
                     if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($column, $row, $this->phpSheet->getTitle())) {
                         $formula = $this->getFormulaFromStructure($this->sharedFormulas[$baseCell], $cell);
-                        $this->phpSheet->getCell($cell)->setValueExplicit('='.$formula, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_FORMULA);
+                        $this->phpSheet->getCell($cell)->setValueExplicit('=' . $formula, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_FORMULA);
                     }
                 }
             }
@@ -1124,7 +1124,7 @@ 
                             $sheetName = trim($explodes[0], "'");
                             if (count($explodes) == 2) {
                                 if (strpos($explodes[1], ':') === false) {
-                                    $explodes[1] = $explodes[1].':'.$explodes[1];
+                                    $explodes[1] = $explodes[1] . ':' . $explodes[1];
                                 }
                                 $extractedRanges[] = str_replace('$', '', $explodes[1]); // C7:J66
                             }
@@ -1594,7 +1594,7 @@ 
                 //    Concatenate this extension with the currently set comment for the cell
                 $comment = $this->phpSheet->getComment($cellAddress);
                 $commentText = $comment->getText()->getPlainText();
-                $comment->setText($this->parseRichText($commentText.$noteText));
+                $comment->setText($this->parseRichText($commentText . $noteText));
             } else {
                 //    Set comment for the cell
                 $this->phpSheet->getComment($cellAddress)->setText($this->parseRichText($noteText));
@@ -1819,7 +1819,7 @@ 
         $salt = $key->RC4($salt_data);
         $hashedsalt = $key->RC4($hashedsalt_data);
 
-        $salt .= "\x80".str_repeat("\0", 47);
+        $salt .= "\x80" . str_repeat("\0", 47);
         $salt[56] = "\x80";
 
         $md5->reset();
@@ -2753,7 +2753,7 @@ 
 
             // offset: var; size: $flen; formula data
             $offset = 14 + $string['size'];
-            $formulaStructure = pack('v', $flen).substr($recordData, $offset);
+            $formulaStructure = pack('v', $flen) . substr($recordData, $offset);
 
             try {
                 $formula = $this->getFormulaFromStructure($formulaStructure);
@@ -2919,7 +2919,7 @@ 
                         // this fragment uncompressed
                         $newstr = '';
                         for ($j = 0; $j < strlen($retstr); ++$j) {
-                            $newstr .= $retstr[$j].chr(0);
+                            $newstr .= $retstr[$j] . chr(0);
                         }
                         $retstr = $newstr;
                         $len = min($charsLeft * 2, $limitpos - $pos);
@@ -3562,7 +3562,7 @@ 
             $rknum = self::getInt4d($recordData, 6);
             $numValue = self::getIEEE754($rknum);
 
-            $cell = $this->phpSheet->getCell($columnString.($row + 1));
+            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
             if (!$this->readDataOnly) {
                 // add style information
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
@@ -3639,13 +3639,13 @@ 
                     }
                 }
                 if ($this->readEmptyCells || trim($richText->getPlainText()) !== '') {
-                    $cell = $this->phpSheet->getCell($columnString.($row + 1));
+                    $cell = $this->phpSheet->getCell($columnString . ($row + 1));
                     $cell->setValueExplicit($richText, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);
                     $emptyCell = false;
                 }
             } else {
                 if ($this->readEmptyCells || trim($this->sst[$index]['value']) !== '') {
-                    $cell = $this->phpSheet->getCell($columnString.($row + 1));
+                    $cell = $this->phpSheet->getCell($columnString . ($row + 1));
                     $cell->setValueExplicit($this->sst[$index]['value'], \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);
                     $emptyCell = false;
                 }
@@ -3697,7 +3697,7 @@ 
 
                 // offset: var; size: 4; RK value
                 $numValue = self::getIEEE754(self::getInt4d($recordData, $offset + 2));
-                $cell = $this->phpSheet->getCell($columnString.($row + 1));
+                $cell = $this->phpSheet->getCell($columnString . ($row + 1));
                 if (!$this->readDataOnly) {
                     // add style
                     $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
@@ -3741,7 +3741,7 @@ 
 
             $numValue = self::extractNumber(substr($recordData, 6, 8));
 
-            $cell = $this->phpSheet->getCell($columnString.($row + 1));
+            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
             if (!$this->readDataOnly) {
                 // add cell style
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
@@ -3797,14 +3797,14 @@ 
             // get the base cell, grab tExp token
             $baseRow = self::getInt2d($formulaStructure, 3);
             $baseCol = self::getInt2d($formulaStructure, 5);
-            $this->_baseCell = \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($baseCol).($baseRow + 1);
+            $this->_baseCell = \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($baseCol) . ($baseRow + 1);
         }
 
         // Read cell?
         if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
             if ($isPartOfSharedFormula) {
                 // formula is added to this cell after the sheet has been read
-                $this->sharedFormulaParts[$columnString.($row + 1)] = $this->_baseCell;
+                $this->sharedFormulaParts[$columnString . ($row + 1)] = $this->_baseCell;
             }
 
             // offset: 16: size: 4; not used
@@ -3849,7 +3849,7 @@ 
                 $value = self::extractNumber(substr($recordData, 6, 8));
             }
 
-            $cell = $this->phpSheet->getCell($columnString.($row + 1));
+            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
             if (!$this->readDataOnly) {
                 // add cell style
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
@@ -3864,7 +3864,7 @@ 
                         throw new Exception('Not BIFF8. Can only read BIFF8 formulas');
                     }
                     $formula = $this->getFormulaFromStructure($formulaStructure); // get formula in human language
-                    $cell->setValueExplicit('='.$formula, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_FORMULA);
+                    $cell->setValueExplicit('=' . $formula, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_FORMULA);
                 } catch (\PhpOffice\PhpSpreadsheet\Exception $e) {
                     $cell->setValueExplicit($value, $dataType);
                 }
@@ -3970,7 +3970,7 @@ 
             // offset: 7; size: 1; 0=boolean; 1=error
             $isError = ord($recordData{7});
 
-            $cell = $this->phpSheet->getCell($columnString.($row + 1));
+            $cell = $this->phpSheet->getCell($columnString . ($row + 1));
             switch ($isError) {
                 case 0: // boolean
                     $value = (bool) $boolErr;
@@ -4024,7 +4024,7 @@ 
                 // Read cell?
                 if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
                     $xfIndex = self::getInt2d($recordData, 4 + 2 * $i);
-                    $this->phpSheet->getCell($columnString.($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                    $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
                 }
             }
         }
@@ -4072,7 +4072,7 @@ 
                 $value = $string['value'];
             }
             if ($this->readEmptyCells || trim($value) !== '') {
-                $cell = $this->phpSheet->getCell($columnString.($row + 1));
+                $cell = $this->phpSheet->getCell($columnString . ($row + 1));
                 $cell->setValueExplicit($value, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING);
 
                 if (!$this->readDataOnly) {
@@ -4108,7 +4108,7 @@ 
 
             // add style information
             if (!$this->readDataOnly && $this->readEmptyCells) {
-                $this->phpSheet->getCell($columnString.($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
             }
         }
     }
@@ -4316,7 +4316,7 @@ 
 
             if ($this->frozen) {
                 // frozen panes
-                $this->phpSheet->freezePane(\PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($px).($py + 1));
+                $this->phpSheet->freezePane(\PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($px) . ($py + 1));
             } else {
                 // unfrozen panes; split windows; not supported by PhpSpreadsheet core
             }
@@ -4740,7 +4740,7 @@ 
 
         // offset: var; size: $sz1; formula data for first condition (without size field)
         $formula1 = substr($recordData, $offset, $sz1);
-        $formula1 = pack('v', $sz1).$formula1; // prepend the length
+        $formula1 = pack('v', $sz1) . $formula1; // prepend the length
         try {
             $formula1 = $this->getFormulaFromStructure($formula1);
 
@@ -4762,7 +4762,7 @@ 
 
         // offset: var; size: $sz2; formula data for second condition (without size field)
         $formula2 = substr($recordData, $offset, $sz2);
-        $formula2 = pack('v', $sz2).$formula2; // prepend the length
+        $formula2 = pack('v', $sz2) . $formula2; // prepend the length
         try {
             $formula2 = $this->getFormulaFromStructure($formula2);
         } catch (\PhpOffice\PhpSpreadsheet\Exception $e) {
@@ -5304,7 +5304,7 @@ 
                             $ops[] = array_pop($formulaStrings);
                         }
                         $ops = array_reverse($ops);
-                        $formulaStrings[] = "$space1$space0{$token['data']['function']}(".implode(',', $ops).')';
+                        $formulaStrings[] = "$space1$space0{$token['data']['function']}(" . implode(',', $ops) . ')';
                         unset($space0, $space1);
                     } else {
                         // add-in function
@@ -5314,7 +5314,7 @@ 
                         }
                         $ops = array_reverse($ops);
                         $function = array_pop($formulaStrings);
-                        $formulaStrings[] = "$space1$space0$function(".implode(',', $ops).')';
+                        $formulaStrings[] = "$space1$space0$function(" . implode(',', $ops) . ')';
                         unset($space0, $space1);
                     }
                     break;
@@ -5325,7 +5325,7 @@ 
                     break;
                 case 'tArray': // array constant
                     $constantArray = self::readBIFF8ConstantArray($additionalData);
-                    $formulaStrings[] = $space1.$space0.$constantArray['value'];
+                    $formulaStrings[] = $space1 . $space0 . $constantArray['value'];
                     $additionalData = substr($additionalData, $constantArray['size']); // bite of chunk of additional data
                     unset($space0, $space1);
                     break;
@@ -6639,7 +6639,7 @@ 
                 break;
             // Unknown cases    // don't know how to deal with
             default:
-                throw new Exception('Unrecognized token '.sprintf('%02X', $id).' in formula');
+                throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
                 break;
         }
 
@@ -6670,14 +6670,14 @@ 
 
         // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
         if (!(0x4000 & self::getInt2d($cellAddressStructure, 2))) {
-            $column = '$'.$column;
+            $column = '$' . $column;
         }
         // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
         if (!(0x8000 & self::getInt2d($cellAddressStructure, 2))) {
-            $row = '$'.$row;
+            $row = '$' . $row;
         }
 
-        return $column.$row;
+        return $column . $row;
     }
 
     /**
@@ -6706,7 +6706,7 @@ 
         // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
         if (!(0x4000 & self::getInt2d($cellAddressStructure, 2))) {
             $column = \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($colIndex);
-            $column = '$'.$column;
+            $column = '$' . $column;
         } else {
             $colIndex = ($colIndex <= 127) ? $colIndex : $colIndex - 256;
             $column = \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($baseCol + $colIndex);
@@ -6714,13 +6714,13 @@ 
 
         // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
         if (!(0x8000 & self::getInt2d($cellAddressStructure, 2))) {
-            $row = '$'.$row;
+            $row = '$' . $row;
         } else {
             $rowIndex = ($rowIndex <= 32767) ? $rowIndex : $rowIndex - 65536;
             $row = $baseRow + $rowIndex;
         }
 
-        return $column.$row;
+        return $column . $row;
     }
 
     /**
@@ -6832,12 +6832,12 @@ 
 
         // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
         if (!(0x4000 & self::getInt2d($subData, 4))) {
-            $fc = '$'.$fc;
+            $fc = '$' . $fc;
         }
 
         // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
         if (!(0x8000 & self::getInt2d($subData, 4))) {
-            $fr = '$'.$fr;
+            $fr = '$' . $fr;
         }
 
         // offset: 6; size: 2; index to last column or column offset + relative flags
@@ -6847,12 +6847,12 @@ 
 
         // bit: 14; mask 0x4000; (1 = relative column index, 0 = absolute column index)
         if (!(0x4000 & self::getInt2d($subData, 6))) {
-            $lc = '$'.$lc;
+            $lc = '$' . $lc;
         }
 
         // bit: 15; mask 0x8000; (1 = relative row index, 0 = absolute row index)
         if (!(0x8000 & self::getInt2d($subData, 6))) {
-            $lr = '$'.$lr;
+            $lr = '$' . $lr;
         }
 
         return "$fc$fr:$lc$lr";
@@ -6891,7 +6891,7 @@ 
         if (!(0x4000 & self::getInt2d($subData, 4))) {
             // absolute column index
             $fc = \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($fcIndex);
-            $fc = '$'.$fc;
+            $fc = '$' . $fc;
         } else {
             // column offset
             $fcIndex = ($fcIndex <= 127) ? $fcIndex : $fcIndex - 256;
@@ -6902,7 +6902,7 @@ 
         if (!(0x8000 & self::getInt2d($subData, 4))) {
             // absolute row index
             $fr = $frIndex + 1;
-            $fr = '$'.$fr;
+            $fr = '$' . $fr;
         } else {
             // row offset
             $frIndex = ($frIndex <= 32767) ? $frIndex : $frIndex - 65536;
@@ -6920,7 +6920,7 @@ 
         if (!(0x4000 & self::getInt2d($subData, 6))) {
             // absolute column index
             $lc = \PhpOffice\PhpSpreadsheet\Cell::stringFromColumnIndex($lcIndex);
-            $lc = '$'.$lc;
+            $lc = '$' . $lc;
         } else {
             // column offset
             $lcIndex = ($lcIndex <= 127) ? $lcIndex : $lcIndex - 256;
@@ -6931,7 +6931,7 @@ 
         if (!(0x8000 & self::getInt2d($subData, 6))) {
             // absolute row index
             $lr = $lrIndex + 1;
-            $lr = '$'.$lr;
+            $lr = '$' . $lr;
         } else {
             // row offset
             $lrIndex = ($lrIndex <= 32767) ? $lrIndex : $lrIndex - 65536;
@@ -7086,7 +7086,7 @@ 
             }
             $matrixChunks[] = implode(',', $items); // looks like e.g. '1,"hello"'
         }
-        $matrix = '{'.implode(';', $matrixChunks).'}';
+        $matrix = '{' . implode(';', $matrixChunks) . '}';
 
         return [
             'value' => $matrix,
@@ -7121,7 +7121,7 @@ 
             case 0x02: // string value
                 // offset: 1; size: var; Unicode string, 16-bit string length
                 $string = self::readUnicodeStringLong(substr($valueData, 1));
-                $value = '"'.$string['value'].'"';
+                $value = '"' . $string['value'] . '"';
                 $size = 1 + $string['size'];
                 break;
             case 0x04: // boolean
@@ -7309,7 +7309,7 @@ 
      */
     private static function UTF8toExcelDoubleQuoted($value)
     {
-        return '"'.str_replace('"', '""', $value).'"';
+        return '"' . str_replace('"', '""', $value) . '"';
     }
 
     /**
@@ -7400,7 +7400,7 @@ 
         $uncompressedString = '';
         $strLen = strlen($string);
         for ($i = 0; $i < $strLen; ++$i) {
-            $uncompressedString .= $string[$i]."\0";
+            $uncompressedString .= $string[$i] . "\0";
         }
 
         return $uncompressedString;

src/PhpSpreadsheet/Reader/Xls/MD5.php

Doc Comments +5 added lines

@@ -190,6 +190,11 @@
         return ($Y ^ ($X | (~ $Z))) ; // Y XOR (X OR NOT Z)
     }
 
+    /**
+     * @param string[] $func
+     * @param integer $s
+     * @param integer $t
+     */
     private static function step($func, &$A, $B, $C, $D, $M, $s, $t)
     {
         $A = ($A + call_user_func($func, $B, $C, $D) + $M + $t) & 0xffffffff;

Spacing +1 added lines, -1 removed lines

@@ -200,6 +200,6 @@
     {
         $binary = str_pad(decbin($decimal), 32, '0', STR_PAD_LEFT);
 
-        return bindec(substr($binary, $bits).substr($binary, 0, $bits));
+        return bindec(substr($binary, $bits) . substr($binary, 0, $bits));
     }
 }

src/PhpSpreadsheet/Reader/HTML.php

Doc Comments +13 added lines

@@ -168,16 +168,25 @@ 
         return fread($this->fileHandle, $blockSize);
     }
 
+    /**
+     * @param string $data
+     */
     private static function startsWithTag($data)
     {
         return '<' === substr(trim($data), 0, 1);
     }
 
+    /**
+     * @param string $data
+     */
     private static function endsWithTag($data)
     {
         return '>' === substr(trim($data), -1, 1);
     }
 
+    /**
+     * @param string $data
+     */
     private static function containsTags($data)
     {
         return strlen($data) !== strlen(strip_tags($data));
@@ -249,6 +258,10 @@ 
         return array_pop($this->nestedColumn);
     }
 
+    /**
+     * @param \PhpOffice\PhpSpreadsheet\Worksheet $sheet
+     * @param integer $row
+     */
     protected function flushCell($sheet, $column, $row, &$cellContent)
     {
         if (is_string($cellContent)) {

Spacing +13 added lines, -13 removed lines

@@ -265,13 +265,13 @@ 
                 //    Only actually write it if there's content in the string
                 //    Write to worksheet to be done here...
                 //    ... we return the cell so we can mess about with styles more easily
-                $sheet->setCellValue($column.$row, $cellContent, true);
+                $sheet->setCellValue($column . $row, $cellContent, true);
                 $this->dataArray[$row][$column] = $cellContent;
             }
         } else {
             //    We have a Rich Text run
             //    TODO
-            $this->dataArray[$row][$column] = 'RICH TEXT: '.$cellContent;
+            $this->dataArray[$row][$column] = 'RICH TEXT: ' . $cellContent;
         }
         $cellContent = (string) '';
     }
@@ -337,7 +337,7 @@ 
                         $this->flushCell($sheet, $column, $row, $cellContent);
                         ++$row;
                         if (isset($this->formats[$child->nodeName])) {
-                            $sheet->getStyle($column.$row)->applyFromArray($this->formats[$child->nodeName]);
+                            $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
                         } else {
                             $cellContent = '----------';
                             $this->flushCell($sheet, $column, $row, $cellContent);
@@ -358,9 +358,9 @@ 
                         foreach ($attributeArray as $attributeName => $attributeValue) {
                             switch ($attributeName) {
                                 case 'href':
-                                    $sheet->getCell($column.$row)->getHyperlink()->setUrl($attributeValue);
+                                    $sheet->getCell($column . $row)->getHyperlink()->setUrl($attributeValue);
                                     if (isset($this->formats[$child->nodeName])) {
-                                        $sheet->getStyle($column.$row)->applyFromArray($this->formats[$child->nodeName]);
+                                        $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
                                     }
                                     break;
                             }
@@ -390,7 +390,7 @@ 
                             $this->flushCell($sheet, $column, $row, $cellContent);
 
                             if (isset($this->formats[$child->nodeName])) {
-                                $sheet->getStyle($column.$row)->applyFromArray($this->formats[$child->nodeName]);
+                                $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
                             }
 
                             ++$row;
@@ -440,7 +440,7 @@ 
                     case 'td':
                         $this->processDomElement($child, $sheet, $row, $column, $cellContent);
 
-                        while (isset($this->rowspan[$column.$row])) {
+                        while (isset($this->rowspan[$column . $row])) {
                             ++$column;
                         }
 
@@ -452,7 +452,7 @@ 
                             for ($i = 0; $i < $attributeArray['colspan'] - 1; ++$i) {
                                 ++$columnTo;
                             }
-                            $range = $column.$row.':'.$columnTo.($row + $attributeArray['rowspan'] - 1);
+                            $range = $column . $row . ':' . $columnTo . ($row + $attributeArray['rowspan'] - 1);
                             foreach (\PhpOffice\PhpSpreadsheet\Cell::extractAllCellReferencesInRange($range) as $value) {
                                 $this->rowspan[$value] = true;
                             }
@@ -460,7 +460,7 @@ 
                             $column = $columnTo;
                         } elseif (isset($attributeArray['rowspan'])) {
                             //create merging rowspan
-                            $range = $column.$row.':'.$column.($row + $attributeArray['rowspan'] - 1);
+                            $range = $column . $row . ':' . $column . ($row + $attributeArray['rowspan'] - 1);
                             foreach (\PhpOffice\PhpSpreadsheet\Cell::extractAllCellReferencesInRange($range) as $value) {
                                 $this->rowspan[$value] = true;
                             }
@@ -471,7 +471,7 @@ 
                             for ($i = 0; $i < $attributeArray['colspan'] - 1; ++$i) {
                                 ++$columnTo;
                             }
-                            $sheet->mergeCells($column.$row.':'.$columnTo.$row);
+                            $sheet->mergeCells($column . $row . ':' . $columnTo . $row);
                             $column = $columnTo;
                         }
                         ++$column;
@@ -504,7 +504,7 @@ 
     {
         // Validate
         if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename.' is an Invalid HTML file.');
+            throw new Exception($pFilename . ' is an Invalid HTML file.');
         }
 
         // Create new sheet
@@ -518,7 +518,7 @@ 
         //    Reload the HTML file into the DOM object
         $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanFile($pFilename), 'HTML-ENTITIES', 'UTF-8'));
         if ($loaded === false) {
-            throw new Exception('Failed to load '.$pFilename.' as a DOM Document');
+            throw new Exception('Failed to load ' . $pFilename . ' as a DOM Document');
         }
 
         //    Discard white space
@@ -566,7 +566,7 @@ 
      */
     public function securityScan($xml)
     {
-        $pattern = '/\\0?'.implode('\\0?', str_split('<!ENTITY')).'\\0?/';
+        $pattern = '/\\0?' . implode('\\0?', str_split('<!ENTITY')) . '\\0?/';
         if (preg_match($pattern, $xml)) {
             throw new Exception('Detected use of ENTITY in XML, spreadsheet file load() aborted to prevent XXE/XEE attacks');
         }

docs/Examples/index.php

Spacing +2 added lines, -2 removed lines

@@ -34,10 +34,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 />';
+                echo $h2Text, '<br />';
             }
         }
     }

docs/Examples/Reading WorkBook Data/exampleWorkBookReader03.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 echo '<b>Custom Properties: </b><br />';
 /*  Loop through the list of custom properties  **/
 foreach ($customPropertyList as $customPropertyName) {
-    echo '<b>',$customPropertyName,': </b>';
+    echo '<b>', $customPropertyName, ': </b>';
     /*  Retrieve the property value  **/
     $propertyValue = $objPHPExcel->getProperties()->getCustomPropertyValue($customPropertyName);
     /*  Retrieve the property type  **/
@@ -68,7 +68,7 @@ 
             break;
     }
 
-    echo $propertyValue,' (',$propertyType,')<br />';
+    echo $propertyValue, ' (', $propertyType, ')<br />';
 }
 
 ?>