PowerPoint2007 Writer : Move to Design Pattern Decorator (PHPCS)

Progi1984 · Progi1984 · commit 93f8cef22348 · 2016-03-01T15:08:22.000+01:00
diff --git a/src/PhpPresentation/Writer/PowerPoint2007.php b/src/PhpPresentation/Writer/PowerPoint2007.php
@@ -122,15 +122,15 @@ public function save($pFilename)
             }
         }
 
-        $oDir = new DirectoryIterator(dirname(__FILE__).'\PowerPoint2007');
+        $oDir = new DirectoryIterator(dirname(__FILE__).DIRECTORY_SEPARATOR.'PowerPoint2007');
         foreach ($oDir as $oFile) {
             if (!$oFile->isFile()) {
                 continue;
             }
             $class = __NAMESPACE__.'\\PowerPoint2007\\'.$oFile->getBasename('.php');
             $o = new \ReflectionClass($class);
 
-            if ($o->isAbstract() || !$o->isSubclassOf('PhpOffice\PhpPresentation\Writer\PowerPoint2007\AbstractDecoratorWriter')){
+            if ($o->isAbstract() || !$o->isSubclassOf('PhpOffice\PhpPresentation\Writer\PowerPoint2007\AbstractDecoratorWriter')) {
                 continue;
             }
             $oService = $o->newInstance();
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/AbstractDecoratorWriter.php b/src/PhpPresentation/Writer/PowerPoint2007/AbstractDecoratorWriter.php
@@ -10,7 +10,8 @@
 use PhpOffice\PhpPresentation\Style\Fill;
 use \ZipArchive;
 
-abstract class AbstractDecoratorWriter {
+abstract class AbstractDecoratorWriter
+{
     /**
      * @return \ZipArchive
      */
@@ -334,4 +335,4 @@ protected function absoluteZipPath($path)
 
         return implode('/', $absolutes);
     }
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/DocPropsApp.php b/src/PhpPresentation/Writer/PowerPoint2007/DocPropsApp.php
@@ -99,4 +99,4 @@ public function render()
         // Return
         return $this->oZip;
     }
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/DocPropsCore.php b/src/PhpPresentation/Writer/PowerPoint2007/DocPropsCore.php
@@ -70,4 +70,4 @@ public function render()
         // Return
         return $this->oZip;
     }
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/DocPropsCustom.php b/src/PhpPresentation/Writer/PowerPoint2007/DocPropsCustom.php
@@ -44,4 +44,4 @@ public function render()
         // Return
         return $this->oZip;
     }
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/DocPropsThumbnail.php b/src/PhpPresentation/Writer/PowerPoint2007/DocPropsThumbnail.php
@@ -28,4 +28,4 @@ public function render()
         // Return
         return $this->getZip();
     }
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptCharts.php b/src/PhpPresentation/Writer/PowerPoint2007/PptCharts.php
@@ -2250,4 +2250,4 @@ public function writeChartRelationships(Chart $pChart)
         // Return
         return $objWriter->getData();
     }
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptMedia.php b/src/PhpPresentation/Writer/PowerPoint2007/PptMedia.php
@@ -28,17 +28,17 @@ public function render()
                 } else {
                     $imageContents = file_get_contents($imagePath);
                 }
-                $this->oZip->addFromString('ppt/media/' . str_replace(' ', '_', $shape->getIndexedFilename()), $imageContents);
+                $this->getZip()->addFromString('ppt/media/' . str_replace(' ', '_', $shape->getIndexedFilename()), $imageContents);
             } elseif ($shape instanceof MemoryDrawing) {
                 ob_start();
                 call_user_func($shape->getRenderingFunction(), $shape->getImageResource());
                 $imageContents = ob_get_contents();
                 ob_end_clean();
 
-                $this->oZip->addFromString('ppt/media/' . str_replace(' ', '_', $shape->getIndexedFilename()), $imageContents);
+                $this->getZip()->addFromString('ppt/media/' . str_replace(' ', '_', $shape->getIndexedFilename()), $imageContents);
             }
         }
 
-        return $this->oZip;
+        return $this->getZip();
     }
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptPresProps.php b/src/PhpPresentation/Writer/PowerPoint2007/PptPresProps.php
@@ -65,4 +65,4 @@ public function render()
 
         return $this->getZip();
     }
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptPresentation.php b/src/PhpPresentation/Writer/PowerPoint2007/PptPresentation.php
@@ -82,4 +82,4 @@ public function render()
         // Return
         return $this->oZip;
     }
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptSlideLayouts.php b/src/PhpPresentation/Writer/PowerPoint2007/PptSlideLayouts.php
@@ -65,4 +65,4 @@ public function writeSlideLayoutRelationships($slideLayoutIndex, $masterId = 1)
         // Return
         return $objWriter->getData();
     }
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptSlideMasters.php b/src/PhpPresentation/Writer/PowerPoint2007/PptSlideMasters.php
@@ -79,5 +79,4 @@ public function writeSlideMasterRelationships($masterId = 1)
         // Return
         return $objWriter->getData();
     }
