Type checks on style writers

ivanlanin · ivanlanin · commit 17e2f0281796 · 2014-05-11T11:23:46.000+07:00
diff --git a/src/PhpWord/Writer/HTML/Style/Font.php b/src/PhpWord/Writer/HTML/Style/Font.php
@@ -35,6 +35,9 @@ class Font extends AbstractStyle
     public function write()
     {
         $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Font) {
+            return;
+        }
         $css = array();
 
         $font = $style->getName();
diff --git a/src/PhpWord/Writer/HTML/Style/Image.php b/src/PhpWord/Writer/HTML/Style/Image.php
@@ -32,6 +32,9 @@ class Image extends AbstractStyle
     public function write()
     {
         $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Image) {
+            return;
+        }
         $css = array();
 
         $css['width'] = $this->getValueIf($style->getWidth(), $style->getWidth() . 'px');
diff --git a/src/PhpWord/Writer/HTML/Style/Paragraph.php b/src/PhpWord/Writer/HTML/Style/Paragraph.php
@@ -34,6 +34,9 @@ class Paragraph extends AbstractStyle
     public function write()
     {
         $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Paragraph) {
+            return;
+        }
         $css = array();
 
         // Alignment
diff --git a/src/PhpWord/Writer/ODText/Style/Font.php b/src/PhpWord/Writer/ODText/Style/Font.php
@@ -34,7 +34,8 @@ class Font extends AbstractStyle
      */
     public function write()
     {
-        if (is_null($style = $this->getStyle())) {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Font) {
             return;
         }
         $xmlWriter = $this->getXmlWriter();
diff --git a/src/PhpWord/Writer/ODText/Style/Paragraph.php b/src/PhpWord/Writer/ODText/Style/Paragraph.php
@@ -34,7 +34,8 @@ class Paragraph extends AbstractStyle
      */
     public function write()
     {
-        if (is_null($style = $this->getStyle())) {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Paragraph) {
             return;
         }
         $xmlWriter = $this->getXmlWriter();
diff --git a/src/PhpWord/Writer/Word2007/Style/Cell.php b/src/PhpWord/Writer/Word2007/Style/Cell.php
@@ -31,7 +31,8 @@ class Cell extends AbstractStyle
      */
     public function write()
     {
-        if (is_null($style = $this->getStyle())) {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Cell) {
             return;
         }
         $xmlWriter = $this->getXmlWriter();
diff --git a/src/PhpWord/Writer/Word2007/Style/Font.php b/src/PhpWord/Writer/Word2007/Style/Font.php
@@ -57,7 +57,8 @@ public function write()
      */
     private function writeStyle()
     {
-        if (is_null($style = $this->getStyle())) {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Font) {
             return;
         }
         $xmlWriter = $this->getXmlWriter();
diff --git a/src/PhpWord/Writer/Word2007/Style/Image.php b/src/PhpWord/Writer/Word2007/Style/Image.php
@@ -38,9 +38,11 @@ class Image extends AbstractStyle
      */
     public function write()
     {
-        if (!is_null($this->getStyle())) {
-            $this->writeStyle();
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Image) {
+            return;
         }
+        $this->writeStyle();
     }
 
     /**
diff --git a/src/PhpWord/Writer/Word2007/Style/Indentation.php b/src/PhpWord/Writer/Word2007/Style/Indentation.php
@@ -29,7 +29,8 @@ class Indentation extends AbstractStyle
      */
     public function write()
     {
-        if (is_null($style = $this->getStyle())) {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Indentation) {
             return;
         }
         $xmlWriter = $this->getXmlWriter();
diff --git a/src/PhpWord/Writer/Word2007/Style/LineNumbering.php b/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
@@ -31,7 +31,8 @@ class LineNumbering extends AbstractStyle
      */
     public function write()
     {
-        if (is_null($style = $this->getStyle())) {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\LineNumbering) {
             return;
         }
         $xmlWriter = $this->getXmlWriter();
diff --git a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php b/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
@@ -29,14 +29,14 @@ class MarginBorder extends AbstractStyle
      *
      * @var int[]
      */
-    private $sizes;
+    private $sizes = array();
 
     /**
      * Colors
      *
      * @var string[]
      */
-    private $colors;
+    private $colors = array();
 
     /**
      * Other attributes
diff --git a/src/PhpWord/Writer/Word2007/Style/Paragraph.php b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
@@ -66,7 +66,8 @@ public function write()
      */
     private function writeStyle()
     {
-        if (is_null($style = $this->getStyle())) {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Paragraph) {
             return;
         }
         $xmlWriter = $this->getXmlWriter();
diff --git a/src/PhpWord/Writer/Word2007/Style/Section.php b/src/PhpWord/Writer/Word2007/Style/Section.php
@@ -31,7 +31,8 @@ class Section extends AbstractStyle
      */
     public function write()
     {
-        if (is_null($style = $this->getStyle())) {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Section) {
             return;
         }
         $xmlWriter = $this->getXmlWriter();
diff --git a/src/PhpWord/Writer/Word2007/Style/Shading.php b/src/PhpWord/Writer/Word2007/Style/Shading.php
@@ -29,7 +29,8 @@ class Shading extends AbstractStyle
      */
     public function write()
     {
-        if (is_null($style = $this->getStyle())) {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Shading) {
             return;
         }
         $xmlWriter = $this->getXmlWriter();
diff --git a/src/PhpWord/Writer/Word2007/Style/Spacing.php b/src/PhpWord/Writer/Word2007/Style/Spacing.php
@@ -29,7 +29,8 @@ class Spacing extends AbstractStyle
      */
     public function write()
     {
-        if (is_null($style = $this->getStyle())) {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Spacing) {
             return;
         }
         $xmlWriter = $this->getXmlWriter();
diff --git a/src/PhpWord/Writer/Word2007/Style/Tab.php b/src/PhpWord/Writer/Word2007/Style/Tab.php
@@ -29,7 +29,8 @@ class Tab extends AbstractStyle
      */
     public function write()
     {
-        if (is_null($style = $this->getStyle())) {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Tab) {
             return;
         }
         $xmlWriter = $this->getXmlWriter();
diff --git a/src/PhpWord/Writer/Word2007/Style/Table.php b/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -36,7 +36,8 @@ class Table extends AbstractStyle
      */
     public function write()
     {
-        if (is_null($style = $this->getStyle())) {
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\Table) {
             return;
         }
         $xmlWriter = $this->getXmlWriter();
diff --git a/src/PhpWord/Writer/Word2007/Style/TextBox.php b/src/PhpWord/Writer/Word2007/Style/TextBox.php
@@ -31,10 +31,12 @@ class TextBox extends Image
      */
     public function write()
     {
-        if (!is_null($this->getStyle())) {
-            $this->writeStyle();
-            $this->writeBorder();
+        $style = $this->getStyle();
+        if (!$style instanceof \PhpOffice\PhpWord\Style\TextBox) {
+            return;
         }
+        $this->writeStyle();
+        $this->writeBorder();
     }
 
     /**
diff --git a/tests/PhpWord/Tests/Writer/HTML/StyleTest.php b/tests/PhpWord/Tests/Writer/HTML/StyleTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2014 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+namespace PhpOffice\PhpWord\Tests\Writer\HTML;
+
+use PhpOffice\PhpWord\Shared\XMLWriter;
+
+/**
+ * Test class for PhpOffice\PhpWord\Writer\HTML\Style subnamespace
+ */
+class StyleTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Test empty styles
+     */
+    public function testEmptyStyles()
+    {
+        $styles = array('Font', 'Paragraph', 'Image');
+        foreach ($styles as $style) {
+            $objectClass = 'PhpOffice\\PhpWord\\Writer\\HTML\\Style\\' . $style;
+            $object = new $objectClass();
+
+            $this->assertEquals('', $object->write());
+        }
+    }
+}
diff --git a/tests/PhpWord/Tests/Writer/ODText/StyleTest.php b/tests/PhpWord/Tests/Writer/ODText/StyleTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2014 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+namespace PhpOffice\PhpWord\Tests\Writer\ODText;
+
+use PhpOffice\PhpWord\Shared\XMLWriter;
+
+/**
+ * Test class for PhpOffice\PhpWord\Writer\ODText\Style subnamespace
+ */
+class StyleTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Test empty styles
+     */
+    public function testEmptyStyles()
+    {
+        $styles = array('Font', 'Paragraph');
+        foreach ($styles as $style) {
+            $objectClass = 'PhpOffice\\PhpWord\\Writer\\ODText\\Style\\' . $style;
+            $xmlWriter = new XMLWriter();
+            $object = new $objectClass($xmlWriter);
+            $object->write();
+
+            $this->assertEquals('', $xmlWriter->getData());
+        }
+    }
+}
diff --git a/tests/PhpWord/Tests/Writer/RTF/StyleTest.php b/tests/PhpWord/Tests/Writer/RTF/StyleTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2014 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+namespace PhpOffice\PhpWord\Tests\Writer\RTF;
+
+use PhpOffice\PhpWord\Shared\XMLWriter;
+
+/**
+ * Test class for PhpOffice\PhpWord\Writer\RTF\Style subnamespace
+ */
+class StyleTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Test empty styles
+     */
+    public function testEmptyStyles()
+    {
+        $styles = array('Font', 'Paragraph');
+        foreach ($styles as $style) {
+            $objectClass = 'PhpOffice\\PhpWord\\Writer\\RTF\\Style\\' . $style;
+            $object = new $objectClass();
+
+            $this->assertEquals('', $object->write());
+        }
+    }
+}
diff --git a/tests/PhpWord/Tests/Writer/Word2007/StyleTest.php b/tests/PhpWord/Tests/Writer/Word2007/StyleTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * This file is part of PHPWord - A pure PHP library for reading and writing
+ * word processing documents.
+ *
+ * PHPWord is free software distributed under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software Foundation.
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code. For the full list of
+ * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2014 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+namespace PhpOffice\PhpWord\Tests\Writer\Word2007;
+
+use PhpOffice\PhpWord\Shared\XMLWriter;
+
+/**
+ * Test class for PhpOffice\PhpWord\Writer\Word2007\Style subnamespace
+ */
+class StyleTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Test empty styles
+     */
+    public function testEmptyStyles()
+    {
+        $styles = array(
+            'Cell', 'Font', 'Image', 'Indentation', 'LineNumbering',
+            'Paragraph', 'Section', 'Shading', 'Spacing', 'Tab', 'Table', 'TextBox'
+        );
+        foreach ($styles as $style) {
+            $objectClass = 'PhpOffice\\PhpWord\\Writer\\Word2007\\Style\\' . $style;
+            $xmlWriter = new XMLWriter();
+            $object = new $objectClass($xmlWriter);
+            $object->write();
+
+            $this->assertEquals('', $xmlWriter->getData());
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,9 @@ class Font extends AbstractStyle`
`35`	`35`	`public function write()`
`36`	`36`	`{`
`37`	`37`	`$style = $this->getStyle();`
	`38`	`+ if (!$style instanceof \PhpOffice\PhpWord\Style\Font) {`
	`39`	`+ return;`
	`40`	`+ }`
`38`	`41`	`$css = array();`
`39`	`42`
`40`	`43`	`$font = $style->getName();`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ class Image extends AbstractStyle`
`32`	`32`	`public function write()`
`33`	`33`	`{`
`34`	`34`	`$style = $this->getStyle();`
	`35`	`+ if (!$style instanceof \PhpOffice\PhpWord\Style\Image) {`
	`36`	`+ return;`
	`37`	`+ }`
`35`	`38`	`$css = array();`
`36`	`39`
`37`	`40`	`$css['width'] = $this->getValueIf($style->getWidth(), $style->getWidth() . 'px');`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ class Paragraph extends AbstractStyle`
`34`	`34`	`public function write()`
`35`	`35`	`{`
`36`	`36`	`$style = $this->getStyle();`
	`37`	`+ if (!$style instanceof \PhpOffice\PhpWord\Style\Paragraph) {`
	`38`	`+ return;`
	`39`	`+ }`
`37`	`40`	`$css = array();`
`38`	`41`
`39`	`42`	`// Alignment`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ class Font extends AbstractStyle`
`34`	`34`	`*/`
`35`	`35`	`public function write()`
`36`	`36`	`{`
`37`		`- if (is_null($style = $this->getStyle())) {`
	`37`	`+ $style = $this->getStyle();`
	`38`	`+ if (!$style instanceof \PhpOffice\PhpWord\Style\Font) {`
`38`	`39`	`return;`
`39`	`40`	`}`
`40`	`41`	`$xmlWriter = $this->getXmlWriter();`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ class Paragraph extends AbstractStyle`
`34`	`34`	`*/`
`35`	`35`	`public function write()`
`36`	`36`	`{`
`37`		`- if (is_null($style = $this->getStyle())) {`
	`37`	`+ $style = $this->getStyle();`
	`38`	`+ if (!$style instanceof \PhpOffice\PhpWord\Style\Paragraph) {`
`38`	`39`	`return;`
`39`	`40`	`}`
`40`	`41`	`$xmlWriter = $this->getXmlWriter();`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ class Cell extends AbstractStyle`
`31`	`31`	`*/`
`32`	`32`	`public function write()`
`33`	`33`	`{`
`34`		`- if (is_null($style = $this->getStyle())) {`
	`34`	`+ $style = $this->getStyle();`
	`35`	`+ if (!$style instanceof \PhpOffice\PhpWord\Style\Cell) {`
`35`	`36`	`return;`
`36`	`37`	`}`
`37`	`38`	`$xmlWriter = $this->getXmlWriter();`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,8 @@ public function write()`
`57`	`57`	`*/`
`58`	`58`	`private function writeStyle()`
`59`	`59`	`{`
`60`		`- if (is_null($style = $this->getStyle())) {`
	`60`	`+ $style = $this->getStyle();`
	`61`	`+ if (!$style instanceof \PhpOffice\PhpWord\Style\Font) {`
`61`	`62`	`return;`
`62`	`63`	`}`
`63`	`64`	`$xmlWriter = $this->getXmlWriter();`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,11 @@ class Image extends AbstractStyle`
`38`	`38`	`*/`
`39`	`39`	`public function write()`
`40`	`40`	`{`
`41`		`- if (!is_null($this->getStyle())) {`
`42`		`- $this->writeStyle();`
	`41`	`+ $style = $this->getStyle();`
	`42`	`+ if (!$style instanceof \PhpOffice\PhpWord\Style\Image) {`
	`43`	`+ return;`
`43`	`44`	`}`
	`45`	`+ $this->writeStyle();`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@ class Indentation extends AbstractStyle`
`29`	`29`	`*/`
`30`	`30`	`public function write()`
`31`	`31`	`{`
`32`		`- if (is_null($style = $this->getStyle())) {`
	`32`	`+ $style = $this->getStyle();`
	`33`	`+ if (!$style instanceof \PhpOffice\PhpWord\Style\Indentation) {`
`33`	`34`	`return;`
`34`	`35`	`}`
`35`	`36`	`$xmlWriter = $this->getXmlWriter();`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ class LineNumbering extends AbstractStyle`
`31`	`31`	`*/`
`32`	`32`	`public function write()`
`33`	`33`	`{`
`34`		`- if (is_null($style = $this->getStyle())) {`
	`34`	`+ $style = $this->getStyle();`
	`35`	`+ if (!$style instanceof \PhpOffice\PhpWord\Style\LineNumbering) {`
`35`	`36`	`return;`
`36`	`37`	`}`
`37`	`38`	`$xmlWriter = $this->getXmlWriter();`