Merge branch '#160-element-container' into xml-reader

Author: ivanlanin

CHANGELOG.md

@@ -4,6 +4,8 @@ This is the changelog between releases of PHPWord. Releases are listed in revers
 
 ## 0.9.2 - Not yet released
 
+This release marked heavy refactorings on internal code structure with the creation of some abstract classes to reduce code duplication. `Element` subnamespace is introduced in this release to replace `Section`.
+
 ### Features
 
 - Image: Get image dimensions without EXIF extension - @andrew-kzoo GH-184
@@ -48,14 +50,16 @@ This is the changelog between releases of PHPWord. Releases are listed in revers
 ### Miscellaneous
 
 - Documentation: Simplify page level docblock - @ivanlanin GH-179
-- Writer: Refactor writer classes and make a new AbstractWriter abstract class - @ivanlanin GH-160
-- General: Refactor folders: Element and Exception - @ivanlanin GH-187
-- General: Remove legacy HashTable and ZipStreamWrapper and all related properties/methods - @ivanlanin GH-187
-- Element: Create new AbstractElement abstract class - @ivanlanin GH-187
+- Writer: Refactor writer classes and create a new `Write\AbstractWriter` abstract class - @ivanlanin GH-160
+- General: Refactor folders: `Element` and `Exception` - @ivanlanin GH-187
+- General: Remove legacy `HashTable` and `Shared\ZipStreamWrapper` and all related properties/methods - @ivanlanin GH-187
+- Element: New `AbstractElement` abstract class - @ivanlanin GH-187
 - Media: Refactor media class to use one method for all docPart (section, header, footer, footnote) - @ivanlanin GH-187
 - General: Remove underscore prefix from all private properties name - @ivanlanin GH-187
-- General: Move Section Settings to Style\Section - @ivanlanin GH-187
+- General: Move Section `Settings` to `Style\Section` - @ivanlanin GH-187
 - General: Give `Abstract` prefix and `Interface` suffix for all abstract classes and interfaces as per [PHP-FIG recommendation](https://github.com/php-fig/fig-standards/blob/master/bylaws/002-psr-naming-conventions.md) - @ivanlanin GH-187
+- Style: New `Style\AbstractStyle` abstract class - @ivanlanin GH-187
+- Writer: New 'ODText\Base` class - @ivanlanin GH-187
 
 ## 0.9.1 - 27 Mar 2014
 

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/Style/AbstractStyle.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * PHPWord
+ *
+ * @link        https://github.com/PHPOffice/PHPWord
+ * @copyright   2014 PHPWord
+ * @license     http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
+ */
+
+namespace PhpOffice\PhpWord\Style;
+
+/**
+ * Abstract style class
+ *
+ * @since 0.9.2
+ */
+abstract class AbstractStyle
+{
+    /**
+     * Set style value template method
+     *
+     * Some child classes have their own specific overrides
+     *
+     * @param string $key
+     * @param string $value
+     *
+     * @todo Implement type check mechanism, e.g. boolean, integer, enum, defaults
+     */
+    public function setStyleValue($key, $value)
+    {
+        // Backward compability check for versions < 0.9.2 which use underscore
+        // prefix for their private properties
+        if (substr($key, 0, 1) == '_') {
+            $key = substr($key, 1);
+        }
+
+        // Check if the set method is exists. Throws an exception?
+        $method = 'set' . $key;
+        if (method_exists($this, $method)) {
+            $this->$method($value);
+        }
+    }
+}

src/PhpWord/Style/Cell.php

@@ -12,7 +12,7 @@
 /**
  * Table cell style
  */
-class Cell
+class Cell extends AbstractStyle
 {
     const TEXT_DIR_BTLR = 'btLr';
     const TEXT_DIR_TBRL = 'tbRl';

src/PhpWord/Style/Font.php

@@ -15,7 +15,7 @@
 /**
  * Font style
  */
-class Font
+class Font extends AbstractStyle
 {
     const UNDERLINE_NONE = 'none';
     const UNDERLINE_DASH = 'dash';
@@ -202,23 +202,6 @@ public function setArrayStyle(array $style = array())
         return $this;
     }
 
-    /**
-     * Set style value
-     *
-     * @param string $key
-     * @param mixed $value
-     */
-    public function setStyleValue($key, $value)
-    {
-        if (substr($key, 0, 1) == '_') {
-            $key = substr($key, 1);
-        }
-        $method = 'set' . $key;
-        if (method_exists($this, $method)) {
-            $this->$method($value);
-        }
-    }
-
     /**
      * Get font name
      *

src/PhpWord/Style/Image.php

@@ -12,7 +12,7 @@
 /**
  * Image and memory image style
  */
-class Image
+class Image extends AbstractStyle
 {
     const WRAPPING_STYLE_INLINE = 'inline';
     const WRAPPING_STYLE_SQUARE = 'square';
@@ -41,13 +41,6 @@ class Image
      */
     private $align;
 
-    /**
-     * Wrapping style
-     *
-     * @var string
-     */
-    private $wrappingStyle;
-
     /**
      * Margin Top
      *
@@ -62,6 +55,13 @@ class Image
      */
     private $marginLeft;
 
+    /**
+     * Wrapping style
+     *
+     * @var string
+     */
+    private $wrappingStyle;
+
     /**
      * Create new image style
      */
@@ -75,20 +75,6 @@ public function __construct()
         $this->setWrappingStyle(self::WRAPPING_STYLE_INLINE);
     }
 
-    /**
-     * Set style value
-     *
-     * @param string $key
-     * @param mixed $value
-     */
-    public function setStyleValue($key, $value)
-    {
-        if (substr($key, 0, 1) == '_') {
-            $key = substr($key, 1);
-        }
-        $this->$key = $value;
-    }
-
     /**
      * Get width
      */

src/PhpWord/Style/ListItem.php

@@ -12,7 +12,7 @@
 /**
  * List item style
  */
-class ListItem
+class ListItem extends AbstractStyle
 {
     const TYPE_NUMBER = 7;
     const TYPE_NUMBER_NESTED = 8;
@@ -34,20 +34,6 @@ public function __construct()
         $this->listType = self::TYPE_BULLET_FILLED;
     }
 
-    /**
-     * Set style value
-     *
-     * @param string $key
-     * @param string $value
-     */
-    public function setStyleValue($key, $value)
-    {
-        if (substr($key, 0, 1) == '_') {
-            $key = substr($key, 1);
-        }
-        $this->$key = $value;
-    }
-
     /**
      * Set List Type
      *

src/PhpWord/Style/Paragraph.php

@@ -14,7 +14,7 @@
 /**
  * Paragraph style
  */
-class Paragraph
+class Paragraph extends AbstractStyle
 {
     const LINE_HEIGHT = 240;
 

src/PhpWord/Style/Row.php

@@ -12,7 +12,7 @@
 /**
  * Table row style
  */
-class Row
+class Row extends AbstractStyle
 {
     /**
      * Repeat table row on every new page
@@ -42,20 +42,6 @@ public function __construct()
     {
     }
 
-    /**
-     * Set style value
-     *
-     * @param string $key
-     * @param mixed $value
-     */
-    public function setStyleValue($key, $value)
-    {
-        if (substr($key, 0, 1) == '_') {
-            $key = substr($key, 1);
-        }
-        $this->$key = $value;
-    }
-
     /**
      * Set tblHeader
      *