Merge pull request #187 from Progi1984/develop

PowerPoint2007 Writer : Move to Design Pattern Decorator

Author: Progi1984

CHANGELOG.md

@@ -5,6 +5,13 @@
 ### Bugfix
 - Fixed the image project - @mvargasmoran GH-177
 
+### Changes
+- PhpOffice\PhpPresentation\Writer\PowerPoint2007 : Move to Design Pattern Decorator - @Progi1984
+
+### Features
+- ODPresentation Writer : Thumbnail of the presentation - @Progi1984 GH-125
+- PowerPoint2007 Writer : Thumbnail of the presentation - @Progi1984 GH-125
+
 ## 0.6.0 - 2016-01-24
 
 ### Bugfix

src/PhpPresentation/AbstractShape.php

@@ -121,7 +121,10 @@ public function __construct()
 
         $this->border->setLineStyle(Style\Border::LINE_NONE);
     }
-    
+
+    /**
+     * Magic Method : clone
+     */
     public function __clone()
     {
         $this->container = null;

src/PhpPresentation/DocumentLayout.php

@@ -150,6 +150,7 @@ public function setDocumentLayout($pValue = self::LAYOUT_SCREEN_4X3, $isLandscap
     /**
      * Get Document Layout cx
      *
+     * @param float $unit
      * @return integer
      */
     public function getCX($unit = self::UNIT_EMU)
@@ -160,6 +161,7 @@ public function getCX($unit = self::UNIT_EMU)
     /**
      * Get Document Layout cy
      *
+     * @param float $unit
      * @return integer
      */
     public function getCY($unit = self::UNIT_EMU)
@@ -170,6 +172,8 @@ public function getCY($unit = self::UNIT_EMU)
     /**
      * Get Document Layout cx
      *
+     * @param float $value
+     * @param float $unit
      * @return integer
      */
     public function setCX($value, $unit = self::UNIT_EMU)
@@ -182,6 +186,8 @@ public function setCX($value, $unit = self::UNIT_EMU)
     /**
      * Get Document Layout cy
      *
+     * @param float $value
+     * @param float $unit
      * @return integer
      */
     public function setCY($value, $unit = self::UNIT_EMU)
@@ -193,7 +199,7 @@ public function setCY($value, $unit = self::UNIT_EMU)
 
     /**
      * Convert EMUs to differents units
-     * @param $value
+     * @param float $value
      * @param string $fromUnit
      * @param string $toUnit
      */

src/PhpPresentation/Shape/Group.php

@@ -63,7 +63,7 @@ public function __construct()
     /**
     * Get collection of shapes
     *
-    * @return \ArrayObject|\PhpOffice\PhpPresentation\AbstractShape[]
+    * @return \ArrayObject
     */
     public function getShapeCollection()
     {

src/PhpPresentation/Writer/ODPresentation/Manifest.php

@@ -161,7 +161,12 @@ private function getImageMimeType($pFile = '')
                 $pImgFile = substr($pFile, strpos($pFile, '#') + 1);
                 $oArchive = new \ZipArchive();
                 $oArchive->open($pZIPFile);
-                $image = getimagesizefromstring($oArchive->getFromName($pImgFile));
+                if (!function_exists('getimagesizefromstring')) {
+                    $uri = 'data://application/octet-stream;base64,' . base64_encode($oArchive->getFromName($pImgFile));
+                    $image = getimagesize($uri);
+                } else {
+                    $image = getimagesizefromstring($oArchive->getFromName($pImgFile));
+                }
             } else {
                 $image = getimagesize($pFile);
             }