Merge remote-tracking branch 'github/feat-bar-overlap' into feat-bar-overlap

Author: mindline-analytics

docs/usage/shapes/chart.md

@@ -334,7 +334,7 @@ $barChart->setGapWidthPercent(250);
 #### Overlap
 
 You can define the bar overlap within bars or columns clusters. It is defined in percent.
-The default value is 100% for stacked and 0% for grouped bar charts. The value must be defined between -100 and 100.
+The default value is `100%` for stacked and `0%` for grouped bar charts. The value must be defined between -100 and 100.
 
 When defining the bar grouping type, the default overlap values will be set. Any changes to the overlap must be made after setting the bar grouping type through `setBarGrouping`.
 

src/PhpPresentation/Shape/Chart/Type/AbstractTypeBar.php

@@ -143,25 +143,25 @@ public function setGapWidthPercent($gapWidthPercent)
     /**
      * @return int
      */
-    public function getOverlapWidthPercent()
+    public function getOverlapWidthPercent(): int
     {
         return $this->overlapWidthPercent;
     }
 
     /**
      * @param int $overlapWidthPercent
      *
-     * @return $this
+     * @return self
      */
-    public function setOverlapWidthPercent($overlapWidthPercent)
+    public function setOverlapWidthPercent(int $value): self
     {
-        if ($overlapWidthPercent < -100) {
-            $overlapWidthPercent = -100;
+        if ($value < -100) {
+            $value = -100;
         }
-        if ($overlapWidthPercent > 100) {
-            $overlapWidthPercent = 100;
+        if ($value > 100) {
+            $value = 100;
         }
-        $this->overlapWidthPercent = $overlapWidthPercent;
+        $this->overlapWidthPercent = $value;
 
         return $this;
     }

tests/PhpPresentation/Tests/Shape/Chart/Type/BarTest.php

@@ -108,11 +108,11 @@ public function testOverlapWidthPercent(): void
         $value = mt_rand(-100, 100);
         $object = new Bar();
         $this->assertEquals(0, $object->getOverlapWidthPercent());
-        $this->assertInstanceOf('PhpOffice\\PhpPresentation\\Shape\\Chart\\Type\\Bar', $object->setOverlapWidthPercent($value));
+        $this->assertInstanceOf(Bar::class, $object->setOverlapWidthPercent($value));
         $this->assertEquals($value, $object->getOverlapWidthPercent());
-        $this->assertInstanceOf('PhpOffice\\PhpPresentation\\Shape\\Chart\\Type\\Bar', $object->setOverlapWidthPercent(101));
+        $this->assertInstanceOf(Bar::class, $object->setOverlapWidthPercent(101));
         $this->assertEquals(100, $object->getOverlapWidthPercent());
-        $this->assertInstanceOf('PhpOffice\\PhpPresentation\\Shape\\Chart\\Type\\Bar', $object->setOverlapWidthPercent(-101));
+        $this->assertInstanceOf(Bar::class, $object->setOverlapWidthPercent(-101));
         $this->assertEquals(-100, $object->getOverlapWidthPercent());
     }
 

tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptChartsTest.php

@@ -582,8 +582,7 @@ public function testTypeBar(): void
         $oShape->setResizeProportional(false)->setHeight(550)->setWidth(700)->setOffsetX(120)->setOffsetY(80);
         $oBar = new Bar();
         $oBar->setGapWidthPercent($valueGapWidthPercent);
-        $valueOverlapWidthPercent = -10;
-        $oBar->setOverlapWidthPercent($valueOverlapWidthPercent);
+        $oBar->setOverlapWidthPercent(-10);
         $oSeries = new Series('Downloads', $this->seriesData);
         $oSeries->getDataPointFill(0)->setFillType(Fill::FILL_SOLID)->setStartColor(new Color(Color::COLOR_BLUE));
         $oSeries->getDataPointFill(1)->setFillType(Fill::FILL_SOLID)->setStartColor(new Color(Color::COLOR_DARKBLUE));
@@ -606,7 +605,7 @@ public function testTypeBar(): void
         $element = '/c:chartSpace/c:chart/c:plotArea/c:barChart/c:gapWidth';
         $this->assertZipXmlAttributeEquals('ppt/charts/' . $oShape->getIndexedFilename(), $element, 'val', $valueGapWidthPercent);
         $element = '/c:chartSpace/c:chart/c:plotArea/c:barChart/c:overlap';
-        $this->assertZipXmlAttributeEquals('ppt/charts/' . $oShape->getIndexedFilename(), $element, 'val', $valueOverlapWidthPercent);
+        $this->assertZipXmlAttributeEquals('ppt/charts/' . $oShape->getIndexedFilename(), $element, 'val', $oBar->getOverlapWidthPercent());
 
         $this->assertIsSchemaECMA376Valid();
     }