Revert xml element method in ChartTypes

PHPOffice · Aug 14, 2021 · c3e6ad9 · c3e6ad9
1 parent d7d3099
commit c3e6ad9
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 74 deletions.
diff --git a/src/PhpPresentation/Shape/Chart/Type/AbstractType.php b/src/PhpPresentation/Shape/Chart/Type/AbstractType.php
@@ -52,13 +52,6 @@ abstract class AbstractType implements ComparableInterface
      */
     private $series = [];
 
-    /**
-     * Returns xml element name for a chart type implementation
-     *
-     * @return string
-     */
-    abstract public function getXmlElementName(): string;
-
     /**
      * Has Axis X?
      */

diff --git a/src/PhpPresentation/Shape/Chart/Type/Area.php b/src/PhpPresentation/Shape/Chart/Type/Area.php
@@ -39,9 +39,4 @@ public function getHashCode(): string
 
         return md5($hash . __CLASS__);
     }
-
-    public function getXmlElementName(): string
-    {
-        return 'c:areaChart';
-    }
 }
diff --git a/src/PhpPresentation/Shape/Chart/Type/Bar.php b/src/PhpPresentation/Shape/Chart/Type/Bar.php
@@ -34,9 +34,4 @@ public function getHashCode(): string
     {
         return md5(parent::getHashCode() . __CLASS__);
     }
-
-    public function getXmlElementName(): string
-    {
-        return 'c:barChart';
-    }
 }
diff --git a/src/PhpPresentation/Shape/Chart/Type/Bar3D.php b/src/PhpPresentation/Shape/Chart/Type/Bar3D.php
@@ -34,9 +34,4 @@ public function getHashCode(): string
     {
         return md5(parent::getHashCode() . __CLASS__);
     }
-
-    public function getXmlElementName(): string
-    {
-        return 'c:bar3DChart';
-    }
 }
diff --git a/src/PhpPresentation/Shape/Chart/Type/Doughnut.php b/src/PhpPresentation/Shape/Chart/Type/Doughnut.php
@@ -69,9 +69,4 @@ public function getHashCode(): string
     {
         return md5(parent::getHashCode() . __CLASS__);
     }
-
-    public function getXmlElementName(): string
-    {
-        return 'c:doughnutChart';
-    }
 }
diff --git a/src/PhpPresentation/Shape/Chart/Type/Line.php b/src/PhpPresentation/Shape/Chart/Type/Line.php
@@ -36,9 +36,4 @@ public function getHashCode(): string
 
         return md5(parent::getHashCode() . $hash . __CLASS__);
     }
-
-    public function getXmlElementName(): string
-    {
-        return 'c:lineChart';
-    }
 }
diff --git a/src/PhpPresentation/Shape/Chart/Type/Pie.php b/src/PhpPresentation/Shape/Chart/Type/Pie.php
@@ -34,9 +34,4 @@ public function getHashCode(): string
     {
         return md5(parent::getHashCode() . __CLASS__);
     }
-
-    public function getXmlElementName(): string
-    {
-        return 'c:pieChart';
-    }
 }
diff --git a/src/PhpPresentation/Shape/Chart/Type/Pie3D.php b/src/PhpPresentation/Shape/Chart/Type/Pie3D.php
@@ -34,9 +34,4 @@ public function getHashCode(): string
     {
         return md5(parent::getHashCode() . __CLASS__);
     }
-
-    public function getXmlElementName(): string
-    {
-        return 'c:pie3DChart';
-    }
 }
diff --git a/src/PhpPresentation/Shape/Chart/Type/Radar.php b/src/PhpPresentation/Shape/Chart/Type/Radar.php
@@ -36,9 +36,4 @@ public function getHashCode(): string
 
         return md5($hash . __CLASS__);
     }
-
-    public function getXmlElementName(): string
-    {
-        return 'c:radarChart';
-    }
 }
diff --git a/src/PhpPresentation/Shape/Chart/Type/Scatter.php b/src/PhpPresentation/Shape/Chart/Type/Scatter.php
@@ -36,9 +36,4 @@ public function getHashCode(): string
 
         return md5(parent::getHashCode() . $hash . __CLASS__);
     }
