Refactor: Remove some duplication found by phpcpd. One more to go.

Author: ivanlanin

src/PhpWord/Element/CheckBox.php

@@ -9,13 +9,10 @@
 
 namespace PhpOffice\PhpWord\Element;
 
-use PhpOffice\PhpWord\Style\Font;
-use PhpOffice\PhpWord\Style\Paragraph;
-
 /**
  * Check box element
  */
-class CheckBox extends AbstractElement
+class CheckBox extends Text
 {
     /**
      * Name content
@@ -25,118 +22,30 @@ class CheckBox extends AbstractElement
     private $name;
 
     /**
-     * Text content
-     *
-     * @var string
-     */
-    private $text;
-
-    /**
-     * Text style
-     *
-     * @var string|\PhpOffice\PhpWord\Style\Font
-     */
-    private $fontStyle;
-
-    /**
-     * Paragraph style
-     *
-     * @var string|\PhpOffice\PhpWord\Style\Paragraph
-     */
-    private $paragraphStyle;
-
-    /**
-     * Create a new Text Element
+     * Create new instance
      *
      * @param string $name
      * @param string $text
      * @param mixed $fontStyle
      * @param mixed $paragraphStyle
+     * @return self
      */
     public function __construct($name = null, $text = null, $fontStyle = null, $paragraphStyle = null)
     {
         $this->setName($name);
-        $this->setText($text);
-        $paragraphStyle = $this->setParagraphStyle($paragraphStyle);
-        $this->setFontStyle($fontStyle, $paragraphStyle);
-
-        return $this;
-    }
-
-    /**
-     * Set Text style
-     *
-     * @param mixed $style
-     * @param mixed $paragraphStyle
-     * @return string|\PhpOffice\PhpWord\Style\Font
-     */
-    public function setFontStyle($style = null, $paragraphStyle = null)
-    {
-        if ($style instanceof Font) {
-            $this->fontStyle = $style;
-            $this->setParagraphStyle($paragraphStyle);
-        } elseif (is_array($style)) {
-            $this->fontStyle = new Font('text', $paragraphStyle);
-            $this->fontStyle->setArrayStyle($style);
-        } elseif (null === $style) {
-            $this->fontStyle = new Font('text', $paragraphStyle);
-        } else {
-            $this->fontStyle = $style;
-            $this->setParagraphStyle($paragraphStyle);
-        }
-        return $this->fontStyle;
-    }
-
-    /**
-     * Get Text style
-     *
-     * @return string|\PhpOffice\PhpWord\Style\Font
-     */
-    public function getFontStyle()
-    {
-        return $this->fontStyle;
-    }
-
-    /**
-     * Set Paragraph style
-     *
-     * @param mixed $style
-     * @return string|\PhpOffice\PhpWord\Style\Paragraph
-     */
-    public function setParagraphStyle($style = null)
-    {
-        if (is_array($style)) {
-            $this->paragraphStyle = new Paragraph;
-            $this->paragraphStyle->setArrayStyle($style);
-        } elseif ($style instanceof Paragraph) {
-            $this->paragraphStyle = $style;
-        } elseif (null === $style) {
-            $this->paragraphStyle = new Paragraph;
-        } else {
-            $this->paragraphStyle = $style;
-        }
-        return $this->paragraphStyle;
-    }
-
-    /**
-     * Get Paragraph style
-     *
-     * @return string|\PhpOffice\PhpWord\Style\Paragraph
-     */
-    public function getParagraphStyle()
-    {
-        return $this->paragraphStyle;
+        parent::__construct($text, $fontStyle, $paragraphStyle);
     }
 
     /**
      * Set name content
      *
      * @param string $name
-     * @return $this
+     * @return self
      */
     public function setName($name)
     {
         $this->name = $name;
+
         return $this;
     }
 
@@ -149,26 +58,4 @@ public function getName()
     {
         return $this->name;
     }
-
-    /**
-     * Set text content
-     *
-     * @param string $text
-     * @return $this
-     */
-    public function setText($text)
-    {
-        $this->text = $text;
-        return $this;
-    }
-
-    /**
-     * Get text content
-     *
-     * @return string
-     */
-    public function getText()
-    {
-        return $this->text;
-    }
 }

src/PhpWord/Element/Link.php

@@ -109,6 +109,7 @@ public function getParagraphStyle()
      *
      * @return string
      * @deprecated 0.10.0
+     * @codeCoverageIgnore
      */
     public function getLinkSrc()
     {
@@ -120,6 +121,7 @@ public function getLinkSrc()
      *
      * @return string
      * @deprecated 0.10.0
+     * @codeCoverageIgnore
      */
     public function getLinkName()
     {

src/PhpWord/Element/Text.php

@@ -22,21 +22,21 @@ class Text extends AbstractElement
      *
      * @var string
      */
-    private $text;
+    protected $text;
 
     /**
      * Text style
      *
      * @var string|\PhpOffice\PhpWord\Style\Font
      */
-    private $fontStyle;
+    protected $fontStyle;
 
     /**
      * Paragraph style
      *
      * @var string|\PhpOffice\PhpWord\Style\Paragraph
      */
-    private $paragraphStyle;
+    protected $paragraphStyle;
 
     /**
      * Create a new Text Element
@@ -73,6 +73,7 @@ public function setFontStyle($style = null, $paragraphStyle = null)
             $this->fontStyle = $style;
             $this->setParagraphStyle($paragraphStyle);
         }
+
         return $this->fontStyle;
     }
 
@@ -104,6 +105,7 @@ public function setParagraphStyle($style = null)
         } else {
             $this->paragraphStyle = $style;
         }
+
         return $this->paragraphStyle;
     }
 
@@ -121,11 +123,12 @@ public function getParagraphStyle()
      * Set text content
      *
      * @param string $text
-     * @return $this
+     * @return self
      */
     public function setText($text)
     {
         $this->text = $text;
+
         return $this;
     }
 

src/PhpWord/Style/AbstractStyle.php

@@ -117,6 +117,22 @@ public function setStyleByArray($styles = array())
         return $this;
     }
 
+    /**
+     * Set boolean value
+     *
+     * @param mixed $value
+     * @param mixed $default
+     * @return mixed
+     */
+    protected function setNonEmptyVal($value, $default)
+    {
+        if (is_null($value) || $value == '') {
+            $value = $default;
+        }
+
+        return $value;
+    }
+
     /**
      * Set boolean value
      *
@@ -133,6 +149,22 @@ protected function setBoolVal($value, $default = null)
         return $value;
     }
 
+    /**
+     * Set numeric value
+     *
+     * @param mixed $value
+     * @param integer|float|null $default
+     * @return integer|float|null
+     */
+    protected function setNumericVal($value, $default = null)
+    {
+        if (!is_numeric($value)) {
+            $value = $default;
+        }
+
+        return $value;
+    }
+
     /**
      * Set integer value
      *