Handle Style Objects Passed to Element Constructors

Original PR PHPOffice#2685 by @hazington.

Author: oleibman

src/PhpWord/Element/AbstractElement.php

@@ -479,7 +479,7 @@ public function isInSection()
     }
 
     /**
-     * Set new style value.
+     * Set new style value. PR #2685.
      *
      * @param mixed $styleObject Style object
      * @param null|AbstractStyle|array|string $styleValue Style value
@@ -489,14 +489,16 @@ public function isInSection()
      */
     protected function setNewStyle($styleObject, $styleValue = null, $returnObject = false)
     {
-        if (null !== $styleValue && is_array($styleValue)) {
+        if ($styleValue instanceof AbstractStyle && get_class($styleValue) === get_class($styleObject)) {
+            return $styleValue;
+        }
+        if (is_array($styleValue)) {
             $styleObject->setStyleByArray($styleValue);
-            $style = $styleObject;
-        } else {
-            $style = $returnObject ? $styleObject : $styleValue;
+
+            return $styleObject;
         }
 
-        return $style;
+        return $returnObject ? $styleObject : $styleValue;
     }
 
     /**

tests/PhpWordTests/Element/CellTest.php

@@ -48,6 +48,17 @@ public function testConstructWithStyleArray(): void
         self::assertNull($oCell->getWidth());
     }
 
+    /**
+     * Test if the style object passed to the constructor is actually used.
+     */
+    public function testConstructWithStyleObject(): void
+    {
+        $style = new \PhpOffice\PhpWord\Style\Cell();
+        $oCell = new Cell(null, $style);
+
+        self::assertSame($style, $oCell->getStyle());
+    }
+
     /**
      * Add text.
      */

tests/PhpWordTests/Writer/EPub3/Element/ImageTest.php

@@ -10,60 +10,43 @@
 
 class ImageTest extends TestCase
 {
-    /**
-     * @var XMLWriter
-     */
-    private $xmlWriter;
-
-    /**
-     * @var Image
-     */
-    private $element;
-
-    /**
-     * @var ImageWriter
-     */
-    private $writer;
-
-    protected function setUp(): void
+    public function testWrite(): void
     {
-        $this->xmlWriter = new XMLWriter();
+        $xmlWriter = new XMLWriter();
         $style = new ImageStyle();
         $style->setWidth(100);
         $style->setHeight(100);
-        $this->element = new Image('tests/PhpWordTests/_files/images/earth.jpg', $style);
-        $this->writer = new ImageWriter($this->xmlWriter, $this->element);
-    }
-
-    public function testWrite(): void
-    {
-        $this->writer->write();
+        $element = new Image('tests/PhpWordTests/_files/images/earth.jpg', $style);
+        $writer = new ImageWriter($xmlWriter, $element);
+        $writer->write();
 
-        $expected = '<p><img src="media/image.jpg" style="width:500px;height:500px;"/></p>';
-        self::assertEquals($expected, $this->xmlWriter->getData());
+        $expected = '<p><img src="media/image.jpg" style="width:100px;height:100px;"/></p>';
+        self::assertSame($expected, $xmlWriter->getData());
     }
 
     public function testWriteWithoutP(): void
     {
+        $xmlWriter = new XMLWriter();
         $style = new ImageStyle();
         $style->setWidth(100);
         $style->setHeight(100);
-        $this->element = new Image('tests/PhpWordTests/_files/images/earth.jpg', $style);
-        $this->writer = new ImageWriter($this->xmlWriter, $this->element, true);
+        $element = new Image('tests/PhpWordTests/_files/images/earth.jpg', $style);
+        $writer = new ImageWriter($xmlWriter, $element, true);
 
-        $this->writer->write();
+        $writer->write();
 
-        $expected = '<img src="media/image.jpg" style="width:500px;height:500px;"/>';
-        self::assertEquals($expected, $this->xmlWriter->getData());
+        $expected = '<img src="media/image.jpg" style="width:100px;height:100px;"/>';
+        self::assertSame($expected, $xmlWriter->getData());
     }
 
     public function testWriteWithInvalidElement(): void
     {
+        $xmlWriter = new XMLWriter();
         $invalidElement = $this->createMock(\PhpOffice\PhpWord\Element\AbstractElement::class);
-        $writer = new ImageWriter($this->xmlWriter, $invalidElement);
+        $writer = new ImageWriter($xmlWriter, $invalidElement);
 
         $writer->write();
 
-        self::assertEquals('', $this->xmlWriter->getData());
+        self::assertSame('', $xmlWriter->getData());
     }
 }