From a6a709a4baa0bae2089ef26187a69c678d1ef472 Mon Sep 17 00:00:00 2001 From: golodnyi Date: Fri, 9 Dec 2016 09:56:59 +0700 Subject: [PATCH] Not relevant parameters when calling functions --- src/PhpSpreadsheet/Calculation.php | 2 +- src/PhpSpreadsheet/Chart/Renderer/JpGraph.php | 2 +- src/PhpSpreadsheet/Reader/Xls.php | 2 +- src/PhpSpreadsheet/Reader/Xlsx.php | 12 ++---------- src/PhpSpreadsheet/Reader/Xlsx/Chart.php | 4 ++-- src/PhpSpreadsheet/Shared/ZipStreamWrapper.php | 2 +- src/PhpSpreadsheet/Worksheet.php | 2 +- 7 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/PhpSpreadsheet/Calculation.php b/src/PhpSpreadsheet/Calculation.php index c9b17374..146a7348 100644 --- a/src/PhpSpreadsheet/Calculation.php +++ b/src/PhpSpreadsheet/Calculation.php @@ -3532,7 +3532,7 @@ class Calculation $result = '#VALUE!'; } } else { - $result = '"' . str_replace('""', '"', self::unwrapResult($operand1, '"') . self::unwrapResult($operand2, '"')) . '"'; + $result = '"' . str_replace('""', '"', self::unwrapResult($operand1) . self::unwrapResult($operand2)) . '"'; } $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->showTypeDetails($result)); $stack->push('Value', $result); diff --git a/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php b/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php index a9c7408a..ca97ea45 100644 --- a/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php +++ b/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php @@ -830,7 +830,7 @@ class JpGraph $this->renderContourChart($groupCount, $dimensions); break; case 'stockChart': - $this->renderStockChart($groupCount, $dimensions); + $this->renderStockChart($groupCount); break; default: echo $chartType . ' is not yet implemented
'; diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php index 84491c67..83cf6464 100644 --- a/src/PhpSpreadsheet/Reader/Xls.php +++ b/src/PhpSpreadsheet/Reader/Xls.php @@ -4431,7 +4431,7 @@ class Xls extends BaseReader implements IReader if (!$this->readDataOnly) { // offset: 0; size: 8; cell range address of all cells containing this hyperlink try { - $cellRange = $this->readBIFF8CellRangeAddressFixed($recordData, 0, 8); + $cellRange = $this->readBIFF8CellRangeAddressFixed($recordData); } catch (\PhpOffice\PhpSpreadsheet\Exception $e) { return; } diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php index 9abb7fc0..60f2c0ae 100644 --- a/src/PhpSpreadsheet/Reader/Xlsx.php +++ b/src/PhpSpreadsheet/Reader/Xlsx.php @@ -116,21 +116,13 @@ class Xlsx extends BaseReader implements IReader // The files we're looking at here are small enough that simpleXML is more efficient than XMLReader $rels = simplexml_load_string( - $this->securityScan( - $this->getFromZipArchive($zip, '_rels/.rels'), - 'SimpleXMLElement', - \PhpOffice\PhpSpreadsheet\Settings::getLibXmlLoaderOptions() - ) + $this->securityScan($this->getFromZipArchive($zip, '_rels/.rels')) ); //~ http://schemas.openxmlformats.org/package/2006/relationships"); foreach ($rels->Relationship as $rel) { switch ($rel['Type']) { case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument': $xmlWorkbook = simplexml_load_string( - $this->securityScan( - $this->getFromZipArchive($zip, "{$rel['Target']}"), - 'SimpleXMLElement', - \PhpOffice\PhpSpreadsheet\Settings::getLibXmlLoaderOptions() - ) + $this->securityScan($this->getFromZipArchive($zip, "{$rel['Target']}")) ); //~ http://schemas.openxmlformats.org/spreadsheetml/2006/main" if ($xmlWorkbook->sheets) { diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php index 614ee30b..b29ee936 100644 --- a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php +++ b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php @@ -83,7 +83,7 @@ class Chart foreach ($chartDetails as $chartDetailKey => $chartDetail) { switch ($chartDetailKey) { case 'layout': - $plotAreaLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta, 'plotArea'); + $plotAreaLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta); break; case 'catAx': if (isset($chartDetail->title)) { @@ -190,7 +190,7 @@ class Chart $legendOverlay = self::getAttribute($chartDetail, 'val', 'boolean'); break; case 'layout': - $legendLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta, 'legend'); + $legendLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta); break; } } diff --git a/src/PhpSpreadsheet/Shared/ZipStreamWrapper.php b/src/PhpSpreadsheet/Shared/ZipStreamWrapper.php index e662168e..2128d3cc 100644 --- a/src/PhpSpreadsheet/Shared/ZipStreamWrapper.php +++ b/src/PhpSpreadsheet/Shared/ZipStreamWrapper.php @@ -112,7 +112,7 @@ class ZipStreamWrapper */ public function url_stat() // @codingStandardsIgnoreLine { - return $this->statName($this->fileNameInArchive); + return $this->statName(); } /** diff --git a/src/PhpSpreadsheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet.php index 3d8ca1d8..8a432ede 100644 --- a/src/PhpSpreadsheet/Worksheet.php +++ b/src/PhpSpreadsheet/Worksheet.php @@ -1837,7 +1837,7 @@ class Worksheet implements IComparable { $cellRange = Cell::stringFromColumnIndex($pColumn1) . $pRow1 . ':' . Cell::stringFromColumnIndex($pColumn2) . $pRow2; - return $this->unprotectCells($cellRange, $pPassword, $pAlreadyHashed); + return $this->unprotectCells($cellRange); } /**