Element inheritance refinements

Author: ivanlanin

src/PhpWord/Element/AbstractElement.php

@@ -9,7 +9,6 @@
 
 namespace PhpOffice\PhpWord\Element;
 
-use PhpOffice\PhpWord\Exception\InvalidImageException;
 use PhpOffice\PhpWord\Exception\InvalidObjectException;
 use PhpOffice\PhpWord\Media;
 use PhpOffice\PhpWord\Style;
@@ -482,7 +481,6 @@ private function checkValidity($method)
             'table'         => array('section', 'header', 'footer'),
             'footnote'      => array('section', 'textrun', 'cell'),
             'preservetext'  => array('header', 'footer', 'cell'),
-            'relationid'    => array('header', 'footer', 'footnote'),
             'title'         => array('section'),
         );
         // Special condition, e.g. preservetext can only exists in cell when

src/PhpWord/Element/Image.php

@@ -32,13 +32,6 @@ class Image extends AbstractElement
      */
     private $style;
 
-    /**
-     * Image relation ID specific only for DOCX
-     *
-     * @var string
-     */
-    private $rId;
-
     /**
      * Is watermark
      *
@@ -155,26 +148,6 @@ public function getStyle()
         return $this->style;
     }
 
-    /**
-     * Get image relation ID
-     *
-     * @return int
-     */
-    public function getRelationId()
-    {
-        return $this->rId;
-    }
-
-    /**
-     * Set image relation ID
-     *
-     * @param int $rId
-     */
-    public function setRelationId($rId)
-    {
-        $this->rId = $rId;
-    }
-
     /**
      * Get image source
      *

src/PhpWord/Element/Link.php

@@ -31,13 +31,6 @@ class Link extends AbstractElement
      */
     private $name;
 
-    /**
-     * Link Relation ID
-     *
-     * @var string
-     */
-    private $relationId;
-
     /**
      * Font style
      *
@@ -71,26 +64,6 @@ public function __construct($linkSrc, $linkName = null, $fontStyle = null, $para
         return $this;
     }
 
-    /**
-     * Get Link Relation ID
-     *
-     * @return int
-     */
-    public function getRelationId()
-    {
-        return $this->relationId;
-    }
-
-    /**
-     * Set Link Relation ID
-     *
-     * @param int $rId
-     */
-    public function setRelationId($rId)
-    {
-        $this->relationId = $rId;
-    }
-
     /**
      * Get Link source
      *

src/PhpWord/Element/Object.php

@@ -30,13 +30,6 @@ class Object extends AbstractElement
      */
     private $style;
 
-    /**
-     * Object Relation ID
-     *
-     * @var int
-     */
-    private $relationId;
-
     /**
      * Image Relation ID
      *
@@ -84,26 +77,6 @@ public function getSource()
         return $this->source;
     }
 
-    /**
-     * Get Object Relation ID
-     *
-     * @return int
-     */
-    public function getRelationId()
-    {
-        return $this->relationId;
-    }
-
-    /**
-     * Set Object Relation ID
-     *
-     * @param int $rId
-     */
-    public function setRelationId($rId)
-    {
-        $this->relationId = $rId;
-    }
-
     /**
      * Get Image Relation ID
      *

src/PhpWord/Reader/AbstractReader.php

@@ -90,7 +90,10 @@ public function canRead($pFilename)
         } catch (Exception $e) {
             return false;
         }
-        fclose($this->fileHandle);
+        if (is_resource($this->fileHandle)) {
+            fclose($this->fileHandle);
+        }
+
         return true;
     }
 }

src/PhpWord/Template.php

@@ -222,7 +222,7 @@ public function cloneRow($search, $numberOfClones)
      * @param string $blockname
      * @param integer $clones
      * @param boolean $replace
-     * @return null
+     * @return string|null
      */
     public function cloneBlock($blockname, $clones = 1, $replace = true)
     {
@@ -263,7 +263,6 @@ public function replaceBlock($blockname, $replacement)
      * Delete a block of text
      *
      * @param string $blockname
-     * @param string $replacement
      */
     public function deleteBlock($blockname)
     {
@@ -317,7 +316,7 @@ public function saveAs($strFilename)
      *
      * @param string $documentPartXML
      * @param string $search
-     * @param mixed $replace
+     * @param string $replace
      * @param integer $limit
      * @return string
      */
@@ -335,16 +334,10 @@ protected function setValueForPart($documentPartXML, $search, $replace, $limit)
             $search = '${' . $search . '}';
         }
 
-        if (!is_array($replace)) {
-            if (!String::isUTF8($replace)) {
-                $replace = utf8_encode($replace);
-            }
-            $replace = htmlspecialchars($replace);
-        } else {
-            foreach ($replace as $key => $value) {
-                $replace[$key] = htmlspecialchars($value);
-            }
+        if (!String::isUTF8($replace)) {
+            $replace = utf8_encode($replace);
         }
+        $replace = htmlspecialchars($replace);
 
         $regExpDelim = '/';
         $escapedSearch = preg_quote($search, $regExpDelim);

src/PhpWord/Writer/ODText.php

@@ -11,7 +11,6 @@
 
 use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Writer\ODText\Content;
 use PhpOffice\PhpWord\Writer\ODText\Manifest;
 use PhpOffice\PhpWord\Writer\ODText\Meta;

src/PhpWord/Writer/ODText/Manifest.php

@@ -9,7 +9,6 @@
 
 namespace PhpOffice\PhpWord\Writer\ODText;
 
-use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\PhpWord;
 
 /**