Refactored PHPWord_Exception to namespaces

Author: gabrielbull

Classes/PHPWord.php

@@ -34,6 +34,8 @@
 }
 // @codeCoverageIgnoreEnd
 
+use PhpOffice\PhpWord\Exceptions\Exception;
+
 /**
  * PHPWord
  */
@@ -252,17 +254,15 @@ public function getSections()
      *
      * @param string $strFilename
      * @return PHPWord_Template
+     * @throws Exception
      */
     public function loadTemplate($strFilename)
     {
         if (file_exists($strFilename)) {
             $template = new PHPWord_Template($strFilename);
             return $template;
-        } else {
-            throw new PHPWord_Exception(
-                "Template file {$strFilename} not found."
-            );
         }
+        throw new Exception("Template file {$strFilename} not found.");
     }
 
     /**

Classes/PHPWord/Exception.php

@@ -0,0 +1,9 @@
+<?php
+namespace PhpOffice\PhpWord\Exceptions;
+
+/**
+ * Class Exception
+ */
+class Exception extends \Exception
+{
+}

Classes/PHPWord/Exceptions/Exception.php

@@ -1,8 +1,6 @@
 <?php
 namespace PhpOffice\PhpWord\Exceptions;
 
-use Exception;
-
 /**
  * InvalidImageException
  *

Classes/PHPWord/Exceptions/InvalidImageException.php

@@ -12,4 +12,4 @@
  */
 class InvalidStyleException extends InvalidArgumentException
 {
-}
+}

Classes/PHPWord/Exceptions/InvalidStyleException.php

@@ -1,8 +1,6 @@
 <?php
 namespace PhpOffice\PhpWord\Exceptions;
 
-use Exception;
-
 /**
  * UnsupportedImageTypeException
  *

Classes/PHPWord/Exceptions/UnsupportedImageTypeException.php

@@ -25,12 +25,13 @@
  * @version    0.8.0
  */
 
+use PhpOffice\PhpWord\Exceptions\Exception;
+
 /**
  * Class PHPWord_IOFactory
  */
 class PHPWord_IOFactory
 {
-
     /**
      * Search locations
      *
@@ -73,13 +74,9 @@ public static function getSearchLocations()
      * @param array $value
      * @throws Exception
      */
-    public static function setSearchLocations($value)
+    public static function setSearchLocations(array $value)
     {
-        if (is_array($value)) {
-            self::$_searchLocations = $value;
-        } else {
-            throw new Exception('Invalid parameter passed.');
-        }
+        self::$_searchLocations = $value;
     }
 
     /**
@@ -100,6 +97,7 @@ public static function addSearchLocation($type = '', $location = '', $classname
      * @param PHPWord $PHPWord
      * @param string $writerType Example: Word2007
      * @return PHPWord_Writer_IWriter
+     * @throws Exception
      */
     public static function createWriter(PHPWord $PHPWord, $writerType = '')
     {
@@ -123,8 +121,9 @@ public static function createWriter(PHPWord $PHPWord, $writerType = '')
     /**
      * Create PHPWord_Reader_IReader
      *
-     * @param   string $readerType  Example: Word2007
-     * @return  PHPWord_Reader_IReader
+     * @param string $readerType  Example: Word2007
+     * @return PHPWord_Reader_IReader
+     * @throws Exception
      */
     public static function createReader($readerType = '')
     {
@@ -141,18 +140,19 @@ public static function createReader($readerType = '')
             }
         }
 
-        throw new PHPWord_Exception("No $searchType found for type $readerType");
+        throw new Exception("No $searchType found for type $readerType");
     }
 
     /**
      * Loads PHPWord from file
      *
-     * @param   string  $pFilename The name of the file
-     * @return  PHPWord
+     * @param string $pFilename The name of the file
+     * @param string $readerType
+     * @return PHPWord
      */
     public static function load($pFilename, $readerType = 'Word2007')
     {
         $reader = self::createReader($readerType);
         return $reader->load($pFilename);
     }
-}
+}

Classes/PHPWord/IOFactory.php

@@ -25,6 +25,8 @@
  * @version    0.8.0
  */
 
+use PhpOffice\PhpWord\Exceptions\Exception;
+
 /**
  * PHPWord_Reader_Abstract
  *
@@ -35,17 +37,19 @@ abstract class PHPWord_Reader_Abstract implements PHPWord_Reader_IReader
     /**
      * Read data only?
      *
-     * @var boolean
+     * @var bool
      */
     protected $readDataOnly = true;
 
+    /**
+     * @var bool|resource
+     */
     protected $fileHandle = true;
 
-
     /**
      * Read data only?
      *
-     * @return  boolean
+     * @return bool
      */
     public function getReadDataOnly()
     {
@@ -56,8 +60,8 @@ public function getReadDataOnly()
     /**
      * Set read data only
      *
-     * @param   boolean $pValue
-     * @return  PHPWord_Reader_IReader
+     * @param bool $pValue
+     * @return PHPWord_Reader_IReader
      */
     public function setReadDataOnly($pValue = true)
     {
@@ -69,29 +73,28 @@ public function setReadDataOnly($pValue = true)
      * Open file for reading
      *
      * @param string $pFilename
-     * @throws  PHPWord_Exception
      * @return resource
+     * @throws Exception
      */
     protected function openFile($pFilename)
     {
         // Check if file exists
         if (!file_exists($pFilename) || !is_readable($pFilename)) {
-            throw new PHPWord_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+            throw new Exception("Could not open " . $pFilename . " for reading! File does not exist.");
         }
 
         // Open file
         $this->fileHandle = fopen($pFilename, 'r');
         if ($this->fileHandle === false) {
-            throw new PHPWord_Exception("Could not open file " . $pFilename . " for reading.");
+            throw new Exception("Could not open file " . $pFilename . " for reading.");
         }
     }
 
     /**
      * Can the current PHPWord_Reader_IReader read the file?
      *
-     * @param   string      $pFilename
-     * @return boolean
-     * @throws PHPWord_Exception
+     * @param string $pFilename
+     * @return bool
      */
     public function canRead($pFilename)
     {
@@ -102,6 +105,6 @@ public function canRead($pFilename)
             return false;
         }
         fclose($this->fileHandle);
-        return $readable;
+        return true;
     }
-}
+}