-
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptSlides.php b/src/PhpPresentation/Writer/PowerPoint2007/PptSlides.php
@@ -1787,4 +1787,4 @@ public function writeTransition(XMLWriter $objWriter, Transition $transition)
 
         $objWriter->endElement();
     }
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptTableProps.php b/src/PhpPresentation/Writer/PowerPoint2007/PptTableProps.php
@@ -23,4 +23,4 @@ public function render()
 
         return $this->getZip();
     }
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptTheme.php b/src/PhpPresentation/Writer/PowerPoint2007/PptTheme.php
@@ -83,5 +83,4 @@ public function writeThemeRelationships($masterId = 1)
         // Return
         return $objWriter->getData();
     }
-
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptViewProps.php b/src/PhpPresentation/Writer/PowerPoint2007/PptViewProps.php
@@ -66,4 +66,4 @@ public function render()
 
         return $this->getZip();
     }
-}
+}
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/Relationships.php b/src/PhpPresentation/Writer/PowerPoint2007/Relationships.php
@@ -114,4 +114,4 @@ public function writePresentationRelationships()
         // Return
         return $objWriter->getData();
     }
-}
+}
diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/DocPropsAppTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/DocPropsAppTest.php
@@ -41,4 +41,4 @@ public function testCompany()
         $this->assertTrue($oXMLDoc->elementExists('/Properties/Company', 'docProps/app.xml'));
         $this->assertEquals($expected, $oXMLDoc->getElement('/Properties/Company', 'docProps/app.xml')->nodeValue);
     }
-}
+}
diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/DocPropsCoreTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/DocPropsCoreTest.php
@@ -81,4 +81,4 @@ public function testMarkAsFinal()
         $pres = TestHelperDOCX::getDocument($oPhpPresentation, 'PowerPoint2007');
         $this->assertFalse($pres->elementExists('/cp:coreProperties/cp:contentStatus', 'docProps/core.xml'));
     }
-}
+}
diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/DocPropsCustomTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/DocPropsCustomTest.php
@@ -49,4 +49,4 @@ public function testMarkAsFinal()
         $pres = TestHelperDOCX::getDocument($oPhpPresentation, 'PowerPoint2007');
         $this->assertFalse($pres->elementExists('/Properties/property[@name="_MarkAsFinal"]', 'docProps/custom.xml'));
     }
-}
+}
diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/DocPropsThumbnailTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/DocPropsThumbnailTest.php
@@ -39,4 +39,4 @@ public function testFeatureThumbnail()
         $oXMLDoc = TestHelperDOCX::getDocument($oPhpPresentation, 'PowerPoint2007');
         $this->assertTrue($oXMLDoc->fileExists('docProps/thumbnail.jpeg'));
     }
-}
+}
diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptChartsTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptChartsTest.php
@@ -450,5 +450,4 @@ public function testTypeScatterSuperScript()
         $this->assertTrue($oXMLDoc->elementExists($element, 'ppt/charts/'.$oShape->getIndexedFilename()));
         $this->assertEquals('30000', $oXMLDoc->getElementAttribute($element, 'baseline', 'ppt/charts/'.$oShape->getIndexedFilename()));
     }
-
-}
+}
diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptMediaTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptMediaTest.php
@@ -60,9 +60,9 @@ public function testDrawingZip()
 
     public function testMemoryDrawing()
     {
-        $gdImage = @imagecreatetruecolor(140, 20) or die('Cannot Initialize new GD image stream');
+        $gdImage = imagecreatetruecolor(140, 20);
         $textColor = imagecolorallocate($gdImage, 255, 255, 255);
-        imagestring($gdImage, 1, 5, 5,  'Created with PHPPresentation', $textColor);
+        imagestring($gdImage, 1, 5, 5, 'Created with PHPPresentation', $textColor);
 
         $oShape = new MemoryDrawing();
         $oShape->setImageResource($gdImage);
diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptPresPropsTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptPresPropsTest.php
@@ -50,4 +50,4 @@ public function testLoopContinuously()
         $this->assertTrue($oXMLDoc->attributeElementExists($element, 'loop', 'ppt/presProps.xml'));
         $this->assertEquals(1, $oXMLDoc->getElementAttribute($element, 'loop', 'ppt/presProps.xml'));
     }
-}
+}
diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptPresentationTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptPresentationTest.php
@@ -28,4 +28,4 @@ public function testRender()
         $oXMLDoc = TestHelperDOCX::getDocument($oPhpPresentation, 'PowerPoint2007');
         $this->assertTrue($oXMLDoc->fileExists('ppt/presentation.xml'));
     }
