Remove unused variables and parameters

PowerKiKi · PowerKiKi · commit 3982ce294440 · 2017-10-29T14:09:38.000+09:00
diff --git a/src/PhpSpreadsheet/Calculation.php b/src/PhpSpreadsheet/Calculation.php
@@ -3512,23 +3512,23 @@ private function processTokenStack($tokens, $cellID = null, Cell $pCell = null)
 
                         break;
                     case '+':            //    Addition
-                        $this->executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'plusEquals', $stack);
+                        $this->executeNumericBinaryOperation($operand1, $operand2, $token, 'plusEquals', $stack);
 
                         break;
                     case '-':            //    Subtraction
-                        $this->executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'minusEquals', $stack);
+                        $this->executeNumericBinaryOperation($operand1, $operand2, $token, 'minusEquals', $stack);
 
                         break;
                     case '*':            //    Multiplication
-                        $this->executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'arrayTimesEquals', $stack);
+                        $this->executeNumericBinaryOperation($operand1, $operand2, $token, 'arrayTimesEquals', $stack);
 
                         break;
                     case '/':            //    Division
-                        $this->executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'arrayRightDivide', $stack);
+                        $this->executeNumericBinaryOperation($operand1, $operand2, $token, 'arrayRightDivide', $stack);
 
                         break;
                     case '^':            //    Exponential
-                        $this->executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'power', $stack);
+                        $this->executeNumericBinaryOperation($operand1, $operand2, $token, 'power', $stack);
 
                         break;
                     case '&':            //    Concatenation
@@ -3606,7 +3606,7 @@ private function processTokenStack($tokens, $cellID = null, Cell $pCell = null)
                     $this->debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result));
                     $stack->push('Value', $result);
                 } else {
-                    $this->executeNumericBinaryOperation($cellID, $multiplier, $arg, '*', 'arrayTimesEquals', $stack);
+                    $this->executeNumericBinaryOperation($multiplier, $arg, '*', 'arrayTimesEquals', $stack);
                 }
             } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $token, $matches)) {
                 $cellRef = null;
@@ -3985,13 +3985,15 @@ private function strcmpLowercaseFirst($str1, $str2)
     }
 
     /**
-     * @param string $matrixFunction
-     * @param null|string $cellID
      * @param mixed $operand1
      * @param mixed $operand2
      * @param mixed $operation
+     * @param string $matrixFunction
+     * @param mixed $stack
+     *
+     * @return bool
      */
-    private function executeNumericBinaryOperation($cellID, $operand1, $operand2, $operation, $matrixFunction, &$stack)
+    private function executeNumericBinaryOperation($operand1, $operand2, $operation, $matrixFunction, &$stack)
     {
         //    Validate the two operands
         if (!$this->validateBinaryOperand($operand1, $stack)) {
diff --git a/src/PhpSpreadsheet/Cell.php b/src/PhpSpreadsheet/Cell.php
@@ -270,7 +270,6 @@ public function getCalculatedValue($resetLog = true)
                 if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->calculatedValue !== null)) {
                     return $this->calculatedValue; // Fallback for calculations referencing external files.
                 }
