Skip to content

Update JpGraphRendererBase.php - check existing of PlotLabel #4074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 30, 2024
Merged

Update JpGraphRendererBase.php - check existing of PlotLabel #4074

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
acd0e38
Update JpGraphRendererBase.php - check existing of PlotLabel
yfinkel Jun 26, 2024
36f3168
Check existing of PlotLabel before using its method getDataValue()
yfinkel Jun 26, 2024
17fc623
Update JpGraphRendererBase.php
yfinkel Jun 26, 2024
ccee869
getDataLabel defends against empty labels
yfinkel Jun 28, 2024
f369340
getDataLabel defends against empty labels
yfinkel Jun 28, 2024
766a73c
getDataLabel() defends against empty labels
yfinkel Jun 28, 2024
3b37d3e
getDataLabel() defends against empty labels
yfinkel Jun 28, 2024
675efc1
getDataLabel() defends against empty labels
yfinkel Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,9 @@ private function renderPlotLine(int $groupID, bool $filled = false, bool $combin
// Set the appropriate plot marker
$this->formatPointMarker($seriesPlot, $marker);
}
$dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($index)->getDataValue();
if ($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($index)) {
$dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($index)->getDataValue();
}
Copy link
Collaborator

@oleibman oleibman Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think seriesPlot->SetLegend($dataLabel) needs to be inside the if statement, otherwise dataLabel will not be defined.

Copy link
Collaborator

@oleibman oleibman Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, please add a unit test to demonstrate that there was a problem before your fix and you've fixed it.

$seriesPlot->SetLegend($dataLabel);

$seriesPlots[] = $seriesPlot;
Expand Down