Feedbacks from @Progi1984

docs/changes/1.1.0.md

@@ -17,9 +17,17 @@
     - PowerPoint2007 Reader
     - PowerPoint2007 Writer
 - PowerPoint2007 Writer: Enable style and position of a Placeholder - [@qmachard](https://github.com/qmachard) in [#787](https://github.com/PHPOffice/PHPPresentation/pull/787)
+- PowerPoint2007 Reader: Added support for thumbnail - [@devX2712](https://github.com/devX2712) in [#788](https://github.com/PHPOffice/PHPPresentation/pull/787)
 
 ## Improvements
 - Slide : Raised max value for identifier rand call - [@Scheissy](https://github.com/Scheissy) in [#777](https://github.com/PHPOffice/PHPPresentation/pull/777)
+- Document Properties : Support for Revision & Status - [@devX2712](https://github.com/devX2712) in [#788](https://github.com/PHPOffice/PHPPresentation/pull/787)
+    - PowerPoint2007 Reader
+    - PowerPoint2007 Writer
+- Presentation Properties : Added support to define content of the thumbnail - [@devX2712](https://github.com/devX2712) in [#788](https://github.com/PHPOffice/PHPPresentation/pull/787)
+- Font : Support for Strikethrough mode - [@devX2712](https://github.com/devX2712) in [#788](https://github.com/PHPOffice/PHPPresentation/pull/787)
+    - PowerPoint2007 Reader
+    - PowerPoint2007 Writer
 
 ## Bugfixes
 

docs/usage/presentation.md

@@ -62,6 +62,8 @@ $properties->setCreated(mktime(0, 0, 0, 3, 12, 2014));
 $properties->setModified(mktime(0, 0, 0, 3, 14, 2014));
 $properties->setSubject('My subject');
 $properties->setKeywords('my, key, word');
+$properties->setStatus('Work in Progress');
+$properties->setRevision('Version 1.2.3');
 ```
 
 ### Custom Properties
@@ -203,16 +205,44 @@ echo $properties->getSlideshowType();
 
 You can define the thumbnail of the presentation with the method `setThumbnailPath`.
 
+
+#### From a file
 ``` php
 <?php
 
+use PhpOffice\PhpPresentation\PresentationProperties;
+
 $presentation = new PhpPresentation();
 
 $properties = $presentation->getPresentationProperties();
 // Set path of the thumbnail
-$properties->setThumbnailPath(__DIR__.'\resources\phppowerpoint_logo.gif');
+$properties->setThumbnailPath(
+    __DIR__.'\resources\phppowerpoint_logo.gif',
+    PresentationProperties::THUMBNAIL_FILE
+);
 // Get path of the thumbnail
 echo $properties->getThumbnailPath();
+// Get content of the thumbnail
+echo $properties->getThumbnail();
+```
+
+#### From the content of the file
+``` php
+<?php
+
+use PhpOffice\PhpPresentation\PresentationProperties;
+
+$presentation = new PhpPresentation();
+
+$properties = $presentation->getPresentationProperties();
+// Set path of the thumbnail
+$properties->setThumbnailPath(
+    '',
+    PresentationProperties::THUMBNAIL_DATA,
+    file_get_contents(__DIR__.'\resources\phppowerpoint_logo.gif')
+);
+// Get content of the thumbnail
+echo $properties->getThumbnail();
 ```
 
 ### Zoom

src/PhpPresentation/DocumentProperties.php

@@ -102,11 +102,18 @@ class DocumentProperties
     private $company;
 
     /**
-     * revision
+     * Revision.
      *
      * @var string
      */
     private $revision;
+
+    /**
+     * Status.
+     *
+     * @var string
+     */
+    private $status;
 
     /**
      * Custom Properties.
@@ -116,14 +123,7 @@ class DocumentProperties
     private $customProperties = [];
 
     /**
-     * status
-     *
-     * @var string
-     */
-    private $status;
-
-    /**
-     * Create a new \PhpOffice\PhpPresentation\DocumentProperties
+     * Create a new \PhpOffice\PhpPresentation\DocumentProperties.
      */
     public function __construct()
     {
@@ -139,7 +139,7 @@ public function __construct()
         $this->category = '';
         $this->company = 'Microsoft Corporation';
         $this->revision = '';
-        $this->status         = '';
+        $this->status  = '';
     }
 
     /**
@@ -479,7 +479,7 @@ public function getRevision(): string
     }
 
     /**
-     * Set Revision
+     * Set Revision.
      */
     public function setRevision(string $pValue = ''): self
     {
@@ -489,22 +489,17 @@ public function setRevision(string $pValue = ''): self
     }
 
     /**
-     * Get Status
-     *
-     * @return string
+     * Get Status.
      */
-    public function getStatus()
+    public function getStatus(): string
     {
         return $this->status;
     }
 
     /**
-     * Set Status
-     *
-     * @param  string                           $pValue
-     * @return \PhpOffice\PhpPresentation\DocumentProperties
+     * Set Status.
      */
-    public function setStatus($pValue = '')
+    public function setStatus(string $pValue = ''): self
     {
         $this->status = $pValue;
 

src/PhpPresentation/PresentationProperties.php

@@ -30,8 +30,8 @@ class PresentationProperties
     public const VIEW_SLIDE_SORTER = 'sldSorterView';
     public const VIEW_SLIDE_THUMBNAIL = 'sldThumbnailView';
 
-    public const THUMBNAIL_FILE = 'file'; // Thumbnail path is out of PPT
-    public const THUMBNAIL_ZIP = 'zip'; // Thumbnail path point to an image store into file loaded
+    public const THUMBNAIL_FILE = 'file';
+    public const THUMBNAIL_DATA = 'data';
 
     /**
      * @var array<int, string>
@@ -72,17 +72,17 @@ class PresentationProperties
      */
     protected $markAsFinal = false;
 
-    /*
-     * @var string Define the thumbnail content (if content into zip file)
+    /**
+     * @var string|null Define the thumbnail content (if content into zip file)
      */
     protected $thumbnail = null;
 
-    /*
-     * @var string Define the thumbnail place
+    /**
+     * @var string|null Define the thumbnail place
      */
-    protected $thumbnailPath = '';
+    protected $thumbnailPath = null;
 
-    /*
+    /**
      * @var string Define if thumbnail is out of PPT or previouly store into PPT
      */
     protected $thumbnailType = self::THUMBNAIL_FILE;
@@ -130,36 +130,38 @@ public function getThumbnailPath(): ?string
     }
 
     /**
-     * Return the content of thumbnail
-     *
-     * @return binary Content of image
+     * Return the content of thumbnail.
      */
-    public function getThumbnail()
+    public function getThumbnail(): ?string
     {
       // Return content of local file
       if ($this->getThumbnailType() == self::THUMBNAIL_FILE) {
-        if (file_exists($this->getThumbnailPath()))
+        if ($this->getThumbnailPath()) {
           return file_get_contents($this->getThumbnailPath());
+        }
+
+        return null;
       }
+
       // Return content of image stored into zip file
-      if ($this->getThumbnailType() == self::THUMBNAIL_ZIP) {
+      if ($this->getThumbnailType() == self::THUMBNAIL_DATA) {
         return $this->thumbnail;
       }
-      // Return null if no thumbnail
+
       return null;
     }
 
     /**
      * Define the path for the thumbnail file / preview picture.
      */
-    public function setThumbnailPath(string $path = '', $type = self::THUMBNAIL_FILE, $content = null)
+    public function setThumbnailPath(string $path = '', string $type = self::THUMBNAIL_FILE, string $content = null): self
     {
-        if (file_exists($path) && ($type == self::THUMBNAIL_FILE)) {
+        if (file_exists($path) && $type == self::THUMBNAIL_FILE) {
             $this->thumbnailPath = $path;
             $this->thumbnailType = $type;
         }
-        if (($path != '') && ($type == self::THUMBNAIL_ZIP)) {
-            $this->thumbnailPath = $path;
+        if ($content != '' && $type == self::THUMBNAIL_DATA) {
+            $this->thumbnailPath = '';
             $this->thumbnailType = $type;
             $this->thumbnail = $content;
         }
@@ -168,10 +170,9 @@ public function setThumbnailPath(string $path = '', $type = self::THUMBNAIL_FILE
     }
 
     /**
-     * Return the thumbnail type
-     * @return string
+     * Return the thumbnail type.
      */
-    public function getThumbnailType()
+    public function getThumbnailType(): string
     {
         return $this->thumbnailType;
     }

src/PhpPresentation/Reader/PowerPoint2007.php

@@ -230,7 +230,7 @@ protected function loadDocumentProperties(string $sPart): void
                 '/cp:coreProperties/dcterms:modified' => 'setModified',
                 '/cp:coreProperties/cp:revision' => 'setRevision',
                 '/cp:coreProperties/cp:contentStatus' => 'setStatus',
-            );
+            ];
             $oProperties = $this->oPhpPresentation->getDocumentProperties();
             foreach ($arrayProperties as $path => $property) {
                 $oElement = $xmlReader->getElement($path);
@@ -248,9 +248,8 @@ protected function loadDocumentProperties(string $sPart): void
 
     /**
      * Read information of the document thumbnail
-     * @param string $sPart Content of XML file for retrieving data
      */
-    protected function loadThumbnailProperties($sPart)
+    protected function loadThumbnailProperties(string $sPart): void
     {
         $xmlReader = new XMLReader();
         if ($xmlReader->getDomFromString($sPart)) {
@@ -259,16 +258,13 @@ protected function loadThumbnailProperties($sPart)
             $path = $oElement->getAttribute('Target');
             $this->oPhpPresentation
                  ->getPresentationProperties()
-                 ->setThumbnailPath($path
-                 , \PhpOffice\PhpPresentation\PresentationProperties::THUMBNAIL_ZIP
-                 , $this->oZip->getFromName($path));
+                 ->setThumbnailPath('', PresentationProperties::THUMBNAIL_DATA, $this->oZip->getFromName($path));
           }
         }
     }
 
     /**
-     * Read Custom Properties
-     * @param string $sPart
+     * Read Custom Properties.
      */
     protected function loadCustomProperties(string $sPart): void
     {
@@ -913,15 +909,15 @@ protected function loadEffect(XMLReader $document, \DOMElement $nodeEffect)
               $effect = new \PhpOffice\PhpPresentation\Style\Effect($type);
               // load blur radius
               if ($node->hasAttribute('blurRad')) {
-                  $effect->setBlurRadius(CommonDrawing::emuToPixels($node->getAttribute('blurRad')));
+                  $effect->setBlurRadius(CommonDrawing::emuToPixels((int) $node->getAttribute('blurRad')));
               }
               // load distance
               if ($node->hasAttribute('dist')) {
-                  $effect->setDistance(CommonDrawing::emuToPixels($node->getAttribute('dist')));
+                  $effect->setDistance(CommonDrawing::emuToPixels((int) $node->getAttribute('dist')));
               }
               // load direction
               if ($node->hasAttribute('dir')) {
-                  $effect->setDirection(CommonDrawing::angleToDegrees($node->getAttribute('dir')));
+                  $effect->setDirection((int) CommonDrawing::angleToDegrees((int) $node->getAttribute('dir')));
               }
               // load alignment
               if ($node->hasAttribute('algn')) {

src/PhpPresentation/Style/Effect.php

@@ -90,9 +90,9 @@ class Effect implements ComparableInterface
     /**
      * Hash index
      *
-     * @var string
+     * @var ?int
      */
-    private string $hashIndex;
+    private $hashIndex;
 
     /**
      * Create a new \PhpOffice\PhpPresentation\Shape\Effect instance
@@ -276,7 +276,7 @@ public function getAlpha():int
      *
      * @return string Hash code
      */
-    public function getHashCode()
+    public function getHashCode(): string
     {
         return md5($this->effectType . $this->blurRadius . $this->distance . $this->direction . $this->alignment . $this->color->getHashCode() . $this->alpha . __CLASS__);
     }
@@ -289,7 +289,7 @@ public function getHashCode()
      *
      * @return string Hash index
      */
-    public function getHashIndex()
+    public function getHashIndex(): ?int
     {
         return $this->hashIndex;
     }