-
-    public function getXmlElementName(): string
-    {
-        return 'c:scatterChart';
-    }
 }
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptCharts.php b/src/PhpPresentation/Writer/PowerPoint2007/PptCharts.php
@@ -701,7 +701,7 @@ protected function writeLayout(XMLWriter $objWriter, $subject): void
     protected function writeTypeArea(XMLWriter $objWriter, Area $subject, bool $includeSheet = false): void
     {
         // c:lineChart
-        $objWriter->startElement($subject->getXmlElementName());
+        $objWriter->startElement('c:areaChart');
 
         // c:grouping
         $objWriter->startElement('c:grouping');
@@ -804,7 +804,7 @@ protected function writeTypeArea(XMLWriter $objWriter, Area $subject, bool $incl
     protected function writeTypeBar(XMLWriter $objWriter, Bar $subject, bool $includeSheet = false): void
     {
         // c:barChart
-        $objWriter->startElement($subject->getXmlElementName());
+        $objWriter->startElement('c:barChart');
 
         // c:barDir
         $objWriter->startElement('c:barDir');
@@ -1017,7 +1017,7 @@ protected function writeTypeBar(XMLWriter $objWriter, Bar $subject, bool $includ
     protected function writeTypeBar3D(XMLWriter $objWriter, Bar3D $subject, bool $includeSheet = false): void
     {
         // c:bar3DChart
-        $objWriter->startElement($subject->getXmlElementName());
+        $objWriter->startElement('c:bar3DChart');
 
         // c:barDir
         $objWriter->startElement('c:barDir');
@@ -1210,7 +1210,7 @@ protected function writeTypeBar3D(XMLWriter $objWriter, Bar3D $subject, bool $in
     protected function writeTypeDoughnut(XMLWriter $objWriter, Doughnut $subject, bool $includeSheet = false): void
     {
         // c:pieChart
-        $objWriter->startElement($subject->getXmlElementName());
+        $objWriter->startElement('c:doughnutChart');
 
         // c:varyColors
         $objWriter->startElement('c:varyColors');
@@ -1369,7 +1369,7 @@ protected function writeTypeDoughnut(XMLWriter $objWriter, Doughnut $subject, bo
     protected function writeTypePie(XMLWriter $objWriter, Pie $subject, bool $includeSheet = false): void
     {
         // c:pieChart
-        $objWriter->startElement($subject->getXmlElementName());
+        $objWriter->startElement('c:pieChart');
 
         // c:varyColors
         $objWriter->startElement('c:varyColors');
@@ -1534,7 +1534,7 @@ protected function writeTypePie(XMLWriter $objWriter, Pie $subject, bool $includ
     protected function writeTypePie3D(XMLWriter $objWriter, Pie3D $subject, bool $includeSheet = false): void
     {
         // c:pie3DChart
-        $objWriter->startElement($subject->getXmlElementName());
+        $objWriter->startElement('c:pie3DChart');
 
         // c:varyColors
         $objWriter->startElement('c:varyColors');
@@ -1693,7 +1693,7 @@ protected function writeTypePie3D(XMLWriter $objWriter, Pie3D $subject, bool $in
     protected function writeTypeLine(XMLWriter $objWriter, Line $subject, bool $includeSheet = false): void
     {
         // c:lineChart
-        $objWriter->startElement($subject->getXmlElementName());
+        $objWriter->startElement('c:lineChart');
 
         // c:grouping
         $objWriter->startElement('c:grouping');
@@ -1864,7 +1864,7 @@ protected function writeTypeLine(XMLWriter $objWriter, Line $subject, bool $incl
     protected function writeTypeRadar(XMLWriter $objWriter, Radar $subject, bool $includeSheet = false): void
     {
         // c:scatterChart
-        $objWriter->startElement($subject->getXmlElementName());
+        $objWriter->startElement('c:radarChart');
 
         // c:radarStyle
         $objWriter->startElement('c:radarStyle');
@@ -2028,7 +2028,7 @@ protected function writeTypeRadar(XMLWriter $objWriter, Radar $subject, bool $in
     protected function writeTypeScatter(XMLWriter $objWriter, Scatter $subject, bool $includeSheet = false): void
     {
         // c:scatterChart
-        $objWriter->startElement($subject->getXmlElementName());
+        $objWriter->startElement('c:scatterChart');
 
         // c:scatterStyle
         $objWriter->startElement('c:scatterStyle');

diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptChartsTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptChartsTest.php
@@ -85,7 +85,7 @@ public function testChartDisplayBlankAs(): void
     /**
      * @dataProvider dataProviderIncludedSpreadsheet
      */
-    public function testChartIncludeSpreadsheet(string $chartType): void
+    public function testChartIncludeSpreadsheet(string $chartType, string $chartElementName): void
     {
         $oSlide = $this->oPresentation->getActiveSlide();
         $oShape = $oSlide->createChartShape();
@@ -96,7 +96,6 @@ public function testChartIncludeSpreadsheet(string $chartType): void
         $oChart->addSeries($oSeries);
         $oShape->getPlotArea()->setType($oChart);
 
-        $chartElementName = $oChart->getXmlElementName();
         $chartBaseXmlPath = sprintf('/c:chartSpace/c:chart/c:plotArea/%s', $chartElementName);
 
         $this->assertTrue($oShape->hasIncludedSpreadsheet());
@@ -1497,23 +1496,23 @@ public function dataProviderMarkerSymbol(): iterable
     }
 
     /**
-     * @return array<array<string>>
+     * @return array<array<string, string>>
      */
     public function dataProviderIncludedSpreadsheet(): iterable
     {
         $chartTypes = [
-            Area::class,
-            Bar::class,
-            Bar3D::class,
-            Doughnut::class,
-            Pie::class,
-            Pie3D::class,
-            Line::class,
-            Radar::class,
-            Scatter::class,
+            [Area::class, 'c:areaChart'],
+            [Bar::class, 'c:barChart'],
+            [Bar3D::class, 'c:bar3DChart'],
+            [Doughnut::class, 'c:doughnutChart'],
+            [Pie::class, 'c:pieChart'],
+            [Pie3D::class, 'c:pie3DChart'],
+            [Line::class, 'c:lineChart'],
+            [Radar::class, 'c:radarChart'],
+            [Scatter::class, 'c:scatterChart'],
         ];
         foreach ($chartTypes as $chartType) {
-            yield [$chartType];
+            yield $chartType;
         }
     }
 }