From a8e179d5d9c78e66ba64b86a0017608454de0ead Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 16 Mar 2022 15:59:53 -0700
Subject: [PATCH] Scrutinizer Complains Some Samples Class Name Conflict with
 Jpgraph (#2684)

Jpgraph does not use namespaces. Neither do the Samples members of this project. As a result, Scrutinizer complains about 13 cases of `use PhpOffice\PhpSpreadsheet\Chart\Legend;`, since this theoretically could cause the use of two different Legend classes in the empty namespace. It suggests using a class alias for Legend, which this PR does in every applicable case. It is a regrettable problem, but it is easy to fix.
---
 samples/Chart/33_Chart_create_area.php              | 4 ++--
 samples/Chart/33_Chart_create_bar_stacked.php       | 4 ++--
 samples/Chart/33_Chart_create_column.php            | 4 ++--
 samples/Chart/33_Chart_create_column_2.php          | 4 ++--
 samples/Chart/33_Chart_create_composite.php         | 4 ++--
 samples/Chart/33_Chart_create_line.php              | 4 ++--
 samples/Chart/33_Chart_create_multiple_charts.php   | 6 +++---
 samples/Chart/33_Chart_create_pie.php               | 4 ++--
 samples/Chart/33_Chart_create_pie_custom_colors.php | 4 ++--
 samples/Chart/33_Chart_create_radar.php             | 4 ++--
 samples/Chart/33_Chart_create_scatter.php           | 4 ++--
 samples/Chart/33_Chart_create_stock.php             | 4 ++--
 samples/templates/chartSpreadsheet.php              | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/samples/Chart/33_Chart_create_area.php b/samples/Chart/33_Chart_create_area.php
index 57db90fc..95d9149c 100644
--- a/samples/Chart/33_Chart_create_area.php
+++ b/samples/Chart/33_Chart_create_area.php
@@ -3,7 +3,7 @@
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
-use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -71,7 +71,7 @@ $series = new DataSeries(
 // Set the series in the plot area
 $plotArea = new PlotArea(null, [$series]);
 // Set the chart legend
-$legend = new Legend(Legend::POSITION_TOPRIGHT, null, false);
+$legend = new ChartLegend(ChartLegend::POSITION_TOPRIGHT, null, false);
 
 $title = new Title('Test %age-Stacked Area Chart');
 $yAxisLabel = new Title('Value ($k)');
diff --git a/samples/Chart/33_Chart_create_bar_stacked.php b/samples/Chart/33_Chart_create_bar_stacked.php
index 0c87224e..bb2d8f6d 100644
--- a/samples/Chart/33_Chart_create_bar_stacked.php
+++ b/samples/Chart/33_Chart_create_bar_stacked.php
@@ -3,7 +3,7 @@
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
-use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -74,7 +74,7 @@ $series->setPlotDirection(DataSeries::DIRECTION_BAR);
 // Set the series in the plot area
 $plotArea = new PlotArea(null, [$series]);
 // Set the chart legend
-$legend = new Legend(Legend::POSITION_RIGHT, null, false);
+$legend = new ChartLegend(ChartLegend::POSITION_RIGHT, null, false);
 
 $title = new Title('Test Chart');
 $yAxisLabel = new Title('Value ($k)');
diff --git a/samples/Chart/33_Chart_create_column.php b/samples/Chart/33_Chart_create_column.php
index 5af0908c..68aa983d 100644
--- a/samples/Chart/33_Chart_create_column.php
+++ b/samples/Chart/33_Chart_create_column.php
@@ -3,7 +3,7 @@
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
-use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -74,7 +74,7 @@ $series->setPlotDirection(DataSeries::DIRECTION_COL);
 // Set the series in the plot area
 $plotArea = new PlotArea(null, [$series]);
 // Set the chart legend
-$legend = new Legend(Legend::POSITION_RIGHT, null, false);
+$legend = new ChartLegend(ChartLegend::POSITION_RIGHT, null, false);
 
 $title = new Title('Test Column Chart');
 $yAxisLabel = new Title('Value ($k)');
diff --git a/samples/Chart/33_Chart_create_column_2.php b/samples/Chart/33_Chart_create_column_2.php
index a62b4906..96f5e316 100644
--- a/samples/Chart/33_Chart_create_column_2.php
+++ b/samples/Chart/33_Chart_create_column_2.php
@@ -3,7 +3,7 @@
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
-use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -82,7 +82,7 @@ $series->setPlotDirection(DataSeries::DIRECTION_COL);
 // Set the series in the plot area
 $plotArea = new PlotArea(null, [$series]);
 // Set the chart legend
-$legend = new Legend(Legend::POSITION_BOTTOM, null, false);
+$legend = new ChartLegend(ChartLegend::POSITION_BOTTOM, null, false);
 
 $title = new Title('Test Grouped Column Chart');
 $xAxisLabel = new Title('Financial Period');
diff --git a/samples/Chart/33_Chart_create_composite.php b/samples/Chart/33_Chart_create_composite.php
index ce42d2fc..b2952420 100644
--- a/samples/Chart/33_Chart_create_composite.php
+++ b/samples/Chart/33_Chart_create_composite.php
@@ -3,7 +3,7 @@
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
-use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -128,7 +128,7 @@ $series3 = new DataSeries(
 // Set the series in the plot area
 $plotArea = new PlotArea(null, [$series1, $series2, $series3]);
 // Set the chart legend
-$legend = new Legend(Legend::POSITION_RIGHT, null, false);
+$legend = new ChartLegend(ChartLegend::POSITION_RIGHT, null, false);
 
 $title = new Title('Average Weather Chart for Crete');
 
diff --git a/samples/Chart/33_Chart_create_line.php b/samples/Chart/33_Chart_create_line.php
index feae2f27..fee2a284 100644
--- a/samples/Chart/33_Chart_create_line.php
+++ b/samples/Chart/33_Chart_create_line.php
@@ -3,7 +3,7 @@
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
-use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -72,7 +72,7 @@ $series = new DataSeries(
 // Set the series in the plot area
 $plotArea = new PlotArea(null, [$series]);
 // Set the chart legend
-$legend = new Legend(Legend::POSITION_TOPRIGHT, null, false);
+$legend = new ChartLegend(ChartLegend::POSITION_TOPRIGHT, null, false);
 
 $title = new Title('Test Stacked Line Chart');
 $yAxisLabel = new Title('Value ($k)');
diff --git a/samples/Chart/33_Chart_create_multiple_charts.php b/samples/Chart/33_Chart_create_multiple_charts.php
index 608ffc53..3032bc28 100644
--- a/samples/Chart/33_Chart_create_multiple_charts.php
+++ b/samples/Chart/33_Chart_create_multiple_charts.php
@@ -3,7 +3,7 @@
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
-use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -71,7 +71,7 @@ $series1 = new DataSeries(
 // Set the series in the plot area
 $plotArea1 = new PlotArea(null, [$series1]);
 // Set the chart legend
-$legend1 = new Legend(Legend::POSITION_TOPRIGHT, null, false);
+$legend1 = new ChartLegend(ChartLegend::POSITION_TOPRIGHT, null, false);
 
 $title1 = new Title('Test %age-Stacked Area Chart');
 $yAxisLabel1 = new Title('Value ($k)');
@@ -146,7 +146,7 @@ $series2->setPlotDirection(DataSeries::DIRECTION_COL);
 // Set the series in the plot area
 $plotArea2 = new PlotArea(null, [$series2]);
 // Set the chart legend
-$legend2 = new Legend(Legend::POSITION_RIGHT, null, false);
+$legend2 = new ChartLegend(ChartLegend::POSITION_RIGHT, null, false);
 
 $title2 = new Title('Test Column Chart');
 $yAxisLabel2 = new Title('Value ($k)');
diff --git a/samples/Chart/33_Chart_create_pie.php b/samples/Chart/33_Chart_create_pie.php
index 5480a18a..4b35b24e 100644
--- a/samples/Chart/33_Chart_create_pie.php
+++ b/samples/Chart/33_Chart_create_pie.php
@@ -4,7 +4,7 @@ use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
 use PhpOffice\PhpSpreadsheet\Chart\Layout;
-use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -73,7 +73,7 @@ $layout1->setShowPercent(true);
 // Set the series in the plot area
 $plotArea1 = new PlotArea($layout1, [$series1]);
 // Set the chart legend
-$legend1 = new Legend(Legend::POSITION_RIGHT, null, false);
+$legend1 = new ChartLegend(ChartLegend::POSITION_RIGHT, null, false);
 
 $title1 = new Title('Test Pie Chart');
 
diff --git a/samples/Chart/33_Chart_create_pie_custom_colors.php b/samples/Chart/33_Chart_create_pie_custom_colors.php
index ca5397a1..91f7e51b 100644
--- a/samples/Chart/33_Chart_create_pie_custom_colors.php
+++ b/samples/Chart/33_Chart_create_pie_custom_colors.php
@@ -4,7 +4,7 @@ use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
 use PhpOffice\PhpSpreadsheet\Chart\Layout;
-use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -79,7 +79,7 @@ $layout1->setShowPercent(true);
 // Set the series in the plot area
 $plotArea1 = new PlotArea($layout1, [$series1]);
 // Set the chart legend
-$legend1 = new Legend(Legend::POSITION_RIGHT, null, false);
+$legend1 = new ChartLegend(ChartLegend::POSITION_RIGHT, null, false);
 
 $title1 = new Title('Test Pie Chart');
 
diff --git a/samples/Chart/33_Chart_create_radar.php b/samples/Chart/33_Chart_create_radar.php
index eba4dc39..59a8a5d9 100644
--- a/samples/Chart/33_Chart_create_radar.php
+++ b/samples/Chart/33_Chart_create_radar.php
@@ -4,7 +4,7 @@ use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
 use PhpOffice\PhpSpreadsheet\Chart\Layout;
-use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -85,7 +85,7 @@ $layout = new Layout();
 // Set the series in the plot area
 $plotArea = new PlotArea($layout, [$series]);
 // Set the chart legend
-$legend = new Legend(Legend::POSITION_RIGHT, null, false);
+$legend = new ChartLegend(ChartLegend::POSITION_RIGHT, null, false);
 
 $title = new Title('Test Radar Chart');
 
diff --git a/samples/Chart/33_Chart_create_scatter.php b/samples/Chart/33_Chart_create_scatter.php
index c67e4e95..9a54c18b 100644
--- a/samples/Chart/33_Chart_create_scatter.php
+++ b/samples/Chart/33_Chart_create_scatter.php
@@ -3,7 +3,7 @@
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
-use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -68,7 +68,7 @@ $series = new DataSeries(
 // Set the series in the plot area
 $plotArea = new PlotArea(null, [$series]);
 // Set the chart legend
-$legend = new Legend(Legend::POSITION_TOPRIGHT, null, false);
+$legend = new ChartLegend(ChartLegend::POSITION_TOPRIGHT, null, false);
 
 $title = new Title('Test Scatter Chart');
 $yAxisLabel = new Title('Value ($k)');
diff --git a/samples/Chart/33_Chart_create_stock.php b/samples/Chart/33_Chart_create_stock.php
index 58686784..34fa3a6c 100644
--- a/samples/Chart/33_Chart_create_stock.php
+++ b/samples/Chart/33_Chart_create_stock.php
@@ -3,7 +3,7 @@
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
-use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -79,7 +79,7 @@ $series = new DataSeries(
 // Set the series in the plot area
 $plotArea = new PlotArea(null, [$series]);
 // Set the chart legend
-$legend = new Legend(Legend::POSITION_RIGHT, null, false);
+$legend = new ChartLegend(ChartLegend::POSITION_RIGHT, null, false);
 
 $title = new Title('Test Stock Chart');
 $xAxisLabel = new Title('Counts');
diff --git a/samples/templates/chartSpreadsheet.php b/samples/templates/chartSpreadsheet.php
index 2ad61d32..a5b1b882 100644
--- a/samples/templates/chartSpreadsheet.php
+++ b/samples/templates/chartSpreadsheet.php
@@ -3,7 +3,7 @@
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
-use PhpOffice\PhpSpreadsheet\Chart\Legend;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -71,7 +71,7 @@ $series->setPlotDirection(DataSeries::DIRECTION_BAR);
 // Set the series in the plot area
 $plotArea = new PlotArea(null, [$series]);
 // Set the chart legend
-$legend = new Legend(Legend::POSITION_RIGHT, null, false);
+$legend = new ChartLegend(ChartLegend::POSITION_RIGHT, null, false);
 
 $title = new Title('Test Bar Chart');
 $yAxisLabel = new Title('Value ($k)');