Merge pull request #19 from sapfeer0k/master

pFilename is required parameter for save
PHPOffice · Jun 10, 2014 · c5eab5d · c5eab5d
2 parents 50fd978 + 4e4a476
commit c5eab5d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,7 @@
 - Images in Layouts other than first Master Slide within Template file causes corrupted PPTX - @maartenba CP-4596
 - Fixed A3 and A4 formats dimensions - @delphiki GH-16
 - Fixed custom document layout - @delphiki GH-18
+- Filename parameter is required for IWriter::save method
 
 ### Miscellaneous
 

diff --git a/Classes/PHPPowerPoint/Writer/IWriter.php b/Classes/PHPPowerPoint/Writer/IWriter.php
@@ -40,5 +40,5 @@ interface PHPPowerPoint_Writer_IWriter
      * @param  string    $pFilename
      * @throws Exception
      */
-    public function save($pFilename = null);
+    public function save($pFilename);
 }
diff --git a/Classes/PHPPowerPoint/Writer/ODPresentation.php b/Classes/PHPPowerPoint/Writer/ODPresentation.php
@@ -102,8 +102,11 @@ public function __construct(PHPPowerPoint $pPHPPowerPoint = null)
      * @param  string    $pFilename
      * @throws Exception
      */
-    public function save($pFilename = null)
+    public function save($pFilename)
     {
+        if (empty($pFilename)) {
+            throw new Exception("Filename is empty");
+        }
         if (!is_null($this->_presentation)) {
             // If $pFilename is php://output or php://stdout, make it a temporary file...
             $originalFilename = $pFilename;

diff --git a/Classes/PHPPowerPoint/Writer/PowerPoint2007.php b/Classes/PHPPowerPoint/Writer/PowerPoint2007.php
@@ -139,8 +139,11 @@ public function getWriterPart($pPartName = '')
      * @param  string    $pFilename
      * @throws Exception
      */
-    public function save($pFilename = null)
+    public function save($pFilename)
     {
+        if (empty($pFilename)) {
+            throw new Exception("Filename is empty");
+        }
         if (!is_null($this->_presentation)) {
             // If $pFilename is php://output or php://stdout, make it a temporary file...
             $originalFilename = $pFilename;

diff --git a/Classes/PHPPowerPoint/Writer/Serialized.php b/Classes/PHPPowerPoint/Writer/Serialized.php
@@ -58,8 +58,11 @@ public function __construct(PHPPowerPoint $pPHPPowerPoint = null)
      * @param  string    $pFilename
      * @throws Exception
      */
-    public function save($pFilename = null)
+    public function save($pFilename)
     {
+        if (empty($pFilename)) {
+            throw new Exception("Filename is empty");
+        }
         if (!is_null($this->_presentation)) {
             // Create new ZIP file and open it for writing
             $objZip = new ZipArchive();