'; - - return false; - } else { - return $this->renderCombinationChart($groupCount, $dimensions, $outputDestination); - } - } - - switch ($chartType) { - case 'area3DChart': - $dimensions = '3d'; - // no break - case 'areaChart': - $this->renderAreaChart($groupCount, $dimensions); - - break; - case 'bar3DChart': - $dimensions = '3d'; - // no break - case 'barChart': - $this->renderBarChart($groupCount, $dimensions); - - break; - case 'line3DChart': - $dimensions = '3d'; - // no break - case 'lineChart': - $this->renderLineChart($groupCount, $dimensions); - - break; - case 'pie3DChart': - $dimensions = '3d'; - // no break - case 'pieChart': - $this->renderPieChart($groupCount, $dimensions, false, false); - - break; - case 'doughnut3DChart': - $dimensions = '3d'; - // no break - case 'doughnutChart': - $this->renderPieChart($groupCount, $dimensions, true, true); - - break; - case 'scatterChart': - $this->renderScatterChart($groupCount); - - break; - case 'bubbleChart': - $this->renderBubbleChart($groupCount); - - break; - case 'radarChart': - $this->renderRadarChart($groupCount); - - break; - case 'surface3DChart': - $dimensions = '3d'; - // no break - case 'surfaceChart': - $this->renderContourChart($groupCount, $dimensions); - - break; - case 'stockChart': - $this->renderStockChart($groupCount); - - break; - default: - echo $chartType . ' is not yet implemented
'; - - return false; - } - $this->renderLegend(); - - $this->graph->Stroke($outputDestination); - - return true; - } } diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php new file mode 100644 index 000000000..cb9b544b8 --- /dev/null +++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php @@ -0,0 +1,852 @@ +graph = null; + $this->chart = $chart; + + self::$markSet = [ + 'diamond' => MARK_DIAMOND, + 'square' => MARK_SQUARE, + 'triangle' => MARK_UTRIANGLE, + 'x' => MARK_X, + 'star' => MARK_STAR, + 'dot' => MARK_FILLEDCIRCLE, + 'dash' => MARK_DTRIANGLE, + 'circle' => MARK_CIRCLE, + 'plus' => MARK_CROSS, + ]; + } + + /** + * This method should be overriden in descendants to do real JpGraph library initialization. + */ + abstract protected static function init(): void; + + private function formatPointMarker($seriesPlot, $markerID) + { + $plotMarkKeys = array_keys(self::$markSet); + if ($markerID === null) { + // Use default plot marker (next marker in the series) + self::$plotMark %= count(self::$markSet); + $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]); + } elseif ($markerID !== 'none') { + // Use specified plot marker (if it exists) + if (isset(self::$markSet[$markerID])) { + $seriesPlot->mark->SetType(self::$markSet[$markerID]); + } else { + // If the specified plot marker doesn't exist, use default plot marker (next marker in the series) + self::$plotMark %= count(self::$markSet); + $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]); + } + } else { + // Hide plot marker + $seriesPlot->mark->Hide(); + } + $seriesPlot->mark->SetColor(self::$colourSet[self::$plotColour]); + $seriesPlot->mark->SetFillColor(self::$colourSet[self::$plotColour]); + $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]); + + return $seriesPlot; + } + + private function formatDataSetLabels($groupID, $datasetLabels, $rotation = '') + { + $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode() ?? ''; + // Retrieve any label formatting code + $datasetLabelFormatCode = stripslashes($datasetLabelFormatCode); + + $testCurrentIndex = 0; + foreach ($datasetLabels as $i => $datasetLabel) { + if (is_array($datasetLabel)) { + if ($rotation == 'bar') { + $datasetLabels[$i] = implode(' ', $datasetLabel); + } else { + $datasetLabel = array_reverse($datasetLabel); + $datasetLabels[$i] = implode("\n", $datasetLabel); + } + } else { + // Format labels according to any formatting code + if ($datasetLabelFormatCode !== null) { + $datasetLabels[$i] = NumberFormat::toFormattedString($datasetLabel, $datasetLabelFormatCode); + } + } + ++$testCurrentIndex; + } + + return $datasetLabels; + } + + private function percentageSumCalculation($groupID, $seriesCount) + { + $sumValues = []; + // Adjust our values to a percentage value across all series in the group + for ($i = 0; $i < $seriesCount; ++$i) { + if ($i == 0) { + $sumValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues(); + } else { + $nextValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues(); + foreach ($nextValues as $k => $value) { + if (isset($sumValues[$k])) { + $sumValues[$k] += $value; + } else { + $sumValues[$k] = $value; + } + } + } + } + + return $sumValues; + } + + private function percentageAdjustValues($dataValues, $sumValues) + { + foreach ($dataValues as $k => $dataValue) { + $dataValues[$k] = $dataValue / $sumValues[$k] * 100; + } + + return $dataValues; + } + + private function getCaption($captionElement) + { + // Read any caption + $caption = ($captionElement !== null) ? $captionElement->getCaption() : null; + // Test if we have a title caption to display + if ($caption !== null) { + // If we do, it could be a plain string or an array + if (is_array($caption)) { + // Implode an array to a plain string + $caption = implode('', $caption); + } + } + + return $caption; + } + + private function renderTitle(): void + { + $title = $this->getCaption($this->chart->getTitle()); + if ($title !== null) { + $this->graph->title->Set($title); + } + } + + private function renderLegend(): void + { + $legend = $this->chart->getLegend(); + if ($legend !== null) { + $legendPosition = $legend->getPosition(); + switch ($legendPosition) { + case 'r': + $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->SetColumns(1); + + break; + case 't': + $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 + + break; + default: + $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); // top-right + $this->graph->legend->SetColumns(1); + + break; + } + } else { + $this->graph->legend->Hide(); + } + } + + private function renderCartesianPlotArea($type = 'textlin'): void + { + $this->graph = new Graph(self::$width, self::$height); + $this->graph->SetScale($type); + + $this->renderTitle(); + + // Rotate for bar rather than column chart + $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotDirection(); + $reverse = $rotation == 'bar'; + + $xAxisLabel = $this->chart->getXAxisLabel(); + if ($xAxisLabel !== null) { + $title = $this->getCaption($xAxisLabel); + if ($title !== null) { + $this->graph->xaxis->SetTitle($title, 'center'); + $this->graph->xaxis->title->SetMargin(35); + if ($reverse) { + $this->graph->xaxis->title->SetAngle(90); + $this->graph->xaxis->title->SetMargin(90); + } + } + } + + $yAxisLabel = $this->chart->getYAxisLabel(); + if ($yAxisLabel !== null) { + $title = $this->getCaption($yAxisLabel); + if ($title !== null) { + $this->graph->yaxis->SetTitle($title, 'center'); + if ($reverse) { + $this->graph->yaxis->title->SetAngle(0); + $this->graph->yaxis->title->SetMargin(-55); + } + } + } + } + + private function renderPiePlotArea(): void + { + $this->graph = new PieGraph(self::$width, self::$height); + + $this->renderTitle(); + } + + private function renderRadarPlotArea(): void + { + $this->graph = new RadarGraph(self::$width, self::$height); + $this->graph->SetScale('lin'); + + $this->renderTitle(); + } + + private function renderPlotLine($groupID, $filled = false, $combination = false): void + { + $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping(); + + $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[0]; + $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointCount(); + if ($labelCount > 0) { + $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues(); + $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels); + $this->graph->xaxis->SetTickLabels($datasetLabels); + } + + $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount(); + $seriesPlots = []; + if ($grouping == 'percentStacked') { + $sumValues = $this->percentageSumCalculation($groupID, $seriesCount); + } else { + $sumValues = []; + } + + // Loop through each data series in turn + for ($i = 0; $i < $seriesCount; ++$i) { + $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[$i]; + $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getDataValues(); + $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointMarker(); + + if ($grouping == 'percentStacked') { + $dataValues = $this->percentageAdjustValues($dataValues, $sumValues); + } + + // Fill in any missing values in the $dataValues array + $testCurrentIndex = 0; + foreach ($dataValues as $k => $dataValue) { + while ($k != $testCurrentIndex) { + $dataValues[$testCurrentIndex] = null; + ++$testCurrentIndex; + } + ++$testCurrentIndex; + } + + $seriesPlot = new LinePlot($dataValues); + if ($combination) { + $seriesPlot->SetBarCenter(); + } + + if ($filled) { + $seriesPlot->SetFilled(true); + $seriesPlot->SetColor('black'); + $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]); + } else { + // Set the appropriate plot marker + $this->formatPointMarker($seriesPlot, $marker); + } + $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($index)->getDataValue(); + $seriesPlot->SetLegend($dataLabel); + + $seriesPlots[] = $seriesPlot; + } + + if ($grouping == 'standard') { + $groupPlot = $seriesPlots; + } else { + $groupPlot = new AccLinePlot($seriesPlots); + } + $this->graph->Add($groupPlot); + } + + private function renderPlotBar($groupID, $dimensions = '2d'): void + { + $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection(); + // Rotate for bar rather than column chart + if (($groupID == 0) && ($rotation == 'bar')) { + $this->graph->Set90AndMargin(); + } + $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping(); + + $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[0]; + $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointCount(); + if ($labelCount > 0) { + $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues(); + $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $rotation); + // Rotate for bar rather than column chart + if ($rotation == 'bar') { + $datasetLabels = array_reverse($datasetLabels); + $this->graph->yaxis->SetPos('max'); + $this->graph->yaxis->SetLabelAlign('center', 'top'); + $this->graph->yaxis->SetLabelSide(SIDE_RIGHT); + } + $this->graph->xaxis->SetTickLabels($datasetLabels); + } + + $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount(); + $seriesPlots = []; + if ($grouping == 'percentStacked') { + $sumValues = $this->percentageSumCalculation($groupID, $seriesCount); + } else { + $sumValues = []; + } + + // Loop through each data series in turn + for ($j = 0; $j < $seriesCount; ++$j) { + $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[$j]; + $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getDataValues(); + if ($grouping == 'percentStacked') { + $dataValues = $this->percentageAdjustValues($dataValues, $sumValues); + } + + // Fill in any missing values in the $dataValues array + $testCurrentIndex = 0; + foreach ($dataValues as $k => $dataValue) { + while ($k != $testCurrentIndex) { + $dataValues[$testCurrentIndex] = null; + ++$testCurrentIndex; + } + ++$testCurrentIndex; + } + + // Reverse the $dataValues order for bar rather than column chart + if ($rotation == 'bar') { + $dataValues = array_reverse($dataValues); + } + $seriesPlot = new BarPlot($dataValues); + $seriesPlot->SetColor('black'); + $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]); + if ($dimensions == '3d') { + $seriesPlot->SetShadow(); + } + if (!$this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)) { + $dataLabel = ''; + } else { + $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)->getDataValue(); + } + $seriesPlot->SetLegend($dataLabel); + + $seriesPlots[] = $seriesPlot; + } + // Reverse the plot order for bar rather than column chart + if (($rotation == 'bar') && ($grouping != 'percentStacked')) { + $seriesPlots = array_reverse($seriesPlots); + } + + if ($grouping == 'clustered') { + $groupPlot = new GroupBarPlot($seriesPlots); + } elseif ($grouping == 'standard') { + $groupPlot = new GroupBarPlot($seriesPlots); + } else { + $groupPlot = new AccBarPlot($seriesPlots); + if ($dimensions == '3d') { + $groupPlot->SetShadow(); + } + } + + $this->graph->Add($groupPlot); + } + + private function renderPlotScatter($groupID, $bubble): void + { + $scatterStyle = $bubbleSize = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle(); + + $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount(); + + // Loop through each data series in turn + for ($i = 0; $i < $seriesCount; ++$i) { + $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues(); + $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues(); + + foreach ($dataValuesY as $k => $dataValueY) { + $dataValuesY[$k] = $k; + } + + $seriesPlot = new ScatterPlot($dataValuesX, $dataValuesY); + if ($scatterStyle == 'lineMarker') { + $seriesPlot->SetLinkPoints(); + $seriesPlot->link->SetColor(self::$colourSet[self::$plotColour]); + } elseif ($scatterStyle == 'smoothMarker') { + $spline = new Spline($dataValuesY, $dataValuesX); + [$splineDataY, $splineDataX] = $spline->Get(count($dataValuesX) * self::$width / 20); + $lplot = new LinePlot($splineDataX, $splineDataY); + $lplot->SetColor(self::$colourSet[self::$plotColour]); + + $this->graph->Add($lplot); + } + + if ($bubble) { + $this->formatPointMarker($seriesPlot, 'dot'); + $seriesPlot->mark->SetColor('black'); + $seriesPlot->mark->SetSize($bubbleSize); + } else { + $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker(); + $this->formatPointMarker($seriesPlot, $marker); + } + $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue(); + $seriesPlot->SetLegend($dataLabel); + + $this->graph->Add($seriesPlot); + } + } + + private function renderPlotRadar($groupID): void + { + $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle(); + + $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount(); + + // Loop through each data series in turn + for ($i = 0; $i < $seriesCount; ++$i) { + $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues(); + $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues(); + $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker(); + + $dataValues = []; + foreach ($dataValuesY as $k => $dataValueY) { + $dataValues[$k] = implode(' ', array_reverse($dataValueY)); + } + $tmp = array_shift($dataValues); + $dataValues[] = $tmp; + $tmp = array_shift($dataValuesX); + $dataValuesX[] = $tmp; + + $this->graph->SetTitles(array_reverse($dataValues)); + + $seriesPlot = new RadarPlot(array_reverse($dataValuesX)); + + $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue(); + $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]); + if ($radarStyle == 'filled') { + $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour]); + } + $this->formatPointMarker($seriesPlot, $marker); + $seriesPlot->SetLegend($dataLabel); + + $this->graph->Add($seriesPlot); + } + } + + private function renderPlotContour($groupID): void + { + $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount(); + + $dataValues = []; + // Loop through each data series in turn + for ($i = 0; $i < $seriesCount; ++$i) { + $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues(); + + $dataValues[$i] = $dataValuesX; + } + $seriesPlot = new ContourPlot($dataValues); + + $this->graph->Add($seriesPlot); + } + + private function renderPlotStock($groupID): void + { + $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount(); + $plotOrder = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder(); + + $dataValues = []; + // Loop through each data series in turn and build the plot arrays + foreach ($plotOrder as $i => $v) { + $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v); + if ($dataValuesX === false) { + continue; + } + $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v)->getDataValues(); + foreach ($dataValuesX as $j => $dataValueX) { + $dataValues[$plotOrder[$i]][$j] = $dataValueX; + } + } + if (empty($dataValues)) { + return; + } + + $dataValuesPlot = []; + // Flatten the plot arrays to a single dimensional array to work with jpgraph + $jMax = count($dataValues[0]); + for ($j = 0; $j < $jMax; ++$j) { + for ($i = 0; $i < $seriesCount; ++$i) { + $dataValuesPlot[] = $dataValues[$i][$j] ?? null; + } + } + + // Set the x-axis labels + $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount(); + if ($labelCount > 0) { + $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues(); + $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels); + $this->graph->xaxis->SetTickLabels($datasetLabels); + } + + $seriesPlot = new StockPlot($dataValuesPlot); + $seriesPlot->SetWidth(20); + + $this->graph->Add($seriesPlot); + } + + private function renderAreaChart($groupCount): void + { + $this->renderCartesianPlotArea(); + + for ($i = 0; $i < $groupCount; ++$i) { + $this->renderPlotLine($i, true, false); + } + } + + private function renderLineChart($groupCount): void + { + $this->renderCartesianPlotArea(); + + for ($i = 0; $i < $groupCount; ++$i) { + $this->renderPlotLine($i, false, false); + } + } + + private function renderBarChart($groupCount, $dimensions = '2d'): void + { + $this->renderCartesianPlotArea(); + + for ($i = 0; $i < $groupCount; ++$i) { + $this->renderPlotBar($i, $dimensions); + } + } + + private function renderScatterChart($groupCount): void + { + $this->renderCartesianPlotArea('linlin'); + + for ($i = 0; $i < $groupCount; ++$i) { + $this->renderPlotScatter($i, false); + } + } + + private function renderBubbleChart($groupCount): void + { + $this->renderCartesianPlotArea('linlin'); + + for ($i = 0; $i < $groupCount; ++$i) { + $this->renderPlotScatter($i, true); + } + } + + private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false): void + { + $this->renderPiePlotArea(); + + $iLimit = ($multiplePlots) ? $groupCount : 1; + for ($groupID = 0; $groupID < $iLimit; ++$groupID) { + $exploded = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle(); + $datasetLabels = []; + if ($groupID == 0) { + $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount(); + if ($labelCount > 0) { + $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues(); + $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels); + } + } + + $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount(); + // For pie charts, we only display the first series: doughnut charts generally display all series + $jLimit = ($multiplePlots) ? $seriesCount : 1; + // Loop through each data series in turn + for ($j = 0; $j < $jLimit; ++$j) { + $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues(); + + // Fill in any missing values in the $dataValues array + $testCurrentIndex = 0; + foreach ($dataValues as $k => $dataValue) { + while ($k != $testCurrentIndex) { + $dataValues[$testCurrentIndex] = null; + ++$testCurrentIndex; + } + ++$testCurrentIndex; + } + + if ($dimensions == '3d') { + $seriesPlot = new PiePlot3D($dataValues); + } else { + if ($doughnut) { + $seriesPlot = new PiePlotC($dataValues); + } else { + $seriesPlot = new PiePlot($dataValues); + } + } + + if ($multiplePlots) { + $seriesPlot->SetSize(($jLimit - $j) / ($jLimit * 4)); + } + + if ($doughnut && method_exists($seriesPlot, 'SetMidColor')) { + $seriesPlot->SetMidColor('white'); + } + + $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]); + if (count($datasetLabels) > 0) { + $seriesPlot->SetLabels(array_fill(0, count($datasetLabels), '')); + } + if ($dimensions != '3d') { + $seriesPlot->SetGuideLines(false); + } + if ($j == 0) { + if ($exploded) { + $seriesPlot->ExplodeAll(); + } + $seriesPlot->SetLegends($datasetLabels); + } + + $this->graph->Add($seriesPlot); + } + } + } + + private function renderRadarChart($groupCount): void + { + $this->renderRadarPlotArea(); + + for ($groupID = 0; $groupID < $groupCount; ++$groupID) { + $this->renderPlotRadar($groupID); + } + } + + private function renderStockChart($groupCount): void + { + $this->renderCartesianPlotArea('intint'); + + for ($groupID = 0; $groupID < $groupCount; ++$groupID) { + $this->renderPlotStock($groupID); + } + } + + private function renderContourChart($groupCount): void + { + $this->renderCartesianPlotArea('intint'); + + for ($i = 0; $i < $groupCount; ++$i) { + $this->renderPlotContour($i); + } + } + + private function renderCombinationChart($groupCount, $outputDestination) + { + $this->renderCartesianPlotArea(); + + for ($i = 0; $i < $groupCount; ++$i) { + $dimensions = null; + $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType(); + switch ($chartType) { + case 'area3DChart': + case 'areaChart': + $this->renderPlotLine($i, true, true); + + break; + case 'bar3DChart': + $dimensions = '3d'; + // no break + case 'barChart': + $this->renderPlotBar($i, $dimensions); + + break; + case 'line3DChart': + case 'lineChart': + $this->renderPlotLine($i, false, true); + + break; + case 'scatterChart': + $this->renderPlotScatter($i, false); + + break; + case 'bubbleChart': + $this->renderPlotScatter($i, true); + + break; + default: + $this->graph = null; + + return false; + } + } + + $this->renderLegend(); + + $this->graph->Stroke($outputDestination); + + return true; + } + + public function render($outputDestination) + { + self::$plotColour = 0; + + $groupCount = $this->chart->getPlotArea()->getPlotGroupCount(); + + $dimensions = null; + if ($groupCount == 1) { + $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType(); + } else { + $chartTypes = []; + for ($i = 0; $i < $groupCount; ++$i) { + $chartTypes[] = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType(); + } + $chartTypes = array_unique($chartTypes); + if (count($chartTypes) == 1) { + $chartType = array_pop($chartTypes); + } elseif (count($chartTypes) == 0) { + echo 'Chart is not yet implemented
'; + + return false; + } else { + return $this->renderCombinationChart($groupCount, $outputDestination); + } + } + + switch ($chartType) { + case 'area3DChart': + $dimensions = '3d'; + // no break + case 'areaChart': + $this->renderAreaChart($groupCount); + + break; + case 'bar3DChart': + $dimensions = '3d'; + // no break + case 'barChart': + $this->renderBarChart($groupCount, $dimensions); + + break; + case 'line3DChart': + $dimensions = '3d'; + // no break + case 'lineChart': + $this->renderLineChart($groupCount); + + break; + case 'pie3DChart': + $dimensions = '3d'; + // no break + case 'pieChart': + $this->renderPieChart($groupCount, $dimensions, false, false); + + break; + case 'doughnut3DChart': + $dimensions = '3d'; + // no break + case 'doughnutChart': + $this->renderPieChart($groupCount, $dimensions, true, true); + + break; + case 'scatterChart': + $this->renderScatterChart($groupCount); + + break; + case 'bubbleChart': + $this->renderBubbleChart($groupCount); + + break; + case 'radarChart': + $this->renderRadarChart($groupCount); + + break; + case 'surface3DChart': + case 'surfaceChart': + $this->renderContourChart($groupCount); + + break; + case 'stockChart': + $this->renderStockChart($groupCount); + + break; + default: + echo $chartType . ' is not yet implemented
'; + + return false; + } + $this->renderLegend(); + + $this->graph->Stroke($outputDestination); + + return true; + } +} diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php new file mode 100644 index 000000000..e1f0f90ad --- /dev/null +++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php @@ -0,0 +1,36 @@ +setTrendLineProperties( + $trendLineType, + $order, + $period, + $dispRSqr, + $dispEq, + $backward, + $forward, + $intercept, + $name + ); + } + + public function getTrendLineType(): string + { + return $this->trendLineType; + } + + public function setTrendLineType(string $trendLineType): self + { + $this->trendLineType = $trendLineType; + + return $this; + } + + public function getOrder(): int + { + return $this->order; + } + + public function setOrder(int $order): self + { + $this->order = $order; + + return $this; + } + + public function getPeriod(): int + { + return $this->period; + } + + public function setPeriod(int $period): self + { + $this->period = $period; + + return $this; + } + + public function getDispRSqr(): bool + { + return $this->dispRSqr; + } + + public function setDispRSqr(bool $dispRSqr): self + { + $this->dispRSqr = $dispRSqr; + + return $this; + } + + public function getDispEq(): bool + { + return $this->dispEq; + } + + public function setDispEq(bool $dispEq): self + { + $this->dispEq = $dispEq; + + return $this; + } + + public function getName(): string + { + return $this->name; + } + + public function setName(string $name): self + { + $this->name = $name; + + return $this; + } + + public function getBackward(): float + { + return $this->backward; + } + + public function setBackward(float $backward): self + { + $this->backward = $backward; + + return $this; + } + + public function getForward(): float + { + return $this->forward; + } + + public function setForward(float $forward): self + { + $this->forward = $forward; + + return $this; + } + + public function getIntercept(): float + { + return $this->intercept; + } + + public function setIntercept(float $intercept): self + { + $this->intercept = $intercept; + + return $this; + } + + public function setTrendLineProperties( + ?string $trendLineType = null, + ?int $order = 0, + ?int $period = 0, + ?bool $dispRSqr = false, + ?bool $dispEq = false, + ?float $backward = null, + ?float $forward = null, + ?float $intercept = null, + ?string $name = null + ): self { + if (!empty($trendLineType)) { + $this->setTrendLineType($trendLineType); + } + if ($order !== null) { + $this->setOrder($order); + } + if ($period !== null) { + $this->setPeriod($period); + } + if ($dispRSqr !== null) { + $this->setDispRSqr($dispRSqr); + } + if ($dispEq !== null) { + $this->setDispEq($dispEq); + } + if ($backward !== null) { + $this->setBackward($backward); + } + if ($forward !== null) { + $this->setForward($forward); + } + if ($intercept !== null) { + $this->setIntercept($intercept); + } + if ($name !== null) { + $this->setName($name); + } + + return $this; + } +} diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php index 20fccf48a..82c9ae1ae 100644 --- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php +++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Cells.php @@ -91,10 +91,8 @@ class Cells * Whether the collection holds a cell for the given coordinate. * * @param string $cellCoordinate Coordinate of the cell to check - * - * @return bool */ - public function has($cellCoordinate) + public function has($cellCoordinate): bool { return ($cellCoordinate === $this->currentCoordinate) || isset($this->index[$cellCoordinate]); } @@ -103,10 +101,8 @@ class Cells * Add or update a cell in the collection. * * @param Cell $cell Cell to update - * - * @return Cell */ - public function update(Cell $cell) + public function update(Cell $cell): Cell { return $this->add($cell->getCoordinate(), $cell); } @@ -165,10 +161,8 @@ class Cells /** * Return the column coordinate of the currently active cell object. - * - * @return string */ - public function getCurrentColumn() + public function getCurrentColumn(): string { sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row); @@ -177,10 +171,8 @@ class Cells /** * Return the row coordinate of the currently active cell object. - * - * @return int */ - public function getCurrentRow() + public function getCurrentRow(): int { sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row); @@ -276,7 +268,9 @@ class Cells */ private function getUniqueID() { - return Settings::getCache() instanceof Memory + $cacheType = Settings::getCache(); + + return ($cacheType instanceof Memory\SimpleCache1 || $cacheType instanceof Memory\SimpleCache3) ? random_bytes(7) . ':' : uniqid('phpspreadsheet.', true) . '.'; } diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php index 26f18dfc5..b3833bd8b 100644 --- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php +++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/CellsFactory.php @@ -12,9 +12,8 @@ abstract class CellsFactory * * @param Worksheet $worksheet Enable cell caching for this worksheet * - * @return Cells * */ - public static function getInstance(Worksheet $worksheet) + public static function getInstance(Worksheet $worksheet): Cells { return new Cells($worksheet, Settings::getCache()); } diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php similarity index 93% rename from vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory.php rename to vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php index 2690ab7d0..a0eb6ec22 100644 --- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory.php +++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php @@ -1,6 +1,6 @@ cache = []; + + return true; + } + + /** + * @param string $key + */ + public function delete($key): bool + { + unset($this->cache[$key]); + + return true; + } + + /** + * @param iterable $keys + */ + public function deleteMultiple($keys): bool + { + foreach ($keys as $key) { + $this->delete($key); + } + + return true; + } + + /** + * @param string $key + * @param mixed $default + */ + public function get($key, $default = null): mixed + { + if ($this->has($key)) { + return $this->cache[$key]; + } + + return $default; + } + + /** + * @param iterable $keys + * @param mixed $default + */ + public function getMultiple($keys, $default = null): iterable + { + $results = []; + foreach ($keys as $key) { + $results[$key] = $this->get($key, $default); + } + + return $results; + } + + /** + * @param string $key + */ + public function has($key): bool + { + return array_key_exists($key, $this->cache); + } + + /** + * @param string $key + * @param mixed $value + * @param null|DateInterval|int $ttl + */ + public function set($key, $value, $ttl = null): bool + { + $this->cache[$key] = $value; + + return true; + } + + /** + * @param iterable $values + * @param null|DateInterval|int $ttl + */ + public function setMultiple($values, $ttl = null): bool + { + foreach ($values as $key => $value) { + $this->set($key, $value); + } + + return true; + } +} diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php index 3b874b435..464fa8e34 100644 --- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php +++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/DefinedName.php @@ -150,7 +150,7 @@ abstract class DefinedName // New title $newTitle = $this->name; - ReferenceHelper::getInstance()->updateNamedFormulas($this->worksheet->getParent(), $oldTitle, $newTitle); + ReferenceHelper::getInstance()->updateNamedFormulae($this->worksheet->getParent(), $oldTitle, $newTitle); } return $this; diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Dimension.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Dimension.php index 425c9a616..ff07ce5b8 100644 --- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Dimension.php +++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Dimension.php @@ -55,10 +55,20 @@ class Dimension */ protected $unit; + /** + * Phpstan bug has been fixed; this function allows us to + * pass Phpstan whether fixed or not. + * + * @param mixed $value + */ + private static function stanBugFixed($value): array + { + return is_array($value) ? $value : [null, null]; + } + public function __construct(string $dimension) { - // @phpstan-ignore-next-line - [$size, $unit] = sscanf($dimension, '%[1234567890.]%s'); + [$size, $unit] = self::stanBugFixed(sscanf($dimension, '%[1234567890.]%s')); $unit = strtolower(trim($unit ?? '')); $size = (float) $size; diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php index 8ce37003c..0ac0c7969 100644 --- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php +++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/Sample.php @@ -4,6 +4,7 @@ namespace PhpOffice\PhpSpreadsheet\Helper; use PhpOffice\PhpSpreadsheet\IOFactory; use PhpOffice\PhpSpreadsheet\Spreadsheet; +use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; use PhpOffice\PhpSpreadsheet\Writer\IWriter; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; @@ -84,7 +85,7 @@ class Sample foreach ($regex as $file) { $file = str_replace(str_replace('\\', '/', $baseDir) . '/', '', str_replace('\\', '/', $file[0])); $info = pathinfo($file); - $category = str_replace('_', ' ', $info['dirname']); + $category = str_replace('_', ' ', $info['dirname'] ?? ''); $name = str_replace('_', ' ', (string) preg_replace('/(|\.php)/', '', $info['filename'])); if (!in_array($category, ['.', 'boostrap', 'templates'])) { if (!isset($files[$category])) { @@ -182,6 +183,33 @@ class Sample echo date('H:i:s ') . $message . $eol; } + public function titles(string $category, string $functionName, ?string $description = null): void + { + $this->log(sprintf('%s Functions:', $category)); + $description === null + ? $this->log(sprintf('Function: %s()', rtrim($functionName, '()'))) + : $this->log(sprintf('Function: %s() - %s.', rtrim($functionName, '()'), rtrim($description, '.'))); + } + + public function displayGrid(array $matrix): void + { + $renderer = new TextGrid($matrix, $this->isCli()); + echo $renderer->render(); + } + + public function logCalculationResult( + Worksheet $worksheet, + string $functionName, + string $formulaCell, + ?string $descriptionCell = null + ): void { + if ($descriptionCell !== null) { + $this->log($worksheet->getCell($descriptionCell)->getValue()); + } + $this->log($worksheet->getCell($formulaCell)->getValue()); + $this->log(sprintf('%s() Result is ', $functionName) . $worksheet->getCell($formulaCell)->getCalculatedValue()); + } + /** * Log ending notes. */ diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/TextGrid.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/TextGrid.php new file mode 100644 index 000000000..acb9ae60e --- /dev/null +++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Helper/TextGrid.php @@ -0,0 +1,139 @@ +rows = array_keys($matrix); + $this->columns = array_keys($matrix[$this->rows[0]]); + + $matrix = array_values($matrix); + array_walk( + $matrix, + function (&$row): void { + $row = array_values($row); + } + ); + + $this->matrix = $matrix; + $this->isCli = $isCli; + } + + public function render(): string + { + $this->gridDisplay = $this->isCli ? '' : '
';
+
+ $maxRow = max($this->rows);
+ $maxRowLength = strlen((string) $maxRow) + 1;
+ $columnWidths = $this->getColumnWidths($this->matrix);
+
+ $this->renderColumnHeader($maxRowLength, $columnWidths);
+ $this->renderRows($maxRowLength, $columnWidths);
+ $this->renderFooter($maxRowLength, $columnWidths);
+
+ $this->gridDisplay .= $this->isCli ? '' : '';
+
+ return $this->gridDisplay;
+ }
+
+ private function renderRows(int $maxRowLength, array $columnWidths): void
+ {
+ foreach ($this->matrix as $row => $rowData) {
+ $this->gridDisplay .= '|' . str_pad((string) $this->rows[$row], $maxRowLength, ' ', STR_PAD_LEFT) . ' ';
+ $this->renderCells($rowData, $columnWidths);
+ $this->gridDisplay .= '|' . PHP_EOL;
+ }
+ }
+
+ private function renderCells(array $rowData, array $columnWidths): void
+ {
+ foreach ($rowData as $column => $cell) {
+ $cell = ($this->isCli) ? (string) $cell : htmlentities((string) $cell);
+ $this->gridDisplay .= '| ';
+ $this->gridDisplay .= str_pad($cell, $columnWidths[$column] + 1, ' ');
+ }
+ }
+
+ private function renderColumnHeader(int $maxRowLength, array $columnWidths): void
+ {
+ $this->gridDisplay .= str_repeat(' ', $maxRowLength + 2);
+ foreach ($this->columns as $column => $reference) {
+ $this->gridDisplay .= '+-' . str_repeat('-', $columnWidths[$column] + 1);
+ }
+ $this->gridDisplay .= '+' . PHP_EOL;
+
+ $this->gridDisplay .= str_repeat(' ', $maxRowLength + 2);
+ foreach ($this->columns as $column => $reference) {
+ $this->gridDisplay .= '| ' . str_pad((string) $reference, $columnWidths[$column] + 1, ' ');
+ }
+ $this->gridDisplay .= '|' . PHP_EOL;
+
+ $this->renderFooter($maxRowLength, $columnWidths);
+ }
+
+ private function renderFooter(int $maxRowLength, array $columnWidths): void
+ {
+ $this->gridDisplay .= '+' . str_repeat('-', $maxRowLength + 1);
+ foreach ($this->columns as $column => $reference) {
+ $this->gridDisplay .= '+-';
+ $this->gridDisplay .= str_pad((string) '', $columnWidths[$column] + 1, '-');
+ }
+ $this->gridDisplay .= '+' . PHP_EOL;
+ }
+
+ private function getColumnWidths(array $matrix): array
+ {
+ $columnCount = count($this->matrix, COUNT_RECURSIVE) / count($this->matrix);
+ $columnWidths = [];
+ for ($column = 0; $column < $columnCount; ++$column) {
+ $columnWidths[] = $this->getColumnWidth(array_column($this->matrix, $column));
+ }
+
+ return $columnWidths;
+ }
+
+ private function getColumnWidth(array $columnData): int
+ {
+ $columnWidth = 0;
+ $columnData = array_values($columnData);
+
+ foreach ($columnData as $columnValue) {
+ if (is_string($columnValue)) {
+ $columnWidth = max($columnWidth, strlen($columnValue));
+ } elseif (is_bool($columnValue)) {
+ $columnWidth = max($columnWidth, strlen($columnValue ? 'TRUE' : 'FALSE'));
+ }
+
+ $columnWidth = max($columnWidth, strlen((string) $columnWidth));
+ }
+
+ return $columnWidth;
+ }
+}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php
index ca087e615..1dcb0a125 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -363,7 +363,7 @@ class Gnumeric extends BaseReader
if ($sheet !== null && isset($sheet->MergedRegions)) {
foreach ($sheet->MergedRegions->Merge as $mergeCells) {
if (strpos((string) $mergeCells, ':') !== false) {
- $this->spreadsheet->getActiveSheet()->mergeCells($mergeCells);
+ $this->spreadsheet->getActiveSheet()->mergeCells($mergeCells, Worksheet::MERGE_CELL_CONTENT_HIDE);
}
}
}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php
index 3d859e15f..76f128e02 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Html.php
@@ -201,7 +201,7 @@ class Html extends BaseReader
/**
* Loads Spreadsheet from file.
*/
- protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
+ public function loadSpreadsheetFromFile(string $filename): Spreadsheet
{
// Create new Spreadsheet
$spreadsheet = new Spreadsheet();
@@ -651,7 +651,13 @@ class Html extends BaseReader
// Reload the HTML file into the DOM object
try {
$convert = $this->securityScanner->scanFile($filename);
- $loaded = $dom->loadHTML($convert);
+ $lowend = "\u{80}";
+ $highend = "\u{10ffff}";
+ $regexp = "/[$lowend-$highend]/u";
+ /** @var callable */
+ $callback = [self::class, 'replaceNonAscii'];
+ $convert = preg_replace_callback($regexp, $callback, $convert);
+ $loaded = ($convert === null) ? false : $dom->loadHTML($convert);
} catch (Throwable $e) {
$loaded = false;
}
@@ -662,6 +668,11 @@ class Html extends BaseReader
return $this->loadDocument($dom, $spreadsheet);
}
+ private static function replaceNonAscii(array $matches): string
+ {
+ return '&#' . mb_ord($matches[0], 'UTF-8') . ';';
+ }
+
/**
* Spreadsheet from content.
*
@@ -674,7 +685,13 @@ class Html extends BaseReader
// Reload the HTML file into the DOM object
try {
$convert = $this->securityScanner->scan($content);
- $loaded = $dom->loadHTML($convert);
+ $lowend = "\u{80}";
+ $highend = "\u{10ffff}";
+ $regexp = "/[$lowend-$highend]/u";
+ /** @var callable */
+ $callback = [self::class, 'replaceNonAscii'];
+ $convert = preg_replace_callback($regexp, $callback, $convert);
+ $loaded = ($convert === null) ? false : $dom->loadHTML($convert);
} catch (Throwable $e) {
$loaded = false;
}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php
index 7e776ab78..e3de47317 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Ods.php
@@ -20,6 +20,7 @@ use PhpOffice\PhpSpreadsheet\Shared\Date;
use PhpOffice\PhpSpreadsheet\Shared\File;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
use Throwable;
use XMLReader;
use ZipArchive;
@@ -759,7 +760,7 @@ class Ods extends BaseReader
}
$cellRange = $columnID . $rowID . ':' . $columnTo . $rowTo;
- $spreadsheet->getActiveSheet()->mergeCells($cellRange);
+ $spreadsheet->getActiveSheet()->mergeCells($cellRange, Worksheet::MERGE_CELL_CONTENT_HIDE);
}
}
}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
index 8155b838f..40008d01d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
@@ -52,7 +52,7 @@ class XmlScanner
public static function threadSafeLibxmlDisableEntityLoaderAvailability()
{
- if (PHP_MAJOR_VERSION == 7) {
+ if (PHP_MAJOR_VERSION === 7) {
switch (PHP_MINOR_VERSION) {
case 2:
return PHP_RELEASE_VERSION >= 1;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php
index 9f8a3ace9..a8de52282 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xls.php
@@ -4585,7 +4585,7 @@ class Xls extends BaseReader
(strpos($cellRangeAddress, ':') !== false) &&
($this->includeCellRangeFiltered($cellRangeAddress))
) {
- $this->phpSheet->mergeCells($cellRangeAddress);
+ $this->phpSheet->mergeCells($cellRangeAddress, Worksheet::MERGE_CELL_CONTENT_HIDE);
}
}
}
@@ -6999,7 +6999,7 @@ class Xls extends BaseReader
}
break;
- // Unknown cases // don't know how to deal with
+ // Unknown cases // don't know how to deal with
default:
throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php
index 52df94e4c..e2fae121b 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -31,6 +31,7 @@ use PhpOffice\PhpSpreadsheet\Shared\Font;
use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Font as StyleFont;
use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
use PhpOffice\PhpSpreadsheet\Style\Style;
use PhpOffice\PhpSpreadsheet\Worksheet\HeaderFooterDrawing;
@@ -293,7 +294,7 @@ class Xlsx extends BaseReader
return $worksheetInfo;
}
- private static function castToBoolean($c)
+ private static function castToBoolean(SimpleXMLElement $c): bool
{
$value = isset($c->v) ? (string) $c->v : null;
if ($value == '0') {
@@ -305,18 +306,25 @@ class Xlsx extends BaseReader
return (bool) $c->v;
}
- private static function castToError($c)
+ private static function castToError(?SimpleXMLElement $c): ?string
{
- return isset($c->v) ? (string) $c->v : null;
+ return isset($c, $c->v) ? (string) $c->v : null;
}
- private static function castToString($c)
+ private static function castToString(?SimpleXMLElement $c): ?string
{
- return isset($c->v) ? (string) $c->v : null;
+ return isset($c, $c->v) ? (string) $c->v : null;
}
- private function castToFormula($c, $r, &$cellDataType, &$value, &$calculatedValue, &$sharedFormulas, $castBaseType): void
+ /**
+ * @param mixed $value
+ * @param mixed $calculatedValue
+ */
+ private function castToFormula(?SimpleXMLElement $c, string $r, string &$cellDataType, &$value, &$calculatedValue, array &$sharedFormulas, string $castBaseType): void
{
+ if ($c === null) {
+ return;
+ }
$attr = $c->f->attributes();
$cellDataType = 'f';
$value = "={$c->f}";
@@ -389,7 +397,7 @@ class Xlsx extends BaseReader
$contents = $archive->getFromName(substr($fileName, 1), 0, ZipArchive::FL_NOCASE);
}
- return $contents;
+ return ($contents === false) ? '' : $contents;
}
/**
@@ -479,7 +487,7 @@ class Xlsx extends BaseReader
$propertyReader->readCustomProperties($this->getFromZipArchive($zip, $relTarget));
break;
- //Ribbon
+ //Ribbon
case Namespaces::EXTENSIBILITY:
$customUI = $relTarget;
if ($customUI) {
@@ -530,7 +538,7 @@ class Xlsx extends BaseReader
}
break;
- // a vbaProject ? (: some macros)
+ // a vbaProject ? (: some macros)
case Namespaces::VBA:
$macros = $ele['Target'];
@@ -906,7 +914,7 @@ class Xlsx extends BaseReader
foreach ($xmlSheet->mergeCells->mergeCell as $mergeCell) {
$mergeRef = (string) $mergeCell['ref'];
if (strpos($mergeRef, ':') !== false) {
- $docSheet->mergeCells((string) $mergeCell['ref']);
+ $docSheet->mergeCells((string) $mergeCell['ref'], Worksheet::MERGE_CELL_CONTENT_HIDE);
}
}
}
@@ -1143,7 +1151,7 @@ class Xlsx extends BaseReader
}
// Header/footer images
- if ($xmlSheet && $xmlSheet->legacyDrawingHF && !$this->readDataOnly) {
+ if ($xmlSheet && $xmlSheet->legacyDrawingHF) {
if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
$relsWorksheet = $this->loadZipNoNamespace(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels', Namespaces::RELATIONSHIPS);
$vmlRelationship = '';
@@ -1550,7 +1558,7 @@ class Xlsx extends BaseReader
break;
case '_xlnm.Print_Area':
- $rangeSets = preg_split("/('?(?:.*?)'?(?:![A-Z0-9]+:[A-Z0-9]+)),?/", $extractedRange, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+ $rangeSets = preg_split("/('?(?:.*?)'?(?:![A-Z0-9]+:[A-Z0-9]+)),?/", $extractedRange, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) ?: [];
$newRangeSets = [];
foreach ($rangeSets as $rangeSet) {
[, $rangeSet] = Worksheet::extractSheetTitle($rangeSet, true);
@@ -1605,7 +1613,7 @@ class Xlsx extends BaseReader
if (strpos((string) $definedName, '!') !== false) {
$range[0] = str_replace("''", "'", $range[0]);
$range[0] = str_replace("'", '', $range[0]);
- if ($worksheet = $excel->getSheetByName($range[0])) {
+ if ($worksheet = $excel->getSheetByName($range[0])) { // @phpstan-ignore-line
$excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $worksheet, $extractedRange, true, $scope));
} else {
$excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $scope, $extractedRange, true, $scope));
@@ -1626,7 +1634,7 @@ class Xlsx extends BaseReader
// Need to split on a comma or a space if not in quotes, and extract the first part.
$definedNameValueParts = preg_split("/[ ,](?=([^']*'[^']*')*[^']*$)/miuU", $definedRange);
// Extract sheet name
- [$extractedSheetName] = Worksheet::extractSheetTitle((string) $definedNameValueParts[0], true);
+ [$extractedSheetName] = Worksheet::extractSheetTitle((string) $definedNameValueParts[0], true); // @phpstan-ignore-line
$extractedSheetName = trim($extractedSheetName, "'");
// Locate sheet
@@ -1673,7 +1681,7 @@ class Xlsx extends BaseReader
if (isset($charts[$chartEntryRef])) {
$chartPositionRef = $charts[$chartEntryRef]['sheet'] . '!' . $charts[$chartEntryRef]['id'];
if (isset($chartDetails[$chartPositionRef])) {
- $excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart);
+ $excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart); // @phpstan-ignore-line
$objChart->setWorksheet($excel->getSheetByName($charts[$chartEntryRef]['sheet']));
// For oneCellAnchor or absoluteAnchor positioned charts,
// toCoordinate is not in the data. Does it need to be calculated?
@@ -1695,7 +1703,7 @@ class Xlsx extends BaseReader
break;
- // unparsed
+ // unparsed
case 'application/vnd.ms-excel.controlproperties+xml':
$unparsedLoadedData['override_content_types'][(string) $contentType['PartName']] = (string) $contentType['ContentType'];
@@ -1722,28 +1730,28 @@ class Xlsx extends BaseReader
$value->createText(StringHelper::controlCharacterOOXML2PHP((string) $is->t));
} else {
if (is_object($is->r)) {
-
/** @var SimpleXMLElement $run */
foreach ($is->r as $run) {
if (!isset($run->rPr)) {
$value->createText(StringHelper::controlCharacterOOXML2PHP((string) $run->t));
} else {
$objText = $value->createTextRun(StringHelper::controlCharacterOOXML2PHP((string) $run->t));
+ $objFont = $objText->getFont() ?? new StyleFont();
if (isset($run->rPr->rFont)) {
$attr = $run->rPr->rFont->attributes();
if (isset($attr['val'])) {
- $objText->getFont()->setName((string) $attr['val']);
+ $objFont->setName((string) $attr['val']);
}
}
if (isset($run->rPr->sz)) {
$attr = $run->rPr->sz->attributes();
if (isset($attr['val'])) {
- $objText->getFont()->setSize((float) $attr['val']);
+ $objFont->setSize((float) $attr['val']);
}
}
if (isset($run->rPr->color)) {
- $objText->getFont()->setColor(new Color($this->styleReader->readColor($run->rPr->color)));
+ $objFont->setColor(new Color($this->styleReader->readColor($run->rPr->color)));
}
if (isset($run->rPr->b)) {
$attr = $run->rPr->b->attributes();
@@ -1751,7 +1759,7 @@ class Xlsx extends BaseReader
(isset($attr['val']) && self::boolean((string) $attr['val'])) ||
(!isset($attr['val']))
) {
- $objText->getFont()->setBold(true);
+ $objFont->setBold(true);
}
}
if (isset($run->rPr->i)) {
@@ -1760,7 +1768,7 @@ class Xlsx extends BaseReader
(isset($attr['val']) && self::boolean((string) $attr['val'])) ||
(!isset($attr['val']))
) {
- $objText->getFont()->setItalic(true);
+ $objFont->setItalic(true);
}
}
if (isset($run->rPr->vertAlign)) {
@@ -1768,19 +1776,19 @@ class Xlsx extends BaseReader
if (isset($attr['val'])) {
$vertAlign = strtolower((string) $attr['val']);
if ($vertAlign == 'superscript') {
- $objText->getFont()->setSuperscript(true);
+ $objFont->setSuperscript(true);
}
if ($vertAlign == 'subscript') {
- $objText->getFont()->setSubscript(true);
+ $objFont->setSubscript(true);
}
}
}
if (isset($run->rPr->u)) {
$attr = $run->rPr->u->attributes();
if (!isset($attr['val'])) {
- $objText->getFont()->setUnderline(\PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE);
+ $objFont->setUnderline(\PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE);
} else {
- $objText->getFont()->setUnderline((string) $attr['val']);
+ $objFont->setUnderline((string) $attr['val']);
}
}
if (isset($run->rPr->strike)) {
@@ -1789,7 +1797,7 @@ class Xlsx extends BaseReader
(isset($attr['val']) && self::boolean((string) $attr['val'])) ||
(!isset($attr['val']))
) {
- $objText->getFont()->setStrikethrough(true);
+ $objFont->setStrikethrough(true);
}
}
}
@@ -1842,17 +1850,30 @@ class Xlsx extends BaseReader
}
}
+ /**
+ * @param null|array|bool|SimpleXMLElement $array
+ * @param int|string $key
+ *
+ * @return mixed
+ */
private static function getArrayItem($array, $key = 0)
{
- return $array[$key] ?? null;
+ return ($array === null || is_bool($array)) ? null : ($array[$key] ?? null);
}
+ /**
+ * @param null|SimpleXMLElement|string $base
+ * @param null|SimpleXMLElement|string $add
+ */
private static function dirAdd($base, $add): string
{
+ $base = (string) $base;
+ $add = (string) $add;
+
return (string) preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
}
- private static function toCSSArray($style): array
+ private static function toCSSArray(string $style): array
{
$style = self::stripWhiteSpaceFromStyleString($style);
@@ -1866,15 +1887,15 @@ class Xlsx extends BaseReader
}
if (strpos($item[1], 'pt') !== false) {
$item[1] = str_replace('pt', '', $item[1]);
- $item[1] = Font::fontSizeToPixels($item[1]);
+ $item[1] = (string) Font::fontSizeToPixels((int) $item[1]);
}
if (strpos($item[1], 'in') !== false) {
$item[1] = str_replace('in', '', $item[1]);
- $item[1] = Font::inchSizeToPixels($item[1]);
+ $item[1] = (string) Font::inchSizeToPixels((int) $item[1]);
}
if (strpos($item[1], 'cm') !== false) {
$item[1] = str_replace('cm', '', $item[1]);
- $item[1] = Font::centimeterSizeToPixels($item[1]);
+ $item[1] = (string) Font::centimeterSizeToPixels((int) $item[1]);
}
$style[$item[0]] = $item[1];
@@ -1883,11 +1904,14 @@ class Xlsx extends BaseReader
return $style;
}
- public static function stripWhiteSpaceFromStyleString($string): string
+ public static function stripWhiteSpaceFromStyleString(string $string): string
{
return trim(str_replace(["\r", "\n", ' '], '', $string), ';');
}
+ /**
+ * @param mixed $value
+ */
private static function boolean($value): bool
{
if (is_object($value)) {
@@ -1956,7 +1980,7 @@ class Xlsx extends BaseReader
return $returnValue;
}
- private function readFormControlProperties(Spreadsheet $excel, $dir, $fileWorksheet, $docSheet, array &$unparsedLoadedData): void
+ private function readFormControlProperties(Spreadsheet $excel, string $dir, string $fileWorksheet, Worksheet $docSheet, array &$unparsedLoadedData): void
{
$zip = $this->zip;
if (!$zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
@@ -1983,7 +2007,7 @@ class Xlsx extends BaseReader
unset($unparsedCtrlProps);
}
- private function readPrinterSettings(Spreadsheet $excel, $dir, $fileWorksheet, $docSheet, array &$unparsedLoadedData): void
+ private function readPrinterSettings(Spreadsheet $excel, string $dir, string $fileWorksheet, Worksheet $docSheet, array &$unparsedLoadedData): void
{
$zip = $this->zip;
if (!$zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
@@ -2071,7 +2095,7 @@ class Xlsx extends BaseReader
if ($xmlSheet && $xmlSheet->autoFilter) {
// In older files, autofilter structure is defined in the worksheet file
(new AutoFilter($docSheet, $xmlSheet))->load();
- } elseif ($xmlSheet && $xmlSheet->tableParts && $xmlSheet->tableParts['count'] > 0) {
+ } elseif ($xmlSheet && $xmlSheet->tableParts && (int) $xmlSheet->tableParts['count'] > 0) {
// But for Office365, MS decided to make it all just a bit more complicated
$this->readAutoFilterTablesInTablesFile($xmlSheet, $dir, $fileWorksheet, $zip, $docSheet);
}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
index 374da9f63..39328adb8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
@@ -9,8 +9,10 @@ use SimpleXMLElement;
class AutoFilter
{
+ /** @var Worksheet */
private $worksheet;
+ /** @var SimpleXMLElement */
private $worksheetXml;
public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml)
@@ -28,7 +30,7 @@ class AutoFilter
}
}
- private function readAutoFilter($autoFilterRange, $xmlSheet): void
+ private function readAutoFilter(string $autoFilterRange, SimpleXMLElement $xmlSheet): void
{
$autoFilter = $this->worksheet->getAutoFilter();
$autoFilter->setRange($autoFilterRange);
@@ -39,15 +41,15 @@ class AutoFilter
if ($filterColumn->filters) {
$column->setFilterType(Column::AUTOFILTER_FILTERTYPE_FILTER);
$filters = $filterColumn->filters;
- if ((isset($filters['blank'])) && ($filters['blank'] == 1)) {
+ if ((isset($filters['blank'])) && ((int) $filters['blank'] == 1)) {
// Operator is undefined, but always treated as EQUAL
- $column->createRule()->setRule(null, '')->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
+ $column->createRule()->setRule('', '')->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
}
// Standard filters are always an OR join, so no join rule needs to be set
// Entries can be either filter elements
foreach ($filters->filter as $filterRule) {
// Operator is undefined, but always treated as EQUAL
- $column->createRule()->setRule(null, (string) $filterRule['val'])->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
+ $column->createRule()->setRule('', (string) $filterRule['val'])->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
}
// Or Date Group elements
@@ -69,7 +71,7 @@ class AutoFilter
foreach ($filters->dateGroupItem as $dateGroupItem) {
// Operator is undefined, but always treated as EQUAL
$column->createRule()->setRule(
- null,
+ '',
[
'year' => (string) $dateGroupItem['year'],
'month' => (string) $dateGroupItem['month'],
@@ -83,9 +85,9 @@ class AutoFilter
}
}
- private function readCustomAutoFilter(SimpleXMLElement $filterColumn, Column $column): void
+ private function readCustomAutoFilter(?SimpleXMLElement $filterColumn, Column $column): void
{
- if ($filterColumn->customFilters) {
+ if (isset($filterColumn, $filterColumn->customFilters)) {
$column->setFilterType(Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER);
$customFilters = $filterColumn->customFilters;
// Custom filters can an AND or an OR join;
@@ -102,15 +104,15 @@ class AutoFilter
}
}
- private function readDynamicAutoFilter(SimpleXMLElement $filterColumn, Column $column): void
+ private function readDynamicAutoFilter(?SimpleXMLElement $filterColumn, Column $column): void
{
- if ($filterColumn->dynamicFilter) {
+ if (isset($filterColumn, $filterColumn->dynamicFilter)) {
$column->setFilterType(Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER);
// We should only ever have one dynamic filter
foreach ($filterColumn->dynamicFilter as $filterRule) {
// Operator is undefined, but always treated as EQUAL
$column->createRule()->setRule(
- null,
+ '',
(string) $filterRule['val'],
(string) $filterRule['type']
)->setRuleType(Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
@@ -124,9 +126,9 @@ class AutoFilter
}
}
- private function readTopTenAutoFilter(SimpleXMLElement $filterColumn, Column $column): void
+ private function readTopTenAutoFilter(?SimpleXMLElement $filterColumn, Column $column): void
{
- if ($filterColumn->top10) {
+ if (isset($filterColumn, $filterColumn->top10)) {
$column->setFilterType(Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER);
// We should only ever have one top10 filter
foreach ($filterColumn->top10 as $filterRule) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
index 1679f01f9..2f1464582 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
@@ -4,7 +4,10 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
class BaseParserClass
{
- protected static function boolean($value)
+ /**
+ * @param mixed $value
+ */
+ protected static function boolean($value): bool
{
if (is_object($value)) {
$value = (string) $value;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
index cf77a7f25..c22334cac 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
@@ -11,8 +11,10 @@ use PhpOffice\PhpSpreadsheet\Chart\GridLines;
use PhpOffice\PhpSpreadsheet\Chart\Layout;
use PhpOffice\PhpSpreadsheet\Chart\Legend;
use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
-use PhpOffice\PhpSpreadsheet\Chart\Properties;
+use PhpOffice\PhpSpreadsheet\Chart\Properties as ChartProperties;
use PhpOffice\PhpSpreadsheet\Chart\Title;
+use PhpOffice\PhpSpreadsheet\Chart\TrendLine;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
use PhpOffice\PhpSpreadsheet\RichText\RichText;
use PhpOffice\PhpSpreadsheet\Style\Font;
use SimpleXMLElement;
@@ -72,12 +74,34 @@ class Chart
$rotX = $rotY = $rAngAx = $perspective = null;
$xAxis = new Axis();
$yAxis = new Axis();
+ $autoTitleDeleted = null;
+ $chartNoFill = false;
+ $gradientArray = [];
+ $gradientLin = null;
+ $roundedCorners = false;
foreach ($chartElementsC as $chartElementKey => $chartElement) {
switch ($chartElementKey) {
+ case 'spPr':
+ $possibleNoFill = $chartElementsC->spPr->children($this->aNamespace);
+ if (isset($possibleNoFill->noFill)) {
+ $chartNoFill = true;
+ }
+
+ break;
+ case 'roundedCorners':
+ /** @var bool */
+ $roundedCorners = self::getAttribute($chartElementsC->roundedCorners, 'val', 'boolean');
+
+ break;
case 'chart':
foreach ($chartElement as $chartDetailsKey => $chartDetails) {
- $chartDetailsC = $chartDetails->children($this->cNamespace);
+ $chartDetails = Xlsx::testSimpleXml($chartDetails);
switch ($chartDetailsKey) {
+ case 'autoTitleDeleted':
+ /** @var bool */
+ $autoTitleDeleted = self::getAttribute($chartElementsC->chart->autoTitleDeleted, 'val', 'boolean');
+
+ break;
case 'view3D':
$rotX = self::getAttribute($chartDetails->rotX, 'val', 'integer');
$rotY = self::getAttribute($chartDetails->rotY, 'val', 'integer');
@@ -89,18 +113,42 @@ class Chart
$plotAreaLayout = $XaxisLabel = $YaxisLabel = null;
$plotSeries = $plotAttributes = [];
$catAxRead = false;
+ $plotNoFill = false;
foreach ($chartDetails as $chartDetailKey => $chartDetail) {
+ $chartDetail = Xlsx::testSimpleXml($chartDetail);
switch ($chartDetailKey) {
+ case 'spPr':
+ $possibleNoFill = $chartDetails->spPr->children($this->aNamespace);
+ if (isset($possibleNoFill->noFill)) {
+ $plotNoFill = true;
+ }
+ if (isset($possibleNoFill->gradFill->gsLst)) {
+ foreach ($possibleNoFill->gradFill->gsLst->gs as $gradient) {
+ $gradient = Xlsx::testSimpleXml($gradient);
+ /** @var float */
+ $pos = self::getAttribute($gradient, 'pos', 'float');
+ $gradientArray[] = [
+ $pos / ChartProperties::PERCENTAGE_MULTIPLIER,
+ new ChartColor($this->readColor($gradient)),
+ ];
+ }
+ }
+ if (isset($possibleNoFill->gradFill->lin)) {
+ $gradientLin = ChartProperties::XmlToAngle((string) self::getAttribute($possibleNoFill->gradFill->lin, 'ang', 'string'));
+ }
+
+ break;
case 'layout':
$plotAreaLayout = $this->chartLayoutDetails($chartDetail);
break;
- case 'catAx':
+ case Axis::AXIS_TYPE_CATEGORY:
+ case Axis::AXIS_TYPE_DATE:
$catAxRead = true;
if (isset($chartDetail->title)) {
$XaxisLabel = $this->chartTitle($chartDetail->title->children($this->cNamespace));
}
- $xAxis->setAxisType('catAx');
+ $xAxis->setAxisType($chartDetailKey);
$this->readEffects($chartDetail, $xAxis);
if (isset($chartDetail->spPr)) {
$sppr = $chartDetail->spPr->children($this->aNamespace);
@@ -129,13 +177,7 @@ class Chart
$this->setAxisProperties($chartDetail, $xAxis);
break;
- case 'dateAx':
- if (isset($chartDetail->title)) {
- $XaxisLabel = $this->chartTitle($chartDetail->title->children($this->cNamespace));
- }
-
- break;
- case 'valAx':
+ case Axis::AXIS_TYPE_VALUE:
$whichAxis = null;
$axPos = null;
if (isset($chartDetail->axPos)) {
@@ -228,7 +270,7 @@ class Chart
case 'doughnutChart':
case 'pieChart':
case 'pie3DChart':
- $explosion = isset($chartDetail->ser->explosion);
+ $explosion = self::getAttribute($chartDetail->ser->explosion, 'val', 'string');
$plotSer = $this->chartDataSeries($chartDetail, $chartDetailKey);
$plotSer->setPlotStyle("$explosion");
$plotSeries[] = $plotSer;
@@ -272,7 +314,7 @@ class Chart
break;
case 'stockChart':
$plotSeries[] = $this->chartDataSeries($chartDetail, $chartDetailKey);
- $plotAttributes = $this->readChartAttributes($plotAreaLayout);
+ $plotAttributes = $this->readChartAttributes($chartDetail);
break;
}
@@ -282,6 +324,12 @@ class Chart
}
$plotArea = new PlotArea($plotAreaLayout, $plotSeries);
$this->setChartAttributes($plotAreaLayout, $plotAttributes);
+ if ($plotNoFill) {
+ $plotArea->setNoFill(true);
+ }
+ if (!empty($gradientArray)) {
+ $plotArea->setGradientFillProperties($gradientArray, $gradientLin);
+ }
break;
case 'plotVisOnly':
@@ -301,6 +349,7 @@ class Chart
$legendLayout = null;
$legendOverlay = false;
foreach ($chartDetails as $chartDetailKey => $chartDetail) {
+ $chartDetail = Xlsx::testSimpleXml($chartDetail);
switch ($chartDetailKey) {
case 'legendPos':
$legendPos = self::getAttribute($chartDetail, 'val', 'string');
@@ -324,6 +373,13 @@ class Chart
}
}
$chart = new \PhpOffice\PhpSpreadsheet\Chart\Chart($chartName, $title, $legend, $plotArea, $plotVisOnly, (string) $dispBlanksAs, $XaxisLabel, $YaxisLabel, $xAxis, $yAxis);
+ if ($chartNoFill) {
+ $chart->setNoFill(true);
+ }
+ $chart->setRoundedCorners($roundedCorners);
+ if (is_bool($autoTitleDeleted)) {
+ $chart->setAutoTitleDeleted($autoTitleDeleted);
+ }
if (is_int($rotX)) {
$chart->setRotX($rotX);
}
@@ -345,14 +401,24 @@ class Chart
$caption = [];
$titleLayout = null;
foreach ($titleDetails as $titleDetailKey => $chartDetail) {
+ $chartDetail = Xlsx::testSimpleXml($chartDetail);
switch ($titleDetailKey) {
case 'tx':
- $titleDetails = $chartDetail->rich->children($this->aNamespace);
- foreach ($titleDetails as $titleKey => $titleDetail) {
- switch ($titleKey) {
- case 'p':
- $titleDetailPart = $titleDetail->children($this->aNamespace);
- $caption[] = $this->parseRichText($titleDetailPart);
+ if (isset($chartDetail->rich)) {
+ $titleDetails = $chartDetail->rich->children($this->aNamespace);
+ foreach ($titleDetails as $titleKey => $titleDetail) {
+ $titleDetail = Xlsx::testSimpleXml($titleDetail);
+ switch ($titleKey) {
+ case 'p':
+ $titleDetailPart = $titleDetail->children($this->aNamespace);
+ $caption[] = $this->parseRichText($titleDetailPart);
+ }
+ }
+ } elseif (isset($chartDetail->strRef->strCache)) {
+ foreach ($chartDetail->strRef->strCache->pt as $pt) {
+ if (isset($pt->v)) {
+ $caption[] = (string) $pt->v;
+ }
}
}
@@ -378,6 +444,7 @@ class Chart
}
$layout = [];
foreach ($details as $detailKey => $detail) {
+ $detail = Xlsx::testSimpleXml($detail);
$layout[$detailKey] = self::getAttribute($detail, 'val', 'string');
}
@@ -404,12 +471,14 @@ class Chart
$pointSize = null;
$noFill = false;
$bubble3D = false;
- $dPtColors = [];
+ $dptColors = [];
$markerFillColor = null;
$markerBorderColor = null;
$lineStyle = null;
$labelLayout = null;
+ $trendLines = [];
foreach ($seriesDetails as $seriesKey => $seriesDetail) {
+ $seriesDetail = Xlsx::testSimpleXml($seriesDetail);
switch ($seriesKey) {
case 'idx':
$seriesIndex = self::getAttribute($seriesDetail, 'val', 'integer');
@@ -426,7 +495,6 @@ class Chart
break;
case 'spPr':
$children = $seriesDetail->children($this->aNamespace);
- $ln = $children->ln;
if (isset($children->ln)) {
$ln = $children->ln;
if (is_countable($ln->noFill) && count($ln->noFill) === 1) {
@@ -456,6 +524,41 @@ class Chart
}
}
+ break;
+ case 'trendline':
+ $trendLine = new TrendLine();
+ $this->readLineStyle($seriesDetail, $trendLine);
+ /** @var ?string */
+ $trendLineType = self::getAttribute($seriesDetail->trendlineType, 'val', 'string');
+ /** @var ?bool */
+ $dispRSqr = self::getAttribute($seriesDetail->dispRSqr, 'val', 'boolean');
+ /** @var ?bool */
+ $dispEq = self::getAttribute($seriesDetail->dispEq, 'val', 'boolean');
+ /** @var ?int */
+ $order = self::getAttribute($seriesDetail->order, 'val', 'integer');
+ /** @var ?int */
+ $period = self::getAttribute($seriesDetail->period, 'val', 'integer');
+ /** @var ?float */
+ $forward = self::getAttribute($seriesDetail->forward, 'val', 'float');
+ /** @var ?float */
+ $backward = self::getAttribute($seriesDetail->backward, 'val', 'float');
+ /** @var ?float */
+ $intercept = self::getAttribute($seriesDetail->intercept, 'val', 'float');
+ /** @var ?string */
+ $name = (string) $seriesDetail->name;
+ $trendLine->setTrendLineProperties(
+ $trendLineType,
+ $order,
+ $period,
+ $dispRSqr,
+ $dispEq,
+ $backward,
+ $forward,
+ $intercept,
+ $name
+ );
+ $trendLines[] = $trendLine;
+
break;
case 'marker':
$marker = self::getAttribute($seriesDetail->symbol, 'val', 'string');
@@ -594,6 +697,17 @@ class Chart
$seriesValues[$seriesIndex]->setSmoothLine(true);
}
}
+ if (!empty($trendLines)) {
+ if (isset($seriesLabel[$seriesIndex])) {
+ $seriesLabel[$seriesIndex]->setTrendLines($trendLines);
+ }
+ if (isset($seriesCategory[$seriesIndex])) {
+ $seriesCategory[$seriesIndex]->setTrendLines($trendLines);
+ }
+ if (isset($seriesValues[$seriesIndex])) {
+ $seriesValues[$seriesIndex]->setTrendLines($trendLines);
+ }
+ }
}
}
/** @phpstan-ignore-next-line */
@@ -677,6 +791,7 @@ class Chart
$pointCount = 0;
foreach ($seriesValueSet as $seriesValueIdx => $seriesValue) {
+ $seriesValue = Xlsx::testSimpleXml($seriesValue);
switch ($seriesValueIdx) {
case 'ptCount':
$pointCount = self::getAttribute($seriesValue, 'val', 'integer');
@@ -749,7 +864,6 @@ class Chart
private function parseRichText(SimpleXMLElement $titleDetailPart): RichText
{
$value = new RichText();
- $objText = null;
$defaultFontSize = null;
$defaultBold = null;
$defaultItalic = null;
@@ -961,12 +1075,19 @@ class Chart
}
/**
- * @param null|Layout|SimpleXMLElement $chartDetail
+ * @param ?SimpleXMLElement $chartDetail
*/
private function readChartAttributes($chartDetail): array
{
$plotAttributes = [];
if (isset($chartDetail->dLbls)) {
+ if (isset($chartDetail->dLbls->dLblPos)) {
+ $plotAttributes['dLblPos'] = self::getAttribute($chartDetail->dLbls->dLblPos, 'val', 'string');
+ }
+ if (isset($chartDetail->dLbls->numFmt)) {
+ $plotAttributes['numFmtCode'] = self::getAttribute($chartDetail->dLbls->numFmt, 'formatCode', 'string');
+ $plotAttributes['numFmtLinked'] = self::getAttribute($chartDetail->dLbls->numFmt, 'sourceLinked', 'boolean');
+ }
if (isset($chartDetail->dLbls->showLegendKey)) {
$plotAttributes['showLegendKey'] = self::getAttribute($chartDetail->dLbls->showLegendKey, 'val', 'string');
}
@@ -1047,7 +1168,7 @@ class Chart
}
}
- private function readEffects(SimpleXMLElement $chartDetail, ?Properties $chartObject): void
+ private function readEffects(SimpleXMLElement $chartDetail, ?ChartProperties $chartObject): void
{
if (!isset($chartObject, $chartDetail->spPr)) {
return;
@@ -1055,7 +1176,7 @@ class Chart
$sppr = $chartDetail->spPr->children($this->aNamespace);
if (isset($sppr->effectLst->glow)) {
- $axisGlowSize = (float) self::getAttribute($sppr->effectLst->glow, 'rad', 'integer') / Properties::POINTS_WIDTH_MULTIPLIER;
+ $axisGlowSize = (float) self::getAttribute($sppr->effectLst->glow, 'rad', 'integer') / ChartProperties::POINTS_WIDTH_MULTIPLIER;
if ($axisGlowSize != 0.0) {
$colorArray = $this->readColor($sppr->effectLst->glow);
$chartObject->setGlowProperties($axisGlowSize, $colorArray['value'], $colorArray['alpha'], $colorArray['type']);
@@ -1066,7 +1187,7 @@ class Chart
/** @var string */
$softEdgeSize = self::getAttribute($sppr->effectLst->softEdge, 'rad', 'string');
if (is_numeric($softEdgeSize)) {
- $chartObject->setSoftEdges((float) Properties::xmlToPoints($softEdgeSize));
+ $chartObject->setSoftEdges((float) ChartProperties::xmlToPoints($softEdgeSize));
}
}
@@ -1081,20 +1202,20 @@ class Chart
if ($type !== '') {
/** @var string */
$blur = self::getAttribute($sppr->effectLst->$type, 'blurRad', 'string');
- $blur = is_numeric($blur) ? Properties::xmlToPoints($blur) : null;
+ $blur = is_numeric($blur) ? ChartProperties::xmlToPoints($blur) : null;
/** @var string */
$dist = self::getAttribute($sppr->effectLst->$type, 'dist', 'string');
- $dist = is_numeric($dist) ? Properties::xmlToPoints($dist) : null;
+ $dist = is_numeric($dist) ? ChartProperties::xmlToPoints($dist) : null;
/** @var string */
$direction = self::getAttribute($sppr->effectLst->$type, 'dir', 'string');
- $direction = is_numeric($direction) ? Properties::xmlToAngle($direction) : null;
+ $direction = is_numeric($direction) ? ChartProperties::xmlToAngle($direction) : null;
$algn = self::getAttribute($sppr->effectLst->$type, 'algn', 'string');
$rot = self::getAttribute($sppr->effectLst->$type, 'rotWithShape', 'string');
$size = [];
foreach (['sx', 'sy'] as $sizeType) {
$sizeValue = self::getAttribute($sppr->effectLst->$type, $sizeType, 'string');
if (is_numeric($sizeValue)) {
- $size[$sizeType] = Properties::xmlToTenthOfPercent((string) $sizeValue);
+ $size[$sizeType] = ChartProperties::xmlToTenthOfPercent((string) $sizeValue);
} else {
$size[$sizeType] = null;
}
@@ -1102,7 +1223,7 @@ class Chart
foreach (['kx', 'ky'] as $sizeType) {
$sizeValue = self::getAttribute($sppr->effectLst->$type, $sizeType, 'string');
if (is_numeric($sizeValue)) {
- $size[$sizeType] = Properties::xmlToAngle((string) $sizeValue);
+ $size[$sizeType] = ChartProperties::xmlToAngle((string) $sizeValue);
} else {
$size[$sizeType] = null;
}
@@ -1131,6 +1252,7 @@ class Chart
'type' => null,
'value' => null,
'alpha' => null,
+ 'brightness' => null,
];
foreach (ChartColor::EXCEL_COLOR_TYPES as $type) {
if (isset($colorXml->$type)) {
@@ -1143,6 +1265,13 @@ class Chart
$result['alpha'] = ChartColor::alphaFromXml($alpha);
}
}
+ if (isset($colorXml->$type->lumMod)) {
+ /** @var string */
+ $brightness = self::getAttribute($colorXml->$type->lumMod, 'val', 'string');
+ if (is_numeric($brightness)) {
+ $result['brightness'] = ChartColor::alphaFromXml($brightness);
+ }
+ }
break;
}
@@ -1151,7 +1280,7 @@ class Chart
return $result;
}
- private function readLineStyle(SimpleXMLElement $chartDetail, ?Properties $chartObject): void
+ private function readLineStyle(SimpleXMLElement $chartDetail, ?ChartProperties $chartObject): void
{
if (!isset($chartObject, $chartDetail->spPr)) {
return;
@@ -1165,7 +1294,7 @@ class Chart
/** @var string */
$lineWidthTemp = self::getAttribute($sppr->ln, 'w', 'string');
if (is_numeric($lineWidthTemp)) {
- $lineWidth = Properties::xmlToPoints($lineWidthTemp);
+ $lineWidth = ChartProperties::xmlToPoints($lineWidthTemp);
}
/** @var string */
$compoundType = self::getAttribute($sppr->ln, 'cmpd', 'string');
@@ -1174,15 +1303,13 @@ class Chart
/** @var string */
$capType = self::getAttribute($sppr->ln, 'cap', 'string');
if (isset($sppr->ln->miter)) {
- $joinType = Properties::LINE_STYLE_JOIN_MITER;
+ $joinType = ChartProperties::LINE_STYLE_JOIN_MITER;
} elseif (isset($sppr->ln->bevel)) {
- $joinType = Properties::LINE_STYLE_JOIN_BEVEL;
+ $joinType = ChartProperties::LINE_STYLE_JOIN_BEVEL;
} else {
$joinType = '';
}
- $headArrowType = '';
$headArrowSize = '';
- $endArrowType = '';
$endArrowSize = '';
/** @var string */
$headArrowType = self::getAttribute($sppr->ln->headEnd, 'type', 'string');
@@ -1220,6 +1347,9 @@ class Chart
if (!isset($whichAxis)) {
return;
}
+ if (isset($chartDetail->delete)) {
+ $whichAxis->setAxisOption('hidden', (string) self::getAttribute($chartDetail->delete, 'val', 'string'));
+ }
if (isset($chartDetail->numFmt)) {
$whichAxis->setAxisNumberProperties(
(string) self::getAttribute($chartDetail->numFmt, 'formatCode', 'string'),
@@ -1263,5 +1393,24 @@ class Chart
if (isset($chartDetail->minorUnit)) {
$whichAxis->setAxisOption('minor_unit', (string) self::getAttribute($chartDetail->minorUnit, 'val', 'string'));
}
+ if (isset($chartDetail->baseTimeUnit)) {
+ $whichAxis->setAxisOption('baseTimeUnit', (string) self::getAttribute($chartDetail->baseTimeUnit, 'val', 'string'));
+ }
+ if (isset($chartDetail->majorTimeUnit)) {
+ $whichAxis->setAxisOption('majorTimeUnit', (string) self::getAttribute($chartDetail->majorTimeUnit, 'val', 'string'));
+ }
+ if (isset($chartDetail->minorTimeUnit)) {
+ $whichAxis->setAxisOption('minorTimeUnit', (string) self::getAttribute($chartDetail->minorTimeUnit, 'val', 'string'));
+ }
+ if (isset($chartDetail->txPr)) {
+ $children = $chartDetail->txPr->children($this->aNamespace);
+ if (isset($children->bodyPr)) {
+ /** @var string */
+ $textRotation = self::getAttribute($children->bodyPr, 'rot', 'string');
+ if (is_numeric($textRotation)) {
+ $whichAxis->setAxisOption('textRotation', (string) ChartProperties::xmlToAngle($textRotation));
+ }
+ }
+ }
}
}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
index 2a1e2afd8..347057338 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
@@ -10,8 +10,10 @@ use SimpleXMLElement;
class ColumnAndRowAttributes extends BaseParserClass
{
+ /** @var Worksheet */
private $worksheet;
+ /** @var ?SimpleXMLElement */
private $worksheetXml;
public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
@@ -120,7 +122,7 @@ class ColumnAndRowAttributes extends BaseParserClass
}
}
- private function isFilteredColumn(IReadFilter $readFilter, $columnCoordinate, array $rowsAttributes)
+ private function isFilteredColumn(IReadFilter $readFilter, string $columnCoordinate, array $rowsAttributes): bool
{
foreach ($rowsAttributes as $rowCoordinate => $rowAttributes) {
if (!$readFilter->readCell($columnCoordinate, $rowCoordinate, $this->worksheet->getTitle())) {
@@ -131,7 +133,7 @@ class ColumnAndRowAttributes extends BaseParserClass
return false;
}
- private function readColumnAttributes(SimpleXMLElement $worksheetCols, $readDataOnly)
+ private function readColumnAttributes(SimpleXMLElement $worksheetCols, bool $readDataOnly): array
{
$columnAttributes = [];
@@ -151,7 +153,7 @@ class ColumnAndRowAttributes extends BaseParserClass
return $columnAttributes;
}
- private function readColumnRangeAttributes(SimpleXMLElement $column, $readDataOnly)
+ private function readColumnRangeAttributes(SimpleXMLElement $column, bool $readDataOnly): array
{
$columnAttributes = [];
@@ -172,7 +174,7 @@ class ColumnAndRowAttributes extends BaseParserClass
return $columnAttributes;
}
- private function isFilteredRow(IReadFilter $readFilter, $rowCoordinate, array $columnsAttributes)
+ private function isFilteredRow(IReadFilter $readFilter, int $rowCoordinate, array $columnsAttributes): bool
{
foreach ($columnsAttributes as $columnCoordinate => $columnAttributes) {
if (!$readFilter->readCell($columnCoordinate, $rowCoordinate, $this->worksheet->getTitle())) {
@@ -183,7 +185,7 @@ class ColumnAndRowAttributes extends BaseParserClass
return false;
}
- private function readRowAttributes(SimpleXMLElement $worksheetRow, $readDataOnly)
+ private function readRowAttributes(SimpleXMLElement $worksheetRow, bool $readDataOnly): array
{
$rowAttributes = [];
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
index c631a0fe7..7d947bacf 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
@@ -10,11 +10,14 @@ use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalFormatValueO
use PhpOffice\PhpSpreadsheet\Style\Style as Style;
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
use SimpleXMLElement;
+use stdClass;
class ConditionalStyles
{
+ /** @var Worksheet */
private $worksheet;
+ /** @var SimpleXMLElement */
private $worksheetXml;
/**
@@ -22,6 +25,7 @@ class ConditionalStyles
*/
private $ns;
+ /** @var array */
private $dxfs;
public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml, array $dxfs = [])
@@ -146,7 +150,7 @@ class ConditionalStyles
return $cfStyle;
}
- private function readConditionalStyles($xmlSheet): array
+ private function readConditionalStyles(SimpleXMLElement $xmlSheet): array
{
$conditionals = [];
foreach ($xmlSheet->conditionalFormatting as $conditional) {
@@ -162,7 +166,7 @@ class ConditionalStyles
return $conditionals;
}
- private function setConditionalStyles(Worksheet $worksheet, array $conditionals, $xmlExtLst): void
+ private function setConditionalStyles(Worksheet $worksheet, array $conditionals, SimpleXMLElement $xmlExtLst): void
{
foreach ($conditionals as $cellRangeReference => $cfRules) {
ksort($cfRules);
@@ -176,7 +180,7 @@ class ConditionalStyles
}
}
- private function readStyleRules($cfRules, $extLst)
+ private function readStyleRules(array $cfRules, SimpleXMLElement $extLst): array
{
$conditionalFormattingRuleExtensions = ConditionalFormattingRuleExtension::parseExtLstXml($extLst);
$conditionalStyles = [];
@@ -213,7 +217,7 @@ class ConditionalStyles
if (isset($cfRule->dataBar)) {
$objConditional->setDataBar(
- $this->readDataBarOfConditionalRule($cfRule, $conditionalFormattingRuleExtensions)
+ $this->readDataBarOfConditionalRule($cfRule, $conditionalFormattingRuleExtensions) // @phpstan-ignore-line
);
} else {
$objConditional->setStyle(clone $this->dxfs[(int) ($cfRule['dxfId'])]);
@@ -225,7 +229,10 @@ class ConditionalStyles
return $conditionalStyles;
}
- private function readDataBarOfConditionalRule($cfRule, $conditionalFormattingRuleExtensions): ConditionalDataBar
+ /**
+ * @param SimpleXMLElement|stdClass $cfRule
+ */
+ private function readDataBarOfConditionalRule($cfRule, array $conditionalFormattingRuleExtensions): ConditionalDataBar
{
$dataBar = new ConditionalDataBar();
//dataBar attribute
@@ -257,7 +264,10 @@ class ConditionalStyles
return $dataBar;
}
- private function readDataBarExtLstOfConditionalRule(ConditionalDataBar $dataBar, $cfRule, $conditionalFormattingRuleExtensions): void
+ /**
+ * @param SimpleXMLElement|stdClass $cfRule
+ */
+ private function readDataBarExtLstOfConditionalRule(ConditionalDataBar $dataBar, $cfRule, array $conditionalFormattingRuleExtensions): void
{
if (isset($cfRule->extLst)) {
$ns = $cfRule->extLst->getNamespaces(true);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
index b699cb574..dac76230c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
@@ -8,8 +8,10 @@ use SimpleXMLElement;
class DataValidations
{
+ /** @var Worksheet */
private $worksheet;
+ /** @var SimpleXMLElement */
private $worksheetXml;
public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml)
@@ -22,7 +24,7 @@ class DataValidations
{
foreach ($this->worksheetXml->dataValidations->dataValidation as $dataValidation) {
// Uppercase coordinate
- $range = strtoupper($dataValidation['sqref']);
+ $range = strtoupper((string) $dataValidation['sqref']);
$rangeSet = explode(' ', $range);
foreach ($rangeSet as $range) {
$stRange = $this->worksheet->shrinkRangeToFit($range);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
index 848849962..7d48c7967 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
@@ -9,8 +9,10 @@ use SimpleXMLElement;
class Hyperlinks
{
+ /** @var Worksheet */
private $worksheet;
+ /** @var array */
private $hyperlinks = [];
public function __construct(Worksheet $workSheet)
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
index 56f18f98b..08decd6e4 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
@@ -8,8 +8,10 @@ use SimpleXMLElement;
class PageSetup extends BaseParserClass
{
+ /** @var Worksheet */
private $worksheet;
+ /** @var ?SimpleXMLElement */
private $worksheetXml;
public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
@@ -18,16 +20,17 @@ class PageSetup extends BaseParserClass
$this->worksheetXml = $worksheetXml;
}
- public function load(array $unparsedLoadedData)
+ public function load(array $unparsedLoadedData): array
{
- if (!$this->worksheetXml) {
+ $worksheetXml = $this->worksheetXml;
+ if ($worksheetXml === null) {
return $unparsedLoadedData;
}
- $this->margins($this->worksheetXml, $this->worksheet);
- $unparsedLoadedData = $this->pageSetup($this->worksheetXml, $this->worksheet, $unparsedLoadedData);
- $this->headerFooter($this->worksheetXml, $this->worksheet);
- $this->pageBreaks($this->worksheetXml, $this->worksheet);
+ $this->margins($worksheetXml, $this->worksheet);
+ $unparsedLoadedData = $this->pageSetup($worksheetXml, $this->worksheet, $unparsedLoadedData);
+ $this->headerFooter($worksheetXml, $this->worksheet);
+ $this->pageBreaks($worksheetXml, $this->worksheet);
return $unparsedLoadedData;
}
@@ -45,7 +48,7 @@ class PageSetup extends BaseParserClass
}
}
- private function pageSetup(SimpleXMLElement $xmlSheet, Worksheet $worksheet, array $unparsedLoadedData)
+ private function pageSetup(SimpleXMLElement $xmlSheet, Worksheet $worksheet, array $unparsedLoadedData): array
{
if ($xmlSheet->pageSetup) {
$docPageSetup = $worksheet->getPageSetup();
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
index a302cc569..9c02da9f8 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
@@ -7,8 +7,10 @@ use SimpleXMLElement;
class SheetViewOptions extends BaseParserClass
{
+ /** @var Worksheet */
private $worksheet;
+ /** @var ?SimpleXMLElement */
private $worksheetXml;
public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
@@ -24,10 +26,11 @@ class SheetViewOptions extends BaseParserClass
}
if (isset($this->worksheetXml->sheetPr)) {
- $this->tabColor($this->worksheetXml->sheetPr, $styleReader);
- $this->codeName($this->worksheetXml->sheetPr);
- $this->outlines($this->worksheetXml->sheetPr);
- $this->pageSetup($this->worksheetXml->sheetPr);
+ $sheetPr = $this->worksheetXml->sheetPr;
+ $this->tabColor($sheetPr, $styleReader);
+ $this->codeName($sheetPr);
+ $this->outlines($sheetPr);
+ $this->pageSetup($sheetPr);
}
if (isset($this->worksheetXml->sheetFormatPr)) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php
index 9d61e3d36..4743afbf9 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php
@@ -29,7 +29,7 @@ class WorkbookView
$this->spreadsheet->setActiveSheetIndex(0);
$workbookView = $xmlWorkbook->children($mainNS)->bookViews->workbookView;
- if (($readDataOnly !== true || !empty($this->loadSheetsOnly)) && !empty($workbookView)) {
+ if ($readDataOnly !== true && !empty($workbookView)) {
$workbookViewAttributes = self::testSimpleXml(self::getAttributes($workbookView));
// active sheet index
$activeTab = (int) $workbookViewAttributes->activeTab; // refers to old sheet index
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php
index 0b5e0966c..d8f0d9dcd 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Reader/Xml.php
@@ -18,6 +18,7 @@ use PhpOffice\PhpSpreadsheet\Shared\Date;
use PhpOffice\PhpSpreadsheet\Shared\File;
use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
use SimpleXMLElement;
/**
@@ -364,7 +365,7 @@ class Xml extends BaseReader
$rowTo = $rowTo + $cell_ss['MergeDown'];
}
$cellRange .= ':' . $columnTo . $rowTo;
- $spreadsheet->getActiveSheet()->mergeCells($cellRange);
+ $spreadsheet->getActiveSheet()->mergeCells($cellRange, Worksheet::MERGE_CELL_CONTENT_HIDE);
}
$hasCalculatedValue = false;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php
index 08a38b3bb..3f53ed1d4 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/ReferenceHelper.php
@@ -253,10 +253,11 @@ class ReferenceHelper
? uksort($aDataValidationCollection, [self::class, 'cellReverseSort'])
: uksort($aDataValidationCollection, [self::class, 'cellSort']);
- foreach ($aDataValidationCollection as $cellAddress => $value) {
+ foreach ($aDataValidationCollection as $cellAddress => $dataValidation) {
$newReference = $this->updateCellReference($cellAddress);
if ($cellAddress !== $newReference) {
- $worksheet->setDataValidation($newReference, $value);
+ $dataValidation->setSqref($newReference);
+ $worksheet->setDataValidation($newReference, $dataValidation);
$worksheet->setDataValidation($cellAddress, null);
}
}
@@ -537,11 +538,7 @@ class ReferenceHelper
// Update workbook: define names
if (count($worksheet->getParent()->getDefinedNames()) > 0) {
- foreach ($worksheet->getParent()->getDefinedNames() as $definedName) {
- if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashCode() === $worksheet->getHashCode()) {
- $definedName->setValue($this->updateCellReference($definedName->getValue()));
- }
- }
+ $this->updateDefinedNames($worksheet, $beforeCellAddress, $numberOfColumns, $numberOfRows);
}
// Garbage collect
@@ -865,13 +862,13 @@ class ReferenceHelper
}
/**
- * Update named formulas (i.e. containing worksheet references / named ranges).
+ * Update named formulae (i.e. containing worksheet references / named ranges).
*
* @param Spreadsheet $spreadsheet Object to update
* @param string $oldName Old name (name to replace)
* @param string $newName New name
*/
- public function updateNamedFormulas(Spreadsheet $spreadsheet, $oldName = '', $newName = ''): void
+ public function updateNamedFormulae(Spreadsheet $spreadsheet, $oldName = '', $newName = ''): void
{
if ($oldName == '') {
return;
@@ -880,7 +877,7 @@ class ReferenceHelper
foreach ($spreadsheet->getWorksheetIterator() as $sheet) {
foreach ($sheet->getCoordinates(false) as $coordinate) {
$cell = $sheet->getCell($coordinate);
- if (($cell !== null) && ($cell->getDataType() === DataType::TYPE_FORMULA)) {
+ if ($cell->getDataType() === DataType::TYPE_FORMULA) {
$formula = $cell->getValue();
if (strpos($formula, $oldName) !== false) {
$formula = str_replace("'" . $oldName . "'!", "'" . $newName . "'!", $formula);
@@ -892,6 +889,40 @@ class ReferenceHelper
}
}
+ private function updateDefinedNames(Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns, int $numberOfRows): void
+ {
+ foreach ($worksheet->getParent()->getDefinedNames() as $definedName) {
+ if ($definedName->isFormula() === false) {
+ $this->updateNamedRange($definedName, $worksheet, $beforeCellAddress, $numberOfColumns, $numberOfRows);
+ } else {
+ $this->updateNamedFormula($definedName, $worksheet, $beforeCellAddress, $numberOfColumns, $numberOfRows);
+ }
+ }
+ }
+
+ private function updateNamedRange(DefinedName $definedName, Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns, int $numberOfRows): void
+ {
+ $cellAddress = $definedName->getValue();
+ $asFormula = ($cellAddress[0] === '=');
+ if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashCode() === $worksheet->getHashCode()) {
+ if ($asFormula === true) {
+ $formula = $this->updateFormulaReferences($cellAddress, $beforeCellAddress, $numberOfColumns, $numberOfRows, $worksheet->getTitle());
+ $definedName->setValue($formula);
+ } else {
+ $definedName->setValue($this->updateCellReference(ltrim($cellAddress, '=')));
+ }
+ }
+ }
+
+ private function updateNamedFormula(DefinedName $definedName, Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns, int $numberOfRows): void
+ {
+ if ($definedName->getWorksheet() !== null && $definedName->getWorksheet()->getHashCode() === $worksheet->getHashCode()) {
+ $formula = $definedName->getValue();
+ $formula = $this->updateFormulaReferences($formula, $beforeCellAddress, $numberOfColumns, $numberOfRows, $worksheet->getTitle());
+ $definedName->setValue($formula);
+ }
+ }
+
/**
* Update cell range.
*
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php
index 5fbbadb67..3282a596e 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Settings.php
@@ -8,6 +8,7 @@ use PhpOffice\PhpSpreadsheet\Collection\Memory;
use Psr\Http\Client\ClientInterface;
use Psr\Http\Message\RequestFactoryInterface;
use Psr\SimpleCache\CacheInterface;
+use ReflectionClass;
class Settings
{
@@ -161,12 +162,19 @@ class Settings
public static function getCache(): CacheInterface
{
if (!self::$cache) {
- self::$cache = new Memory();
+ self::$cache = self::useSimpleCacheVersion3() ? new Memory\SimpleCache3() : new Memory\SimpleCache1();
}
return self::$cache;
}
+ public static function useSimpleCacheVersion3(): bool
+ {
+ return
+ PHP_MAJOR_VERSION === 8 &&
+ (new ReflectionClass(CacheInterface::class))->getMethod('get')->getReturnType() !== null;
+ }
+
/**
* Set the HTTP client implementation to be used for network request.
*/
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php
index 1adf213ec..e90c679b6 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/Font.php
@@ -13,7 +13,7 @@ class Font
const AUTOSIZE_METHOD_APPROX = 'approx';
const AUTOSIZE_METHOD_EXACT = 'exact';
- private static $autoSizeMethods = [
+ private const AUTOSIZE_METHODS = [
self::AUTOSIZE_METHOD_APPROX,
self::AUTOSIZE_METHOD_EXACT,
];
@@ -101,6 +101,105 @@ class Font
const VERDANA_ITALIC = 'verdanai.ttf';
const VERDANA_BOLD_ITALIC = 'verdanaz.ttf';
+ const FONT_FILE_NAMES = [
+ 'Arial' => [
+ 'x' => self::ARIAL,
+ 'xb' => self::ARIAL_BOLD,
+ 'xi' => self::ARIAL_ITALIC,
+ 'xbi' => self::ARIAL_BOLD_ITALIC,
+ ],
+ 'Calibri' => [
+ 'x' => self::CALIBRI,
+ 'xb' => self::CALIBRI_BOLD,
+ 'xi' => self::CALIBRI_ITALIC,
+ 'xbi' => self::CALIBRI_BOLD_ITALIC,
+ ],
+ 'Comic Sans MS' => [
+ 'x' => self::COMIC_SANS_MS,
+ 'xb' => self::COMIC_SANS_MS_BOLD,
+ 'xi' => self::COMIC_SANS_MS,
+ 'xbi' => self::COMIC_SANS_MS_BOLD,
+ ],
+ 'Courier New' => [
+ 'x' => self::COURIER_NEW,
+ 'xb' => self::COURIER_NEW_BOLD,
+ 'xi' => self::COURIER_NEW_ITALIC,
+ 'xbi' => self::COURIER_NEW_BOLD_ITALIC,
+ ],
+ 'Georgia' => [
+ 'x' => self::GEORGIA,
+ 'xb' => self::GEORGIA_BOLD,
+ 'xi' => self::GEORGIA_ITALIC,
+ 'xbi' => self::GEORGIA_BOLD_ITALIC,
+ ],
+ 'Impact' => [
+ 'x' => self::IMPACT,
+ 'xb' => self::IMPACT,
+ 'xi' => self::IMPACT,
+ 'xbi' => self::IMPACT,
+ ],
+ 'Liberation Sans' => [
+ 'x' => self::LIBERATION_SANS,
+ 'xb' => self::LIBERATION_SANS_BOLD,
+ 'xi' => self::LIBERATION_SANS_ITALIC,
+ 'xbi' => self::LIBERATION_SANS_BOLD_ITALIC,
+ ],
+ 'Lucida Console' => [
+ 'x' => self::LUCIDA_CONSOLE,
+ 'xb' => self::LUCIDA_CONSOLE,
+ 'xi' => self::LUCIDA_CONSOLE,
+ 'xbi' => self::LUCIDA_CONSOLE,
+ ],
+ 'Lucida Sans Unicode' => [
+ 'x' => self::LUCIDA_SANS_UNICODE,
+ 'xb' => self::LUCIDA_SANS_UNICODE,
+ 'xi' => self::LUCIDA_SANS_UNICODE,
+ 'xbi' => self::LUCIDA_SANS_UNICODE,
+ ],
+ 'Microsoft Sans Serif' => [
+ 'x' => self::MICROSOFT_SANS_SERIF,
+ 'xb' => self::MICROSOFT_SANS_SERIF,
+ 'xi' => self::MICROSOFT_SANS_SERIF,
+ 'xbi' => self::MICROSOFT_SANS_SERIF,
+ ],
+ 'Palatino Linotype' => [
+ 'x' => self::PALATINO_LINOTYPE,
+ 'xb' => self::PALATINO_LINOTYPE_BOLD,
+ 'xi' => self::PALATINO_LINOTYPE_ITALIC,
+ 'xbi' => self::PALATINO_LINOTYPE_BOLD_ITALIC,
+ ],
+ 'Symbol' => [
+ 'x' => self::SYMBOL,
+ 'xb' => self::SYMBOL,
+ 'xi' => self::SYMBOL,
+ 'xbi' => self::SYMBOL,
+ ],
+ 'Tahoma' => [
+ 'x' => self::TAHOMA,
+ 'xb' => self::TAHOMA_BOLD,
+ 'xi' => self::TAHOMA,
+ 'xbi' => self::TAHOMA_BOLD,
+ ],
+ 'Times New Roman' => [
+ 'x' => self::TIMES_NEW_ROMAN,
+ 'xb' => self::TIMES_NEW_ROMAN_BOLD,
+ 'xi' => self::TIMES_NEW_ROMAN_ITALIC,
+ 'xbi' => self::TIMES_NEW_ROMAN_BOLD_ITALIC,
+ ],
+ 'Trebuchet MS' => [
+ 'x' => self::TREBUCHET_MS,
+ 'xb' => self::TREBUCHET_MS_BOLD,
+ 'xi' => self::TREBUCHET_MS_ITALIC,
+ 'xbi' => self::TREBUCHET_MS_BOLD_ITALIC,
+ ],
+ 'Verdana' => [
+ 'x' => self::VERDANA,
+ 'xb' => self::VERDANA_BOLD,
+ 'xi' => self::VERDANA_ITALIC,
+ 'xbi' => self::VERDANA_BOLD_ITALIC,
+ ],
+ ];
+
/**
* AutoSize method.
*
@@ -113,54 +212,65 @@ class Font
*
* @var string
*/
- private static $trueTypeFontPath;
+ private static $trueTypeFontPath = '';
/**
* How wide is a default column for a given default font and size?
* Empirical data found by inspecting real Excel files and reading off the pixel width
* in Microsoft Office Excel 2007.
+ * Added height in points.
+ */
+ public const DEFAULT_COLUMN_WIDTHS = [
+ 'Arial' => [
+ 1 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+ 2 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+ 3 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.0],
+
+ 4 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.75],
+ 5 => ['px' => 40, 'width' => 10.00000000, 'height' => 8.25],
+ 6 => ['px' => 48, 'width' => 9.59765625, 'height' => 8.25],
+ 7 => ['px' => 48, 'width' => 9.59765625, 'height' => 9.0],
+ 8 => ['px' => 56, 'width' => 9.33203125, 'height' => 11.25],
+ 9 => ['px' => 64, 'width' => 9.14062500, 'height' => 12.0],
+ 10 => ['px' => 64, 'width' => 9.14062500, 'height' => 12.75],
+ ],
+ 'Calibri' => [
+ 1 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+ 2 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+ 3 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.00],
+ 4 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.75],
+ 5 => ['px' => 40, 'width' => 10.00000000, 'height' => 8.25],
+ 6 => ['px' => 48, 'width' => 9.59765625, 'height' => 8.25],
+ 7 => ['px' => 48, 'width' => 9.59765625, 'height' => 9.0],
+ 8 => ['px' => 56, 'width' => 9.33203125, 'height' => 11.25],
+ 9 => ['px' => 56, 'width' => 9.33203125, 'height' => 12.0],
+ 10 => ['px' => 64, 'width' => 9.14062500, 'height' => 12.75],
+ 11 => ['px' => 64, 'width' => 9.14062500, 'height' => 15.0],
+ ],
+ 'Verdana' => [
+ 1 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+ 2 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+ 3 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.0],
+ 4 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.75],
+ 5 => ['px' => 40, 'width' => 10.00000000, 'height' => 8.25],
+ 6 => ['px' => 48, 'width' => 9.59765625, 'height' => 8.25],
+ 7 => ['px' => 48, 'width' => 9.59765625, 'height' => 9.0],
+ 8 => ['px' => 64, 'width' => 9.14062500, 'height' => 10.5],
+ 9 => ['px' => 72, 'width' => 9.00000000, 'height' => 11.25],
+ 10 => ['px' => 72, 'width' => 9.00000000, 'height' => 12.75],
+ ],
+ ];
+
+ /**
+ * List of column widths. Replaced by constant;
+ * previously it was public and updateable, allowing
+ * user to make inappropriate alterations.
+ *
+ * @deprecated 1.25.0 Use DEFAULT_COLUMN_WIDTHS constant instead.
*
* @var array
*/
- public static $defaultColumnWidths = [
- 'Arial' => [
- 1 => ['px' => 24, 'width' => 12.00000000],
- 2 => ['px' => 24, 'width' => 12.00000000],
- 3 => ['px' => 32, 'width' => 10.66406250],
- 4 => ['px' => 32, 'width' => 10.66406250],
- 5 => ['px' => 40, 'width' => 10.00000000],
- 6 => ['px' => 48, 'width' => 9.59765625],
- 7 => ['px' => 48, 'width' => 9.59765625],
- 8 => ['px' => 56, 'width' => 9.33203125],
- 9 => ['px' => 64, 'width' => 9.14062500],
- 10 => ['px' => 64, 'width' => 9.14062500],
- ],
- 'Calibri' => [
- 1 => ['px' => 24, 'width' => 12.00000000],
- 2 => ['px' => 24, 'width' => 12.00000000],
- 3 => ['px' => 32, 'width' => 10.66406250],
- 4 => ['px' => 32, 'width' => 10.66406250],
- 5 => ['px' => 40, 'width' => 10.00000000],
- 6 => ['px' => 48, 'width' => 9.59765625],
- 7 => ['px' => 48, 'width' => 9.59765625],
- 8 => ['px' => 56, 'width' => 9.33203125],
- 9 => ['px' => 56, 'width' => 9.33203125],
- 10 => ['px' => 64, 'width' => 9.14062500],
- 11 => ['px' => 64, 'width' => 9.14062500],
- ],
- 'Verdana' => [
- 1 => ['px' => 24, 'width' => 12.00000000],
- 2 => ['px' => 24, 'width' => 12.00000000],
- 3 => ['px' => 32, 'width' => 10.66406250],
- 4 => ['px' => 32, 'width' => 10.66406250],
- 5 => ['px' => 40, 'width' => 10.00000000],
- 6 => ['px' => 48, 'width' => 9.59765625],
- 7 => ['px' => 48, 'width' => 9.59765625],
- 8 => ['px' => 64, 'width' => 9.14062500],
- 9 => ['px' => 72, 'width' => 9.00000000],
- 10 => ['px' => 72, 'width' => 9.00000000],
- ],
- ];
+ public static $defaultColumnWidths = self::DEFAULT_COLUMN_WIDTHS;
/**
* Set autoSize method.
@@ -171,7 +281,7 @@ class Font
*/
public static function setAutoSizeMethod($method)
{
- if (!in_array($method, self::$autoSizeMethods)) {
+ if (!in_array($method, self::AUTOSIZE_METHODS)) {
return false;
}
self::$autoSizeMethod = $method;
@@ -219,7 +329,7 @@ class Font
* Calculate an (approximate) OpenXML column width, based on font size and text contained.
*
* @param FontStyle $font Font object
- * @param RichText|string $cellText Text to calculate width
+ * @param null|RichText|string $cellText Text to calculate width
* @param int $rotation Rotation angle
* @param null|FontStyle $defaultFont Font object
* @param bool $filterAdjustment Add space for Autofilter or Table dropdown
@@ -238,7 +348,8 @@ class Font
}
// Special case if there are one or more newline characters ("\n")
- if (strpos($cellText ?? '', "\n") !== false) {
+ $cellText = $cellText ?? '';
+ if (strpos(/** @scrutinizer ignore-type */ $cellText, "\n") !== false) {
$lineTexts = explode("\n", $cellText);
$lineWidths = [];
foreach ($lineTexts as $lineText) {
@@ -281,7 +392,7 @@ class Font
}
// Convert from pixel width to column width
- $columnWidth = Drawing::pixelsToCellDimension((int) $columnWidth, $defaultFont);
+ $columnWidth = Drawing::pixelsToCellDimension((int) $columnWidth, $defaultFont ?? new FontStyle());
// Return
return (int) round($columnWidth, 6);
@@ -299,7 +410,12 @@ class Font
// font size should really be supplied in pixels in GD2,
// but since GD2 seems to assume 72dpi, pixels and points are the same
$fontFile = self::getTrueTypeFontFileFromFont($font);
- $textBox = imagettfbbox($font->getSize(), $rotation, $fontFile, $text);
+ $textBox = imagettfbbox($font->getSize() ?? 10.0, $rotation, $fontFile, $text);
+ if ($textBox === false) {
+ // @codeCoverageIgnoreStart
+ throw new PhpSpreadsheetException('imagettfbbox failed');
+ // @codeCoverageIgnoreEnd
+ }
// Get corners positions
$lowerLeftCornerX = $textBox[0];
@@ -409,129 +525,48 @@ class Font
*
* @return string Path to TrueType font file
*/
- public static function getTrueTypeFontFileFromFont(FontStyle $font)
+ public static function getTrueTypeFontFileFromFont(FontStyle $font, bool $checkPath = true)
{
- if (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath)) {
+ if ($checkPath && (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath))) {
throw new PhpSpreadsheetException('Valid directory to TrueType Font files not specified');
}
$name = $font->getName();
+ if (!isset(self::FONT_FILE_NAMES[$name])) {
+ throw new PhpSpreadsheetException('Unknown font name "' . $name . '". Cannot map to TrueType font file');
+ }
$bold = $font->getBold();
$italic = $font->getItalic();
-
- // Check if we can map font to true type font file
- switch ($name) {
- case 'Arial':
- $fontFile = (
- $bold ? ($italic ? self::ARIAL_BOLD_ITALIC : self::ARIAL_BOLD)
- : ($italic ? self::ARIAL_ITALIC : self::ARIAL)
- );
-
- break;
- case 'Calibri':
- $fontFile = (
- $bold ? ($italic ? self::CALIBRI_BOLD_ITALIC : self::CALIBRI_BOLD)
- : ($italic ? self::CALIBRI_ITALIC : self::CALIBRI)
- );
-
- break;
- case 'Courier New':
- $fontFile = (
- $bold ? ($italic ? self::COURIER_NEW_BOLD_ITALIC : self::COURIER_NEW_BOLD)
- : ($italic ? self::COURIER_NEW_ITALIC : self::COURIER_NEW)
- );
-
- break;
- case 'Comic Sans MS':
- $fontFile = (
- $bold ? self::COMIC_SANS_MS_BOLD : self::COMIC_SANS_MS
- );
-
- break;
- case 'Georgia':
- $fontFile = (
- $bold ? ($italic ? self::GEORGIA_BOLD_ITALIC : self::GEORGIA_BOLD)
- : ($italic ? self::GEORGIA_ITALIC : self::GEORGIA)
- );
-
- break;
- case 'Impact':
- $fontFile = self::IMPACT;
-
- break;
- case 'Liberation Sans':
- $fontFile = (
- $bold ? ($italic ? self::LIBERATION_SANS_BOLD_ITALIC : self::LIBERATION_SANS_BOLD)
- : ($italic ? self::LIBERATION_SANS_ITALIC : self::LIBERATION_SANS)
- );
-
- break;
- case 'Lucida Console':
- $fontFile = self::LUCIDA_CONSOLE;
-
- break;
- case 'Lucida Sans Unicode':
- $fontFile = self::LUCIDA_SANS_UNICODE;
-
- break;
- case 'Microsoft Sans Serif':
- $fontFile = self::MICROSOFT_SANS_SERIF;
-
- break;
- case 'Palatino Linotype':
- $fontFile = (
- $bold ? ($italic ? self::PALATINO_LINOTYPE_BOLD_ITALIC : self::PALATINO_LINOTYPE_BOLD)
- : ($italic ? self::PALATINO_LINOTYPE_ITALIC : self::PALATINO_LINOTYPE)
- );
-
- break;
- case 'Symbol':
- $fontFile = self::SYMBOL;
-
- break;
- case 'Tahoma':
- $fontFile = (
- $bold ? self::TAHOMA_BOLD : self::TAHOMA
- );
-
- break;
- case 'Times New Roman':
- $fontFile = (
- $bold ? ($italic ? self::TIMES_NEW_ROMAN_BOLD_ITALIC : self::TIMES_NEW_ROMAN_BOLD)
- : ($italic ? self::TIMES_NEW_ROMAN_ITALIC : self::TIMES_NEW_ROMAN)
- );
-
- break;
- case 'Trebuchet MS':
- $fontFile = (
- $bold ? ($italic ? self::TREBUCHET_MS_BOLD_ITALIC : self::TREBUCHET_MS_BOLD)
- : ($italic ? self::TREBUCHET_MS_ITALIC : self::TREBUCHET_MS)
- );
-
- break;
- case 'Verdana':
- $fontFile = (
- $bold ? ($italic ? self::VERDANA_BOLD_ITALIC : self::VERDANA_BOLD)
- : ($italic ? self::VERDANA_ITALIC : self::VERDANA)
- );
-
- break;
- default:
- throw new PhpSpreadsheetException('Unknown font name "' . $name . '". Cannot map to TrueType font file');
-
- break;
+ $index = 'x';
+ if ($bold) {
+ $index .= 'b';
}
+ if ($italic) {
+ $index .= 'i';
+ }
+ $fontFile = self::FONT_FILE_NAMES[$name][$index];
- $fontFile = self::$trueTypeFontPath . $fontFile;
+ $separator = '';
+ if (mb_strlen(self::$trueTypeFontPath) > 1 && mb_substr(self::$trueTypeFontPath, -1) !== '/' && mb_substr(self::$trueTypeFontPath, -1) !== '\\') {
+ $separator = DIRECTORY_SEPARATOR;
+ }
+ $fontFile = self::$trueTypeFontPath . $separator . $fontFile;
// Check if file actually exists
- if (!file_exists($fontFile)) {
+ if ($checkPath && !file_exists($fontFile)) {
throw new PhpSpreadsheetException('TrueType Font file not found');
}
return $fontFile;
}
+ public const CHARSET_FROM_FONT_NAME = [
+ 'EucrosiaUPC' => self::CHARSET_ANSI_THAI,
+ 'Wingdings' => self::CHARSET_SYMBOL,
+ 'Wingdings 2' => self::CHARSET_SYMBOL,
+ 'Wingdings 3' => self::CHARSET_SYMBOL,
+ ];
+
/**
* Returns the associated charset for the font name.
*
@@ -541,19 +576,7 @@ class Font
*/
public static function getCharsetFromFontName($fontName)
{
- switch ($fontName) {
- // Add more cases. Check FONT records in real Excel files.
- case 'EucrosiaUPC':
- return self::CHARSET_ANSI_THAI;
- case 'Wingdings':
- return self::CHARSET_SYMBOL;
- case 'Wingdings 2':
- return self::CHARSET_SYMBOL;
- case 'Wingdings 3':
- return self::CHARSET_SYMBOL;
- default:
- return self::CHARSET_ANSI_LATIN;
- }
+ return self::CHARSET_FROM_FONT_NAME[$fontName] ?? self::CHARSET_ANSI_LATIN;
}
/**
@@ -567,17 +590,17 @@ class Font
*/
public static function getDefaultColumnWidthByFont(FontStyle $font, $returnAsPixels = false)
{
- if (isset(self::$defaultColumnWidths[$font->getName()][$font->getSize()])) {
+ if (isset(self::DEFAULT_COLUMN_WIDTHS[$font->getName()][$font->getSize()])) {
// Exact width can be determined
$columnWidth = $returnAsPixels ?
- self::$defaultColumnWidths[$font->getName()][$font->getSize()]['px']
- : self::$defaultColumnWidths[$font->getName()][$font->getSize()]['width'];
+ self::DEFAULT_COLUMN_WIDTHS[$font->getName()][$font->getSize()]['px']
+ : self::DEFAULT_COLUMN_WIDTHS[$font->getName()][$font->getSize()]['width'];
} else {
// We don't have data for this particular font and size, use approximation by
// extrapolating from Calibri 11
$columnWidth = $returnAsPixels ?
- self::$defaultColumnWidths['Calibri'][11]['px']
- : self::$defaultColumnWidths['Calibri'][11]['width'];
+ self::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['px']
+ : self::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['width'];
$columnWidth = $columnWidth * $font->getSize() / 11;
// Round pixels to closest integer
@@ -599,173 +622,14 @@ class Font
*/
public static function getDefaultRowHeightByFont(FontStyle $font)
{
- switch ($font->getName()) {
- case 'Arial':
- switch ($font->getSize()) {
- case 10:
- // inspection of Arial 10 workbook says 12.75pt ~17px
- $rowHeight = 12.75;
-
- break;
- case 9:
- // inspection of Arial 9 workbook says 12.00pt ~16px
- $rowHeight = 12;
-
- break;
- case 8:
- // inspection of Arial 8 workbook says 11.25pt ~15px
- $rowHeight = 11.25;
-
- break;
- case 7:
- // inspection of Arial 7 workbook says 9.00pt ~12px
- $rowHeight = 9;
-
- break;
- case 6:
- case 5:
- // inspection of Arial 5,6 workbook says 8.25pt ~11px
- $rowHeight = 8.25;
-
- break;
- case 4:
- // inspection of Arial 4 workbook says 6.75pt ~9px
- $rowHeight = 6.75;
-
- break;
- case 3:
- // inspection of Arial 3 workbook says 6.00pt ~8px
- $rowHeight = 6;
-
- break;
- case 2:
- case 1:
- // inspection of Arial 1,2 workbook says 5.25pt ~7px
- $rowHeight = 5.25;
-
- break;
- default:
- // use Arial 10 workbook as an approximation, extrapolation
- $rowHeight = 12.75 * $font->getSize() / 10;
-
- break;
- }
-
- break;
- case 'Calibri':
- switch ($font->getSize()) {
- case 11:
- // inspection of Calibri 11 workbook says 15.00pt ~20px
- $rowHeight = 15;
-
- break;
- case 10:
- // inspection of Calibri 10 workbook says 12.75pt ~17px
- $rowHeight = 12.75;
-
- break;
- case 9:
- // inspection of Calibri 9 workbook says 12.00pt ~16px
- $rowHeight = 12;
-
- break;
- case 8:
- // inspection of Calibri 8 workbook says 11.25pt ~15px
- $rowHeight = 11.25;
-
- break;
- case 7:
- // inspection of Calibri 7 workbook says 9.00pt ~12px
- $rowHeight = 9;
-
- break;
- case 6:
- case 5:
- // inspection of Calibri 5,6 workbook says 8.25pt ~11px
- $rowHeight = 8.25;
-
- break;
- case 4:
- // inspection of Calibri 4 workbook says 6.75pt ~9px
- $rowHeight = 6.75;
-
- break;
- case 3:
- // inspection of Calibri 3 workbook says 6.00pt ~8px
- $rowHeight = 6.00;
-
- break;
- case 2:
- case 1:
- // inspection of Calibri 1,2 workbook says 5.25pt ~7px
- $rowHeight = 5.25;
-
- break;
- default:
- // use Calibri 11 workbook as an approximation, extrapolation
- $rowHeight = 15 * $font->getSize() / 11;
-
- break;
- }
-
- break;
- case 'Verdana':
- switch ($font->getSize()) {
- case 10:
- // inspection of Verdana 10 workbook says 12.75pt ~17px
- $rowHeight = 12.75;
-
- break;
- case 9:
- // inspection of Verdana 9 workbook says 11.25pt ~15px
- $rowHeight = 11.25;
-
- break;
- case 8:
- // inspection of Verdana 8 workbook says 10.50pt ~14px
- $rowHeight = 10.50;
-
- break;
- case 7:
- // inspection of Verdana 7 workbook says 9.00pt ~12px
- $rowHeight = 9.00;
-
- break;
- case 6:
- case 5:
- // inspection of Verdana 5,6 workbook says 8.25pt ~11px
- $rowHeight = 8.25;
-
- break;
- case 4:
- // inspection of Verdana 4 workbook says 6.75pt ~9px
- $rowHeight = 6.75;
-
- break;
- case 3:
- // inspection of Verdana 3 workbook says 6.00pt ~8px
- $rowHeight = 6;
-
- break;
- case 2:
- case 1:
- // inspection of Verdana 1,2 workbook says 5.25pt ~7px
- $rowHeight = 5.25;
-
- break;
- default:
- // use Verdana 10 workbook as an approximation, extrapolation
- $rowHeight = 12.75 * $font->getSize() / 10;
-
- break;
- }
-
- break;
- default:
- // just use Calibri as an approximation
- $rowHeight = 15 * $font->getSize() / 11;
-
- break;
+ $name = $font->getName();
+ $size = $font->getSize();
+ if (isset(self::DEFAULT_COLUMN_WIDTHS[$name][$size])) {
+ $rowHeight = self::DEFAULT_COLUMN_WIDTHS[$name][$size]['height'];
+ } elseif ($name === 'Arial' || $name === 'Verdana') {
+ $rowHeight = self::DEFAULT_COLUMN_WIDTHS[$name][10]['height'] * $size / 10.0;
+ } else {
+ $rowHeight = self::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['height'] * $size / 11.0;
}
return $rowHeight;
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
index 66111b6c8..1ec7f6abf 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
@@ -495,7 +495,7 @@ class EigenvalueDecomposition
$this->V[$i][$n - 1] = $q * $z + $p * $this->V[$i][$n];
$this->V[$i][$n] = $q * $this->V[$i][$n] - $p * $z;
}
- // Complex pair
+ // Complex pair
} else {
$this->d[$n - 1] = $x + $p;
$this->d[$n] = $x + $p;
@@ -671,7 +671,7 @@ class EigenvalueDecomposition
} else {
$this->H[$i][$n] = -$r / ($eps * $norm);
}
- // Solve real equations
+ // Solve real equations
} else {
$x = $this->H[$i][$i + 1];
$y = $this->H[$i + 1][$i];
@@ -693,7 +693,7 @@ class EigenvalueDecomposition
}
}
}
- // Complex vector
+ // Complex vector
} elseif ($q < 0) {
$l = $n - 1;
// Last vector component imaginary so matrix is triangular
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/Matrix.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
index ab78ef18c..5e35d4919 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
@@ -3,6 +3,7 @@
namespace PhpOffice\PhpSpreadsheet\Shared\JAMA;
use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
@@ -66,21 +67,21 @@ class Matrix
$this->A = $args[0];
break;
- //Square matrix - n x n
+ //Square matrix - n x n
case 'integer':
$this->m = $args[0];
$this->n = $args[0];
$this->A = array_fill(0, $this->m, array_fill(0, $this->n, 0));
break;
- //Rectangular matrix - m x n
+ //Rectangular matrix - m x n
case 'integer,integer':
$this->m = $args[0];
$this->n = $args[1];
$this->A = array_fill(0, $this->m, array_fill(0, $this->n, 0));
break;
- //Rectangular matrix - m x n initialized from packed array
+ //Rectangular matrix - m x n initialized from packed array
case 'array,integer':
$this->m = $args[1];
if ($this->m != 0) {
@@ -190,7 +191,7 @@ class Matrix
return $R;
break;
- //A($i0...$iF; $j0...$jF)
+ //A($i0...$iF; $j0...$jF)
case 'integer,integer,integer,integer':
[$i0, $iF, $j0, $jF] = $args;
if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) {
@@ -213,7 +214,7 @@ class Matrix
return $R;
break;
- //$R = array of row indices; $C = array of column indices
+ //$R = array of row indices; $C = array of column indices
case 'array,array':
[$RL, $CL] = $args;
if (count($RL) > 0) {
@@ -236,7 +237,7 @@ class Matrix
return $R;
break;
- //A($i0...$iF); $CL = array of column indices
+ //A($i0...$iF); $CL = array of column indices
case 'integer,integer,array':
[$i0, $iF, $CL] = $args;
if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) {
@@ -259,7 +260,7 @@ class Matrix
return $R;
break;
- //$RL = array of row indices
+ //$RL = array of row indices
case 'array,integer,integer':
[$RL, $j0, $jF] = $args;
if (count($RL) > 0) {
@@ -532,14 +533,8 @@ class Matrix
for ($j = 0; $j < $this->n; ++$j) {
$validValues = true;
$value = $M->get($i, $j);
- if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
- $this->A[$i][$j] = trim($this->A[$i][$j], '"');
- $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
- }
- if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
- $value = trim($value, '"');
- $validValues &= StringHelper::convertToNumberIfFraction($value);
- }
+ [$this->A[$i][$j], $validValues] = $this->validateExtractedValue($this->A[$i][$j], $validValues);
+ [$value, $validValues] = $this->validateExtractedValue($value, $validValues);
if ($validValues) {
$this->A[$i][$j] += $value;
} else {
@@ -632,14 +627,8 @@ class Matrix
for ($j = 0; $j < $this->n; ++$j) {
$validValues = true;
$value = $M->get($i, $j);
- if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
- $this->A[$i][$j] = trim($this->A[$i][$j], '"');
- $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
- }
- if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
- $value = trim($value, '"');
- $validValues &= StringHelper::convertToNumberIfFraction($value);
- }
+ [$this->A[$i][$j], $validValues] = $this->validateExtractedValue($this->A[$i][$j], $validValues);
+ [$value, $validValues] = $this->validateExtractedValue($value, $validValues);
if ($validValues) {
$this->A[$i][$j] -= $value;
} else {
@@ -734,14 +723,8 @@ class Matrix
for ($j = 0; $j < $this->n; ++$j) {
$validValues = true;
$value = $M->get($i, $j);
- if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
- $this->A[$i][$j] = trim($this->A[$i][$j], '"');
- $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
- }
- if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
- $value = trim($value, '"');
- $validValues &= StringHelper::convertToNumberIfFraction($value);
- }
+ [$this->A[$i][$j], $validValues] = $this->validateExtractedValue($this->A[$i][$j], $validValues);
+ [$value, $validValues] = $this->validateExtractedValue($value, $validValues);
if ($validValues) {
$this->A[$i][$j] *= $value;
} else {
@@ -792,14 +775,8 @@ class Matrix
for ($j = 0; $j < $this->n; ++$j) {
$validValues = true;
$value = $M->get($i, $j);
- if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
- $this->A[$i][$j] = trim($this->A[$i][$j], '"');
- $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
- }
- if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
- $value = trim($value, '"');
- $validValues &= StringHelper::convertToNumberIfFraction($value);
- }
+ [$this->A[$i][$j], $validValues] = $this->validateExtractedValue($this->A[$i][$j], $validValues);
+ [$value, $validValues] = $this->validateExtractedValue($value, $validValues);
if ($validValues) {
if ($value == 0) {
// Trap for Divide by Zero error
@@ -1079,14 +1056,8 @@ class Matrix
for ($j = 0; $j < $this->n; ++$j) {
$validValues = true;
$value = $M->get($i, $j);
- if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
- $this->A[$i][$j] = trim($this->A[$i][$j], '"');
- $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
- }
- if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
- $value = trim($value, '"');
- $validValues &= StringHelper::convertToNumberIfFraction($value);
- }
+ [$this->A[$i][$j], $validValues] = $this->validateExtractedValue($this->A[$i][$j], $validValues);
+ [$value, $validValues] = $this->validateExtractedValue($value, $validValues);
if ($validValues) {
$this->A[$i][$j] = $this->A[$i][$j] ** $value;
} else {
@@ -1187,4 +1158,20 @@ class Matrix
return $L->det();
}
+
+ /**
+ * @param mixed $value
+ */
+ private function validateExtractedValue($value, bool $validValues): array
+ {
+ if (!is_numeric($value) && is_array($value)) {
+ $value = Functions::flattenArray($value)[0];
+ }
+ if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
+ $value = trim($value, '"');
+ $validValues &= StringHelper::convertToNumberIfFraction($value);
+ }
+
+ return [$value, $validValues];
+ }
}
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php
index 6c8999d02..b809bfa1d 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php
@@ -315,7 +315,7 @@ class SingularValueDecomposition
}
break;
- // Split at negligible s(k).
+ // Split at negligible s(k).
case 2:
$f = $e[$k - 1];
$e[$k - 1] = 0.0;
@@ -336,7 +336,7 @@ class SingularValueDecomposition
}
break;
- // Perform one qr step.
+ // Perform one qr step.
case 3:
// Calculate the shift.
$scale = max(max(max(max(abs($this->s[$p - 1]), abs($this->s[$p - 2])), abs($e[$p - 2])), abs($this->s[$k])), abs($e[$k]));
@@ -396,7 +396,7 @@ class SingularValueDecomposition
$iter = $iter + 1;
break;
- // Convergence.
+ // Convergence.
case 4:
// Make the singular values positive.
if ($this->s[$k] <= 0.0) {
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php
index 030df66df..16026c3ca 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Shared/StringHelper.php
@@ -3,7 +3,6 @@
namespace PhpOffice\PhpSpreadsheet\Shared;
use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use UConverter;
class StringHelper
{
@@ -334,26 +333,23 @@ class StringHelper
public static function sanitizeUTF8(string $textValue): string
{
$textValue = str_replace(["\xef\xbf\xbe", "\xef\xbf\xbf"], "\xef\xbf\xbd", $textValue);
- if (class_exists(UConverter::class)) {
- $returnValue = UConverter::transcode($textValue, 'UTF-8', 'UTF-8');
- if ($returnValue !== false) {
- return $returnValue;
- }
- }
- // @codeCoverageIgnoreStart
- // I don't think any of the code below should ever be executed.
- if (self::getIsIconvEnabled()) {
- $returnValue = @iconv('UTF-8', 'UTF-8', $textValue);
- if ($returnValue !== false) {
- return $returnValue;
- }
- }
-
+ $subst = mb_substitute_character(); // default is question mark
+ mb_substitute_character(65533); // Unicode substitution character
// Phpstan does not think this can return false.
$returnValue = mb_convert_encoding($textValue, 'UTF-8', 'UTF-8');
+ mb_substitute_character(/** @scrutinizer ignore-type */ $subst);
- return $returnValue;
- // @codeCoverageIgnoreEnd
+ return self::returnString($returnValue);
+ }
+
+ /**
+ * Strictly to satisfy Scrutinizer.
+ *
+ * @param mixed $value
+ */
+ private static function returnString($value): string
+ {
+ return is_string($value) ? $value : '';
}
/**
@@ -447,7 +443,7 @@ class StringHelper
}
}
- return mb_convert_encoding($textValue, $to, $from);
+ return self::returnString(mb_convert_encoding($textValue, $to, $from));
}
/**
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php
index 33b4fe0c4..364700e25 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Spreadsheet.php
@@ -3,10 +3,13 @@
namespace PhpOffice\PhpSpreadsheet;
use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PhpOffice\PhpSpreadsheet\Shared\File;
use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
use PhpOffice\PhpSpreadsheet\Style\Style;
use PhpOffice\PhpSpreadsheet\Worksheet\Iterator;
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
class Spreadsheet
{
@@ -721,6 +724,19 @@ class Spreadsheet
return null;
}
+ /**
+ * Get sheet by name, throwing exception if not found.
+ */
+ public function getSheetByNameOrThrow(string $worksheetName): Worksheet
+ {
+ $worksheet = $this->getSheetByName($worksheetName);
+ if ($worksheet === null) {
+ throw new Exception("Sheet $worksheetName does not exist.");
+ }
+
+ return $worksheet;
+ }
+
/**
* Get index for sheet.
*
@@ -1120,28 +1136,24 @@ class Spreadsheet
*/
public function copy()
{
- $copied = clone $this;
+ $filename = File::temporaryFilename();
+ $writer = new XlsxWriter($this);
+ $writer->setIncludeCharts(true);
+ $writer->save($filename);
- $worksheetCount = count($this->workSheetCollection);
- for ($i = 0; $i < $worksheetCount; ++$i) {
- $this->workSheetCollection[$i] = $this->workSheetCollection[$i]->copy();
- $this->workSheetCollection[$i]->rebindParent($this);
- }
+ $reader = new XlsxReader();
+ $reader->setIncludeCharts(true);
+ $reloadedSpreadsheet = $reader->load($filename);
+ unlink($filename);
- return $copied;
+ return $reloadedSpreadsheet;
}
- /**
- * Implement PHP __clone to create a deep clone, not just a shallow copy.
- */
public function __clone()
{
- // @phpstan-ignore-next-line
- foreach ($this as $key => $val) {
- if (is_object($val) || (is_array($val))) {
- $this->{$key} = unserialize(serialize($val));
- }
- }
+ throw new Exception(
+ 'Do not use clone on spreadsheet. Use spreadsheet->copy() instead.'
+ );
}
/**
@@ -1562,7 +1574,7 @@ class Spreadsheet
* Workbook window is hidden and cannot be shown in the
* user interface.
*
- * @param string $visibility visibility status of the workbook
+ * @param null|string $visibility visibility status of the workbook
*/
public function setVisibility($visibility): void
{
@@ -1596,7 +1608,7 @@ class Spreadsheet
*/
public function setTabRatio($tabRatio): void
{
- if ($tabRatio >= 0 || $tabRatio <= 1000) {
+ if ($tabRatio >= 0 && $tabRatio <= 1000) {
$this->tabRatio = (int) $tabRatio;
} else {
throw new Exception('Tab ratio must be between 0 and 1000.');
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php
index 83ac5b0da..68edfaca4 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Alignment.php
@@ -15,6 +15,27 @@ class Alignment extends Supervisor
const HORIZONTAL_JUSTIFY = 'justify';
const HORIZONTAL_FILL = 'fill';
const HORIZONTAL_DISTRIBUTED = 'distributed'; // Excel2007 only
+ private const HORIZONTAL_CENTER_CONTINUOUS_LC = 'centercontinuous';
+ // Mapping for horizontal alignment
+ const HORIZONTAL_ALIGNMENT_FOR_XLSX = [
+ self::HORIZONTAL_LEFT => self::HORIZONTAL_LEFT,
+ self::HORIZONTAL_RIGHT => self::HORIZONTAL_RIGHT,
+ self::HORIZONTAL_CENTER => self::HORIZONTAL_CENTER,
+ self::HORIZONTAL_CENTER_CONTINUOUS => self::HORIZONTAL_CENTER_CONTINUOUS,
+ self::HORIZONTAL_JUSTIFY => self::HORIZONTAL_JUSTIFY,
+ self::HORIZONTAL_FILL => self::HORIZONTAL_FILL,
+ self::HORIZONTAL_DISTRIBUTED => self::HORIZONTAL_DISTRIBUTED,
+ ];
+ // Mapping for horizontal alignment CSS
+ const HORIZONTAL_ALIGNMENT_FOR_HTML = [
+ self::HORIZONTAL_LEFT => self::HORIZONTAL_LEFT,
+ self::HORIZONTAL_RIGHT => self::HORIZONTAL_RIGHT,
+ self::HORIZONTAL_CENTER => self::HORIZONTAL_CENTER,
+ self::HORIZONTAL_CENTER_CONTINUOUS => self::HORIZONTAL_CENTER,
+ self::HORIZONTAL_JUSTIFY => self::HORIZONTAL_JUSTIFY,
+ //self::HORIZONTAL_FILL => self::HORIZONTAL_FILL, // no reasonable equivalent for fill
+ self::HORIZONTAL_DISTRIBUTED => self::HORIZONTAL_JUSTIFY,
+ ];
// Vertical alignment styles
const VERTICAL_BOTTOM = 'bottom';
@@ -22,6 +43,45 @@ class Alignment extends Supervisor
const VERTICAL_CENTER = 'center';
const VERTICAL_JUSTIFY = 'justify';
const VERTICAL_DISTRIBUTED = 'distributed'; // Excel2007 only
+ // Vertical alignment CSS
+ private const VERTICAL_BASELINE = 'baseline';
+ private const VERTICAL_MIDDLE = 'middle';
+ private const VERTICAL_SUB = 'sub';
+ private const VERTICAL_SUPER = 'super';
+ private const VERTICAL_TEXT_BOTTOM = 'text-bottom';
+ private const VERTICAL_TEXT_TOP = 'text-top';
+
+ // Mapping for vertical alignment
+ const VERTICAL_ALIGNMENT_FOR_XLSX = [
+ self::VERTICAL_BOTTOM => self::VERTICAL_BOTTOM,
+ self::VERTICAL_TOP => self::VERTICAL_TOP,
+ self::VERTICAL_CENTER => self::VERTICAL_CENTER,
+ self::VERTICAL_JUSTIFY => self::VERTICAL_JUSTIFY,
+ self::VERTICAL_DISTRIBUTED => self::VERTICAL_DISTRIBUTED,
+ // css settings that arent't in sync with Excel
+ self::VERTICAL_BASELINE => self::VERTICAL_BOTTOM,
+ self::VERTICAL_MIDDLE => self::VERTICAL_CENTER,
+ self::VERTICAL_SUB => self::VERTICAL_BOTTOM,
+ self::VERTICAL_SUPER => self::VERTICAL_TOP,
+ self::VERTICAL_TEXT_BOTTOM => self::VERTICAL_BOTTOM,
+ self::VERTICAL_TEXT_TOP => self::VERTICAL_TOP,
+ ];
+
+ // Mapping for vertical alignment for Html
+ const VERTICAL_ALIGNMENT_FOR_HTML = [
+ self::VERTICAL_BOTTOM => self::VERTICAL_BOTTOM,
+ self::VERTICAL_TOP => self::VERTICAL_TOP,
+ self::VERTICAL_CENTER => self::VERTICAL_MIDDLE,
+ self::VERTICAL_JUSTIFY => self::VERTICAL_MIDDLE,
+ self::VERTICAL_DISTRIBUTED => self::VERTICAL_MIDDLE,
+ // css settings that arent't in sync with Excel
+ self::VERTICAL_BASELINE => self::VERTICAL_BASELINE,
+ self::VERTICAL_MIDDLE => self::VERTICAL_MIDDLE,
+ self::VERTICAL_SUB => self::VERTICAL_SUB,
+ self::VERTICAL_SUPER => self::VERTICAL_SUPER,
+ self::VERTICAL_TEXT_BOTTOM => self::VERTICAL_TEXT_BOTTOM,
+ self::VERTICAL_TEXT_TOP => self::VERTICAL_TEXT_TOP,
+ ];
// Read order
const READORDER_CONTEXT = 0;
@@ -202,8 +262,9 @@ class Alignment extends Supervisor
*/
public function setHorizontal(string $horizontalAlignment)
{
- if ($horizontalAlignment == '') {
- $horizontalAlignment = self::HORIZONTAL_GENERAL;
+ $horizontalAlignment = strtolower($horizontalAlignment);
+ if ($horizontalAlignment === self::HORIZONTAL_CENTER_CONTINUOUS_LC) {
+ $horizontalAlignment = self::HORIZONTAL_CENTER_CONTINUOUS;
}
if ($this->isSupervisor) {
@@ -239,9 +300,7 @@ class Alignment extends Supervisor
*/
public function setVertical($verticalAlignment)
{
- if ($verticalAlignment == '') {
- $verticalAlignment = self::VERTICAL_BOTTOM;
- }
+ $verticalAlignment = strtolower($verticalAlignment);
if ($this->isSupervisor) {
$styleArray = $this->getStyleArray(['vertical' => $verticalAlignment]);
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php
index 9ab0c98fb..922be803c 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/Color.php
@@ -387,8 +387,6 @@ class Color extends Supervisor
* @param int $colorIndex Index entry point into the colour array
* @param bool $background Flag to indicate whether default background or foreground colour
* should be returned if the indexed colour doesn't exist
- *
- * @return Color
*/
public static function indexedColor($colorIndex, $background = false, ?array $palette = null): self
{
diff --git a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
index 54513670e..f7a2eee19 100644
--- a/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
+++ b/vendor/phpoffice/phpspreadsheet/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
@@ -11,10 +11,10 @@ class ConditionalDataBar
/** \n";
+ $html .= "
' . PHP_EOL . '' . PHP_EOL;
}
@@ -1227,7 +1217,7 @@ class Html extends BaseWriter
return $html;
}
- private function generateRowCellCss(Worksheet $worksheet, $cellAddress, $row, $columnNumber)
+ private function generateRowCellCss(Worksheet $worksheet, string $cellAddress, int $row, int $columnNumber): array
{
$cell = ($cellAddress > '') ? $worksheet->getCellCollection()->get($cellAddress) : '';
$coordinate = Coordinate::stringFromColumnIndex($columnNumber + 1) . ($row + 1);
@@ -1253,22 +1243,24 @@ class Html extends BaseWriter
return [$cell, $cssClass, $coordinate];
}
- private function generateRowCellDataValueRich($cell, &$cellData): void
+ private function generateRowCellDataValueRich(Cell $cell, string &$cellData): void
{
// Loop through rich text elements
$elements = $cell->getValue()->getRichTextElements();
foreach ($elements as $element) {
// Rich text start?
if ($element instanceof Run) {
- $cellData .= '';
-
$cellEnd = '';
- if ($element->getFont()->getSuperscript()) {
- $cellData .= '';
- $cellEnd = '';
- } elseif ($element->getFont()->getSubscript()) {
- $cellData .= '';
- $cellEnd = '';
+ if ($element->getFont() !== null) {
+ $cellData .= '';
+
+ if ($element->getFont()->getSuperscript()) {
+ $cellData .= '';
+ $cellEnd = '';
+ } elseif ($element->getFont()->getSubscript()) {
+ $cellData .= '';
+ $cellEnd = '';
+ }
}
// Convert UTF8 data to PCDATA
@@ -1286,23 +1278,22 @@ class Html extends BaseWriter
}
}
- private function generateRowCellDataValue(Worksheet $worksheet, $cell, &$cellData): void
+ private function generateRowCellDataValue(Worksheet $worksheet, Cell $cell, string &$cellData): void
{
if ($cell->getValue() instanceof RichText) {
$this->generateRowCellDataValueRich($cell, $cellData);
} else {
$origData = $this->preCalculateFormulas ? $cell->getCalculatedValue() : $cell->getValue();
$formatCode = $worksheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode();
- if ($formatCode !== null) {
- $cellData = NumberFormat::toFormattedString(
- $origData,
- $formatCode,
- [$this, 'formatColor']
- );
- }
+
+ $cellData = NumberFormat::toFormattedString(
+ $origData ?? '',
+ $formatCode ?? NumberFormat::FORMAT_GENERAL,
+ [$this, 'formatColor']
+ );
if ($cellData === $origData) {
- $cellData = htmlspecialchars($cellData ?? '', Settings::htmlEntityFlags());
+ $cellData = htmlspecialchars($cellData, Settings::htmlEntityFlags());
}
if ($worksheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSuperscript()) {
$cellData = '' . $cellData . '';
@@ -1312,7 +1303,11 @@ class Html extends BaseWriter
}
}
- private function generateRowCellData(Worksheet $worksheet, $cell, &$cssClass, $cellType)
+ /**
+ * @param null|Cell|string $cell
+ * @param array|string $cssClass
+ */
+ private function generateRowCellData(Worksheet $worksheet, $cell, &$cssClass, string $cellType): string
{
$cellData = ' ';
if ($cell instanceof Cell) {
@@ -1332,10 +1327,10 @@ class Html extends BaseWriter
$cellData = nl2br($cellData);
// Extend CSS class?
- if (!$this->useInlineCss) {
+ if (!$this->useInlineCss && is_string($cssClass)) {
$cssClass .= ' style' . $cell->getXfIndex();
$cssClass .= ' ' . $cell->getDataType();
- } else {
+ } elseif (is_array($cssClass)) {
if ($cellType == 'th') {
if (isset($this->cssStyles['th.style' . $cell->getXfIndex()])) {
$cssClass = array_merge($cssClass, $this->cssStyles['th.style' . $cell->getXfIndex()]);
@@ -1365,12 +1360,12 @@ class Html extends BaseWriter
return $cellData;
}
- private function generateRowIncludeCharts(Worksheet $worksheet, $coordinate)
+ private function generateRowIncludeCharts(Worksheet $worksheet, string $coordinate): string
{
return $this->includeCharts ? $this->writeChartInCell($worksheet, $coordinate) : '';
}
- private function generateRowSpans($html, $rowSpan, $colSpan)
+ private function generateRowSpans(string $html, int $rowSpan, int $colSpan): string
{
$html .= ($colSpan > 1) ? (' colspan="' . $colSpan . '"') : '';
$html .= ($rowSpan > 1) ? (' rowspan="' . $rowSpan . '"') : '';
@@ -1378,7 +1373,10 @@ class Html extends BaseWriter
return $html;
}
- private function generateRowWriteCell(&$html, Worksheet $worksheet, $coordinate, $cellType, $cellData, $colSpan, $rowSpan, $cssClass, $colNum, $sheetIndex, $row): void
+ /**
+ * @param array|string $cssClass
+ */
+ private function generateRowWriteCell(string &$html, Worksheet $worksheet, string $coordinate, string $cellType, string $cellData, int $colSpan, int $rowSpan, $cssClass, int $colNum, int $sheetIndex, int $row): void
{
// Image?
$htmlx = $this->writeImageInCell($worksheet, $coordinate);
@@ -1386,7 +1384,7 @@ class Html extends BaseWriter
$htmlx .= $this->generateRowIncludeCharts($worksheet, $coordinate);
// Column start
$html .= ' <' . $cellType;
- if (!$this->useInlineCss && !$this->isPdf) {
+ if (!$this->useInlineCss && !$this->isPdf && is_string($cssClass)) {
$html .= ' class="' . $cssClass . '"';
if ($htmlx) {
$html .= " style='position: relative;'";
@@ -1396,9 +1394,11 @@ class Html extends BaseWriter
// We must explicitly write the width of the " . PHP_EOL;
} else {
- $html .= "
\n";
+ $html .= "
" . PHP_EOL;
}
$this->generateTableTag($worksheet, $id, $html, $sheetIndex);
@@ -1181,7 +1171,7 @@ class Html extends BaseWriter
/**
* Generate table footer.
*/
- private function generateTableFooter()
+ private function generateTableFooter(): string
{
return '