-                $result = '#N/A';
 
                 throw new Calculation\Exception(
                     $this->getWorksheet()->getTitle() . '!' . $this->getCoordinate() . ' -> ' . $ex->getMessage()
diff --git a/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php b/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
@@ -191,7 +191,6 @@ private function renderLegend()
         $legend = $this->chart->getLegend();
         if ($legend !== null) {
             $legendPosition = $legend->getPosition();
-            $legendOverlay = $legend->getOverlay();
             switch ($legendPosition) {
                 case 'r':
                     $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center'); //    right
@@ -257,7 +256,7 @@ private function renderCartesianPlotArea($type = 'textlin')
         }
     }
 
-    private function renderPiePlotArea($doughnut = false)
+    private function renderPiePlotArea()
     {
         $this->graph = new \PieGraph(self::$width, self::$height);
 
@@ -608,7 +607,7 @@ private function renderBubbleChart($groupCount)
 
     private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false)
     {
-        $this->renderPiePlotArea($doughnut);
+        $this->renderPiePlotArea();
 
         $iLimit = ($multiplePlots) ? $groupCount : 1;
         for ($groupID = 0; $groupID < $iLimit; ++$groupID) {
diff --git a/src/PhpSpreadsheet/Helper/Html.php b/src/PhpSpreadsheet/Helper/Html.php
@@ -604,7 +604,7 @@ public function toRichTextObject($html)
         $dom = new DOMDocument();
         //    Load the HTML file into the DOM object
         //  Note the use of error suppression, because typically this will be an html fragment, so not fully valid markup
-        $loaded = @$dom->loadHTML($html);
+        @$dom->loadHTML($html);
 
         //    Discard excess white space
         $dom->preserveWhiteSpace = false;
diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -2,7 +2,6 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
-use DateTimeZone;
 use PhpOffice\PhpSpreadsheet\Cell;
 use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\ReferenceHelper;
@@ -195,9 +194,6 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
     {
         File::assertFile($pFilename);
 
-        $timezoneObj = new DateTimeZone('Europe/London');
-        $GMT = new DateTimeZone('UTC');
-
         $gFileData = $this->gzfileGetContents($pFilename);
 
         $xml = simplexml_load_string($this->securityScan($gFileData), 'SimpleXMLElement', Settings::getLibXmlLoaderOptions());
diff --git a/src/PhpSpreadsheet/Reader/Html.php b/src/PhpSpreadsheet/Reader/Html.php
@@ -484,7 +484,7 @@ protected function processDomElement(DOMNode $element, Worksheet $sheet, &$row,
                     case 'body':
                         $row = 1;
                         $column = 'A';
-                        $content = '';
+                        $cellContent = '';
                         $this->tableLevel = 0;
                         $this->processDomElement($child, $sheet, $row, $column, $cellContent);
 
diff --git a/src/PhpSpreadsheet/Reader/Ods.php b/src/PhpSpreadsheet/Reader/Ods.php
@@ -153,7 +153,7 @@ public function listWorksheetInfo($pFilename)
         }
 
         $xml = new XMLReader();
-        $res = $xml->xml(
+        $xml->xml(
             $this->securityScanFile('zip://' . realpath($pFilename) . '#content.xml'),
             null,
             Settings::getLibXmlLoaderOptions()
diff --git a/src/PhpSpreadsheet/Reader/Slk.php b/src/PhpSpreadsheet/Reader/Slk.php
@@ -126,9 +126,6 @@ public function listWorksheetInfo($pFilename)
         $worksheetInfo[0]['totalRows'] = 0;
         $worksheetInfo[0]['totalColumns'] = 0;
 
-        // Loop through file
-        $rowData = [];
-
         // loop through one row (line) at a time in the file
         $rowIndex = 0;
         while (($rowData = fgets($fileHandle)) !== false) {
@@ -221,7 +218,6 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
         $toFormats = ['-', ' '];
 
         // Loop through file
-        $rowData = [];
         $column = $row = '';
 
         // loop through one row (line) at a time in the file
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -200,7 +200,7 @@ public function listWorksheetInfo($pFilename)
                         $fileWorksheet = $worksheets[(string) self::getArrayItem($eleSheet->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships'), 'id')];
 
                         $xml = new XMLReader();
-                        $res = $xml->xml(
+                        $xml->xml(
                             $this->securityScanFile(
                                 'zip://' . File::realpath($pFilename) . '#' . "$dir/$fileWorksheet"
                             ),
diff --git a/src/PhpSpreadsheet/Reader/Xml.php b/src/PhpSpreadsheet/Reader/Xml.php
@@ -2,7 +2,6 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
-use DateTimeZone;
 use PhpOffice\PhpSpreadsheet\Cell;
 use PhpOffice\PhpSpreadsheet\Document\Properties;
 use PhpOffice\PhpSpreadsheet\RichText;
@@ -327,9 +326,6 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
             Alignment::HORIZONTAL_JUSTIFY,
         ];
 
-        $timezoneObj = new DateTimeZone('Europe/London');
-        $GMT = new DateTimeZone('UTC');
-
         File::assertFile($pFilename);
         if (!$this->canRead($pFilename)) {
             throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
@@ -648,10 +644,6 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
                         $cellDataFormula = '';
                         if (isset($cell_ss['Formula'])) {
                             $cellDataFormula = $cell_ss['Formula'];
-                            // added this as a check for array formulas
-                            if (isset($cell_ss['ArrayRange'])) {
-                                $cellDataCSEFormula = $cell_ss['ArrayRange'];
-                            }
                             $hasCalculatedValue = true;
                         }
                         if (isset($cell->Data)) {
@@ -792,9 +784,6 @@ public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
                     }
 
                     if ($rowHasData) {
-                        if (isset($row_ss['StyleID'])) {
-                            $rowStyle = $row_ss['StyleID'];
-                        }
                         if (isset($row_ss['Height'])) {
                             $rowHeight = $row_ss['Height'];
                             $spreadsheet->getActiveSheet()->getRowDimension($rowID)->setRowHeight($rowHeight);
diff --git a/src/PhpSpreadsheet/Style/NumberFormat.php b/src/PhpSpreadsheet/Style/NumberFormat.php
@@ -722,7 +722,6 @@ public static function toFormattedString($value, $format, $callBack = null)
                 }
                 if (preg_match('/\[\$(.*)\]/u', $format, $m)) {
                     //  Currency or Accounting
-                    $currencyFormat = $m[0];
                     $currencyCode = $m[1];
                     list($currencyCode) = explode('-', $currencyCode);
                     if ($currencyCode == '') {
@@ -733,9 +732,6 @@ public static function toFormattedString($value, $format, $callBack = null)
             }
         }
 
-        // Escape any escaped slashes to a single slash
-        $format = preg_replace('/\\\\/u', '\\', $format);
-
         // Additional formatting provided by callback function
         if ($callBack !== null) {
             list($writerInstance, $function) = $callBack;
diff --git a/src/PhpSpreadsheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet.php
@@ -1303,8 +1303,6 @@ public function cellExists($pCoordinate)
         } elseif (strpos($pCoordinate, '$') !== false) {
             throw new Exception('Cell coordinate must not be absolute.');
         }
-        // Coordinates
-        $aCoordinates = Cell::coordinateFromString($pCoordinate);
 
         // Cell exists?
         return $this->cellCollection->has($pCoordinate);
@@ -1528,9 +1526,6 @@ public function getStyleByColumnAndRow($pColumn, $pRow, $pColumn2 = null, $pRow2
      */
     public function duplicateStyle(Style $pCellStyle, $pRange)
     {
-        // make sure we have a real style and not supervisor
-        $style = $pCellStyle->getIsSupervisor() ? $pCellStyle->getSharedComponent() : $pCellStyle;
-
         // Add the style to the workbook if necessary
         $workbook = $this->parent;
         if ($existingStyle = $this->parent->getCellXfByHashCode($pCellStyle->getHashCode())) {
@@ -1862,14 +1857,12 @@ public function unprotectCells($pRange)
      * @param int $pRow1 Numeric row coordinate of the first cell
      * @param int $pColumn2 Numeric column coordinate of the last cell (A = 0)
      * @param int $pRow2 Numeric row coordinate of the last cell
-     * @param string $pPassword Password to unlock the protection
-     * @param bool $pAlreadyHashed If the password has already been hashed, set this to true
      *
      * @throws Exception
      *
      * @return Worksheet
      */
-    public function unprotectCellsByColumnAndRow($pColumn1, $pRow1, $pColumn2, $pRow2, $pPassword, $pAlreadyHashed = false)
+    public function unprotectCellsByColumnAndRow($pColumn1, $pRow1, $pColumn2, $pRow2)
     {
         $cellRange = Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2;
 
@@ -1908,7 +1901,7 @@ public function getAutoFilter()
      */
     public function setAutoFilter($pValue)
     {
-        $pRange = strtoupper($pValue);
+        $pValue = strtoupper($pValue);
         if (is_string($pValue)) {
             $this->autoFilter->setRange($pValue);
         } elseif (is_object($pValue) && ($pValue instanceof Worksheet\AutoFilter)) {
diff --git a/src/PhpSpreadsheet/Writer/Ods/MetaInf.php b/src/PhpSpreadsheet/Writer/Ods/MetaInf.php
@@ -10,18 +10,12 @@ class MetaInf extends WriterPart
     /**
      * Write META-INF/manifest.xml to XML format.
      *
-     * @param Spreadsheet $spreadsheet
-     *
      * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
      *
      * @return string XML Output
      */
-    public function writeManifest(Spreadsheet $spreadsheet = null)
+    public function writeManifest()
     {
-        if (!$spreadsheet) {
-            $spreadsheet = $this->getParentWriter()->getSpreadsheet();
-        }
-
         $objWriter = null;
         if ($this->getParentWriter()->getUseDiskCaching()) {
             $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
diff --git a/src/PhpSpreadsheet/Writer/Ods/Settings.php b/src/PhpSpreadsheet/Writer/Ods/Settings.php
@@ -18,10 +18,6 @@ class Settings extends WriterPart
      */
     public function write(Spreadsheet $spreadsheet = null)
     {
-        if (!$spreadsheet) {
-            $spreadsheet = $this->getParentWriter()->getSpreadsheet();
-        }
-
         $objWriter = null;
         if ($this->getParentWriter()->getUseDiskCaching()) {
             $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
diff --git a/src/PhpSpreadsheet/Writer/Ods/Styles.php b/src/PhpSpreadsheet/Writer/Ods/Styles.php
@@ -18,10 +18,6 @@ class Styles extends WriterPart
      */
     public function write(Spreadsheet $spreadsheet = null)
     {
-        if (!$spreadsheet) {
-            $spreadsheet = $this->getParentWriter()->getSpreadsheet();
-        }
-
         $objWriter = null;
         if ($this->getParentWriter()->getUseDiskCaching()) {
             $objWriter = new XMLWriter(XMLWriter::STORAGE_DISK, $this->getParentWriter()->getDiskCachingDirectory());
diff --git a/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php b/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
@@ -27,12 +27,10 @@ public function save($pFilename)
             $orientation = ($this->spreadsheet->getSheet(0)->getPageSetup()->getOrientation()
                 == PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
             $printPaperSize = $this->spreadsheet->getSheet(0)->getPageSetup()->getPaperSize();
-            $printMargins = $this->spreadsheet->getSheet(0)->getPageMargins();
         } else {
             $orientation = ($this->spreadsheet->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
                 == PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
             $printPaperSize = $this->spreadsheet->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
-            $printMargins = $this->spreadsheet->getSheet($this->getSheetIndex())->getPageMargins();
         }
 
         $orientation = ($orientation == 'L') ? 'landscape' : 'portrait';
diff --git a/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php b/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php
@@ -29,12 +29,10 @@ public function save($pFilename)
             $orientation = ($this->spreadsheet->getSheet(0)->getPageSetup()->getOrientation()
                 == PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
             $printPaperSize = $this->spreadsheet->getSheet(0)->getPageSetup()->getPaperSize();
-            $printMargins = $this->spreadsheet->getSheet(0)->getPageMargins();
         } else {
             $orientation = ($this->spreadsheet->getSheet($this->getSheetIndex())->getPageSetup()->getOrientation()
                 == PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
             $printPaperSize = $this->spreadsheet->getSheet($this->getSheetIndex())->getPageSetup()->getPaperSize();
-            $printMargins = $this->spreadsheet->getSheet($this->getSheetIndex())->getPageMargins();
         }
         $this->setOrientation($orientation);
 
diff --git a/src/PhpSpreadsheet/Writer/Xls.php b/src/PhpSpreadsheet/Writer/Xls.php
@@ -220,7 +220,7 @@ public function save($pFilename)
 
         $root = new Root(time(), time(), $arrRootData);
         // save the OLE file
-        $res = $root->save($pFilename);
+        $root->save($pFilename);
 
         Functions::setReturnDateType($saveDateReturnType);
         Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
diff --git a/src/PhpSpreadsheet/Writer/Xlsx.php b/src/PhpSpreadsheet/Writer/Xlsx.php
@@ -308,7 +308,7 @@ public function save($pFilename)
                     $zip->addFromString('xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->spreadSheet->getSheet($i), $chartRef1, $this->includeCharts));
 
                     // Drawings
-                    $zip->addFromString('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $chartRef2, $this->includeCharts));
+                    $zip->addFromString('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts));
                 }
 
                 // Add comment relationship parts
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Chart.php b/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php b/src/PhpSpreadsheet/Writer/Xlsx/Drawing.php
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php b/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
diff --git a/tests/PhpSpreadsheetTests/Chart/LayoutTest.php b/tests/PhpSpreadsheetTests/Chart/LayoutTest.php
diff --git a/tests/PhpSpreadsheetTests/Chart/LegendTest.php b/tests/PhpSpreadsheetTests/Chart/LegendTest.php
diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilter/ColumnTest.php
diff --git a/tests/PhpSpreadsheetTests/Worksheet/AutoFilterTest.php b/tests/PhpSpreadsheetTests/Worksheet/AutoFilterTest.php

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,6 @@ public function getCalculatedValue($resetLog = true)`
`270`	`270`	`if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->calculatedValue !== null)) {`
`271`	`271`	`return $this->calculatedValue; // Fallback for calculations referencing external files.`
`272`	`272`	`}`
`273`		`- $result = '#N/A';`
`274`	`273`
`275`	`274`	`throw new Calculation\Exception(`
`276`	`275`	`$this->getWorksheet()->getTitle() . '!' . $this->getCoordinate() . ' -> ' . $ex->getMessage()`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,6 @@ private function renderLegend()`
`191`	`191`	`$legend = $this->chart->getLegend();`
`192`	`192`	`if ($legend !== null) {`
`193`	`193`	`$legendPosition = $legend->getPosition();`
`194`		`- $legendOverlay = $legend->getOverlay();`
`195`	`194`	`switch ($legendPosition) {`
`196`	`195`	`case 'r':`
`197`	`196`	`$this->graph->legend->SetPos(0.01, 0.5, 'right', 'center'); // right`
`@@ -257,7 +256,7 @@ private function renderCartesianPlotArea($type = 'textlin')`
`257`	`256`	`}`
`258`	`257`	`}`
`259`	`258`
`260`		`- private function renderPiePlotArea($doughnut = false)`
	`259`	`+ private function renderPiePlotArea()`
`261`	`260`	`{`
`262`	`261`	`$this->graph = new \PieGraph(self::$width, self::$height);`
`263`	`262`
`@@ -608,7 +607,7 @@ private function renderBubbleChart($groupCount)`
`608`	`607`
`609`	`608`	`private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false)`
`610`	`609`	`{`
`611`		`- $this->renderPiePlotArea($doughnut);`
	`610`	`+ $this->renderPiePlotArea();`
`612`	`611`
`613`	`612`	`$iLimit = ($multiplePlots) ? $groupCount : 1;`
`614`	`613`	`for ($groupID = 0; $groupID < $iLimit; ++$groupID) {`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public function listWorksheetInfo($pFilename)`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`$xml = new XMLReader();`
`156`		`- $res = $xml->xml(`
	`156`	`+ $xml->xml(`
`157`	`157`	`$this->securityScanFile('zip://' . realpath($pFilename) . '#content.xml'),`
`158`	`158`	`null,`
`159`	`159`	`Settings::getLibXmlLoaderOptions()`