-}
+}
diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptTablePropsTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptTablePropsTest.php
@@ -31,4 +31,4 @@ public function testRender()
         $this->assertTrue($oXMLDoc->elementExists($element, 'ppt/tableStyles.xml'));
         $this->assertEquals('{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}', $oXMLDoc->getElementAttribute($element, 'def', 'ppt/tableStyles.xml'));
     }
-}
+}
diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptViewPropsTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptViewPropsTest.php
@@ -31,4 +31,4 @@ public function testRender()
         $this->assertTrue($oXMLDoc->elementExists($element, 'ppt/viewProps.xml'));
         $this->assertEquals('0', $oXMLDoc->getElementAttribute($element, 'showComments', 'ppt/viewProps.xml'));
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -122,15 +122,15 @@ public function save($pFilename)`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`- $oDir = new DirectoryIterator(dirname(__FILE__).'\PowerPoint2007');`
	`125`	`+ $oDir = new DirectoryIterator(dirname(__FILE__).DIRECTORY_SEPARATOR.'PowerPoint2007');`
`126`	`126`	`foreach ($oDir as $oFile) {`
`127`	`127`	`if (!$oFile->isFile()) {`
`128`	`128`	`continue;`
`129`	`129`	`}`
`130`	`130`	`$class = __NAMESPACE__.'\\PowerPoint2007\\'.$oFile->getBasename('.php');`
`131`	`131`	`$o = new \ReflectionClass($class);`
`132`	`132`
`133`		`- if ($o->isAbstract() \|\| !$o->isSubclassOf('PhpOffice\PhpPresentation\Writer\PowerPoint2007\AbstractDecoratorWriter')){`
	`133`	`+ if ($o->isAbstract() \|\| !$o->isSubclassOf('PhpOffice\PhpPresentation\Writer\PowerPoint2007\AbstractDecoratorWriter')) {`
`134`	`134`	`continue;`
`135`	`135`	`}`
`136`	`136`	`$oService = $o->newInstance();`
Original file line number	Diff line number	Diff line change
`@@ -99,4 +99,4 @@ public function render()`
`99`	`99`	`// Return`
`100`	`100`	`return $this->oZip;`
`101`	`101`	`}`
`102`		`-}`
	`102`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -70,4 +70,4 @@ public function render()`
`70`	`70`	`// Return`
`71`	`71`	`return $this->oZip;`
`72`	`72`	`}`
`73`		`-}`
	`73`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,4 @@ public function render()`
`44`	`44`	`// Return`
`45`	`45`	`return $this->oZip;`
`46`	`46`	`}`
`47`		`-}`
	`47`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,4 @@ public function render()`
`28`	`28`	`// Return`
`29`	`29`	`return $this->getZip();`
`30`	`30`	`}`
`31`		`-}`
	`31`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2250,4 +2250,4 @@ public function writeChartRelationships(Chart $pChart)`
`2250`	`2250`	`// Return`
`2251`	`2251`	`return $objWriter->getData();`
`2252`	`2252`	`}`
`2253`		`-}`
	`2253`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -28,17 +28,17 @@ public function render()`
`28`	`28`	`} else {`
`29`	`29`	`$imageContents = file_get_contents($imagePath);`
`30`	`30`	`}`
`31`		`- $this->oZip->addFromString('ppt/media/' . str_replace(' ', '_', $shape->getIndexedFilename()), $imageContents);`
	`31`	`+ $this->getZip()->addFromString('ppt/media/' . str_replace(' ', '_', $shape->getIndexedFilename()), $imageContents);`
`32`	`32`	`} elseif ($shape instanceof MemoryDrawing) {`
`33`	`33`	`ob_start();`
`34`	`34`	`call_user_func($shape->getRenderingFunction(), $shape->getImageResource());`
`35`	`35`	`$imageContents = ob_get_contents();`
`36`	`36`	`ob_end_clean();`
`37`	`37`
`38`		`- $this->oZip->addFromString('ppt/media/' . str_replace(' ', '_', $shape->getIndexedFilename()), $imageContents);`
	`38`	`+ $this->getZip()->addFromString('ppt/media/' . str_replace(' ', '_', $shape->getIndexedFilename()), $imageContents);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`- return $this->oZip;`
	`42`	`+ return $this->getZip();`
`43`	`43`	`}`
`44`		`-}`
	`44`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -65,4 +65,4 @@ public function render()`
`65`	`65`
`66`	`66`	`return $this->getZip();`
`67`	`67`	`}`
`68`		`-}`
	`68`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -82,4 +82,4 @@ public function render()`
`82`	`82`	`// Return`
`83`	`83`	`return $this->oZip;`
`84`	`84`	`}`
`85`		`-}`
	`85`	`+}`