PowerPoint2007 Reader : Initial Commit - GH-44 (Fixes Scrutinizer CI)

Author: Progi1984

src/PhpPresentation/Reader/PowerPoint2007.php

@@ -18,18 +18,11 @@
 namespace PhpOffice\PhpPresentation\Reader;
 
 use ZipArchive;
-use PhpOffice\Common\Text;
 use PhpOffice\Common\XMLReader;
 use PhpOffice\Common\Drawing as CommonDrawing;
-use PhpOffice\PhpPresentation\AbstractShape;
 use PhpOffice\PhpPresentation\PhpPresentation;
-use PhpOffice\PhpPresentation\Shape\Drawing;
-use PhpOffice\PhpPresentation\Shape\Group;
 use PhpOffice\PhpPresentation\Shape\Hyperlink;
-use PhpOffice\PhpPresentation\Shape\Line;
 use PhpOffice\PhpPresentation\Shape\MemoryDrawing;
-use PhpOffice\PhpPresentation\Shape\RichText;
-use PhpOffice\PhpPresentation\Style\Alignment;
 use PhpOffice\PhpPresentation\Style\Bullet;
 use PhpOffice\PhpPresentation\Style\Color;
 
@@ -142,28 +135,29 @@ protected function loadFile($pFilename)
     protected function loadDocumentProperties($sPart)
     {
         $xmlReader = new XMLReader();
-        if ($xmlReader->getDomFromString($sPart)) {
-            $arrayProperties = array(
-                '/cp:coreProperties/dc:creator' => 'setCreator',
-                '/cp:coreProperties/cp:lastModifiedBy' => 'setLastModifiedBy',
-                '/cp:coreProperties/dc:title' => 'setTitle',
-                '/cp:coreProperties/dc:description' => 'setDescription',
-                '/cp:coreProperties/dc:subject' => 'setSubject',
-                '/cp:coreProperties/cp:keywords' => 'setKeywords',
-                '/cp:coreProperties/cp:category' => 'setCategory',
-                '/cp:coreProperties/dcterms:created' => 'setCreated',
-                '/cp:coreProperties/dcterms:modified' => 'setModified',
-            );
-            $oProperties = $this->oPhpPresentation->getProperties();
-            foreach ($arrayProperties as $path => $property) {
-                if (is_object($oElement = $xmlReader->getElement($path))) {
-                    if ($oElement->hasAttribute('xsi:type') && $oElement->getAttribute('xsi:type') == 'dcterms:W3CDTF') {
-                        $oDateTime = new \DateTime();
-                        $oDateTime->createFromFormat(\DateTime::W3C, $oElement->nodeValue);
-                        $oProperties->{$property}($oDateTime->getTimestamp());
-                    } else {
-                        $oProperties->{$property}($oElement->nodeValue);
-                    }
+        if (!$xmlReader->getDomFromString($sPart)) {
+            return false;
+        }
+        $arrayProperties = array(
+            '/cp:coreProperties/dc:creator' => 'setCreator',
+            '/cp:coreProperties/cp:lastModifiedBy' => 'setLastModifiedBy',
+            '/cp:coreProperties/dc:title' => 'setTitle',
+            '/cp:coreProperties/dc:description' => 'setDescription',
+            '/cp:coreProperties/dc:subject' => 'setSubject',
+            '/cp:coreProperties/cp:keywords' => 'setKeywords',
+            '/cp:coreProperties/cp:category' => 'setCategory',
+            '/cp:coreProperties/dcterms:created' => 'setCreated',
+            '/cp:coreProperties/dcterms:modified' => 'setModified',
+        );
+        $oProperties = $this->oPhpPresentation->getProperties();
+        foreach ($arrayProperties as $path => $property) {
+            if (is_object($oElement = $xmlReader->getElement($path))) {
+                if ($oElement->hasAttribute('xsi:type') && $oElement->getAttribute('xsi:type') == 'dcterms:W3CDTF') {
+                    $oDateTime = new \DateTime();
+                    $oDateTime->createFromFormat(\DateTime::W3C, $oElement->nodeValue);
+                    $oProperties->{$property}($oDateTime->getTimestamp());
+                } else {
+                    $oProperties->{$property}($oElement->nodeValue);
                 }
             }
         }
@@ -196,6 +190,8 @@ protected function loadSlides($sPart)
 
     /**
      * Extract data from slide
+     * @param string $sPart
+     * @param string $baseFile
      */
     protected function loadSlide($sPart, $baseFile)
     {
@@ -454,7 +450,7 @@ protected function loadShapeRichText(XMLReader $document, \DOMElement $node, $ba
                                 $oText->getHyperlink()->setUrl($this->arrayRels[$fileRels][$oElementHlinkClick->getAttribute('r:id')]);
                             }
                         }
-                    } else {
+                    //} else {
                         // $oText = $oParagraph->createText();
                     }
 
@@ -471,7 +467,7 @@ protected function loadShapeRichText(XMLReader $document, \DOMElement $node, $ba
 
     /**
      *
-     * @param string $rId
+     * @param string $fileRels
      * @return string
      */
     protected function loadRels($fileRels)

src/PhpPresentation/Shape/RichText.php

@@ -242,9 +242,13 @@ public function createParagraph()
         $this->richTextParagraphs[] = new Paragraph();
         $this->activeParagraph      = count($this->richTextParagraphs) - 1;
 
-        if ($numParagraphs > 0) {
+        if (isset($alignment)) {
             $this->getActiveParagraph()->setAlignment($alignment);
+        }
+        if (isset($font)) {
             $this->getActiveParagraph()->setFont($font);
+        }
+        if (isset($bulletStyle)) {
             $this->getActiveParagraph()->setBulletStyle($bulletStyle);
         }
         return $this->getActiveParagraph();