Merge pull request #195 from Progi1984/decoratorODP

PhpOffice\PhpPresentation\Writer\ODPresentation : Move to Design Patt…

Author: Progi1984

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Fixed the image project - @mvargasmoran GH-177
 
 ### Changes
+- PhpOffice\PhpPresentation\Writer\ODPresentation : Move to Design Pattern Decorator - @Progi1984
 - PhpOffice\PhpPresentation\Writer\PowerPoint2007 : Move to Design Pattern Decorator - @Progi1984
 - PhpOffice\PhpPresentation\Shape\Type\AbstracType\getData has been deprecated for PhpOffice\PhpPresentation\Shape\Type\AbstracType\getSeries - @Progi1984 GH-169
 - PhpOffice\PhpPresentation\Shape\Type\AbstracType\setData has been deprecated for PhpOffice\PhpPresentation\Shape\Type\AbstracType\setSeries - @Progi1984 GH-169
@@ -18,7 +19,7 @@
 - ODPresentation & PowerPoint2007 Writer : Support for images in base 64 - @Progi1984 GH-168
 - ODPresentation & PowerPoint2007 Writer : Marker of Series in Line & Scatter chart is customizable - @Progi1984 GH-169
 - ODPresentation & PowerPoint2007 Writer : Outline of Series in Line & Scatter chart is customizable - @Progi1984 GH-169
-- PowerPoint2007 & Serialized Writer : Support for Zip Adapter - @Progi1984 GH-176
+- ODPresentation & PowerPoint2007 & Serialized Writer : Support for Zip Adapter - @Progi1984 GH-176
 - ODPresentation & PowerPoint2007 Writer : language property to TextElement - @skrajewski & @Progi1984 GH-180
 - ODPresentation & PowerPoint2007 Writer : Add Font Support For Chart Axis - @jrking4 GH-186
 

src/PhpPresentation/Shape/Chart/PlotArea.php

@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpPresentation\Shape\Chart;
 
 use PhpOffice\PhpPresentation\ComparableInterface;
+use PhpOffice\PhpPresentation\Shape\Chart\Type\AbstractType;
 
 /**
  * \PhpOffice\PhpPresentation\Shape\Chart\PlotArea
@@ -92,7 +93,7 @@ public function __clone()
     /**
      * Get type
      *
-     * @return \PhpOffice\PhpPresentation\Shape\Chart\AbstractType
+     * @return AbstractType
      * @throws \Exception
      */
     public function getType()

src/PhpPresentation/Shape/Chart/Series.php

@@ -251,7 +251,7 @@ public function getDataPointFill($dataPointIndex)
     /**
      * Get DataPointFills
      *
-     * @return array
+     * @return Fill[]
      */
     public function getDataPointFills()
     {

src/PhpPresentation/Writer/AbstractDecoratorWriter.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace PhpOffice\PhpPresentation\Writer;
+
+use PhpOffice\Common\Adapter\Zip\ZipInterface;
+use PhpOffice\PhpPresentation\HashTable;
+use PhpOffice\PhpPresentation\PhpPresentation;
+
+abstract class AbstractDecoratorWriter
+{
+    /**
+     * @return ZipInterface
+     */
+    abstract public function render();
+
+    /**
+     * @var \PhpOffice\PhpPresentation\HashTable
+     */
+    protected $oHashTable;
+
+    /**
+     * @var PhpPresentation
+     */
+    protected $oPresentation;
+
+    /**
+     * @var ZipInterface
+     */
+    protected $oZip;
+
+    /**
+     * @param HashTable $hashTable
+     * @return $this
+     */
+    public function setDrawingHashTable(HashTable $hashTable)
+    {
+        $this->oHashTable = $hashTable;
+        return $this;
+    }
+
+    /**
+     * @return HashTable
+     */
+    public function getDrawingHashTable()
+    {
+        return $this->oHashTable;
+    }
+
+    /**
+     * @param PhpPresentation $oPresentation
+     * @return $this
+     */
+    public function setPresentation(PhpPresentation $oPresentation)
+    {
+        $this->oPresentation = $oPresentation;
+        return $this;
+    }
+
+    /**
+     * @return PhpPresentation
+     */
+    public function getPresentation()
+    {
+        return $this->oPresentation;
+    }
+
+    /**
+     * @param ZipInterface $oZip
+     * @return $this
+     */
+    public function setZip(ZipInterface $oZip)
+    {
+        $this->oZip = $oZip;
+        return $this;
+    }
+
+    /**
+     * @return ZipInterface
+     */
+    public function getZip()
+    {
+        return $this->oZip;
+    }
+}

src/PhpPresentation/Writer/AbstractWriter.php

@@ -3,14 +3,67 @@
 namespace PhpOffice\PhpPresentation\Writer;
 
 use PhpOffice\Common\Adapter\Zip\ZipInterface;
+use PhpOffice\PhpPresentation\PhpPresentation;
 
 abstract class AbstractWriter
 {
+    /**
+     * Private unique hash table
+     *
+     * @var \PhpOffice\PhpPresentation\HashTable
+     */
+    protected $oDrawingHashTable;
+
+    /**
+     * Private PhpPresentation
+     *
+     * @var PhpPresentation
+     */
+    protected $oPresentation;
+
     /**
      * @var ZipInterface
      */
     protected $oZipAdapter;
 
+    /**
+     * Get drawing hash table
+     *
+     * @return \PhpOffice\PhpPresentation\HashTable
+     */
+    public function getDrawingHashTable()
+    {
+        return $this->oDrawingHashTable;
+    }
+
+    /**
+     * Get PhpPresentation object
+     *
+     * @return PhpPresentation
+     * @throws \Exception
+     */
+    public function getPhpPresentation()
+    {
+        if (empty($this->oPresentation)) {
+            throw new \Exception("No PhpPresentation assigned.");
+        }
+        return $this->oPresentation;
+    }
+
+    /**
+     * Get PhpPresentation object
+     *
+     * @param  PhpPresentation                       $pPhpPresentation PhpPresentation object
+     * @throws \Exception
+     * @return \PhpOffice\PhpPresentation\Writer\ODPresentation
+     */
+    public function setPhpPresentation(PhpPresentation $pPhpPresentation = null)
+    {
+        $this->oPresentation = $pPhpPresentation;
+        return $this;
+    }
+
+
     /**
      * @param ZipInterface $oZipAdapter
      * @return $this