Cleaning up code

Author: ivanlanin

Classes/PHPWord/IOFactory.php

@@ -38,7 +38,7 @@ class PHPWord_IOFactory
      */
     private static $_searchLocations = array(
         array('type' => 'IWriter', 'path' => 'PHPWord/Writer/{0}.php', 'class' => 'PHPWord_Writer_{0}'),
-        array( 'type' => 'IReader', 'path' => 'PHPWord/Reader/{0}.php', 'class' => 'PHPWord_Reader_{0}' ),
+        array('type' => 'IReader', 'path' => 'PHPWord/Reader/{0}.php', 'class' => 'PHPWord_Reader_{0}' ),
     );
 
     /**
@@ -140,7 +140,7 @@ public static function createReader($readerType = '') {
             }
         }
 
-        throw new PHPExcel_Reader_Exception("No $searchType found for type $readerType");
+        throw new PHPWord_Exception("No $searchType found for type $readerType");
     }
 
     /**

Classes/PHPWord/Reader/Word2007.php

@@ -48,8 +48,7 @@ public function __construct() {
      * Can the current PHPWord_Reader_IReader read the file?
      *
      * @param   string      $pFilename
-     * @return  boolean
-     * @throws PHPWord_Exception
+     * @return  bool
      */
     public function canRead($pFilename)
     {
@@ -117,6 +116,7 @@ public function getFromZipArchive($archive, $fileName = '')
      * Loads PHPWord from file
      *
      * @param   string      $pFilename
+     * @return  PHPWord
      */
     public function load($pFilename)
     {
@@ -189,7 +189,8 @@ public function load($pFilename)
                     $archive = "$dir/_rels/" . basename($rel["Target"]) . ".rels";
                     $relsDoc = simplexml_load_string($this->getFromZipArchive($zip, $archive));
                     $relsDoc->registerXPathNamespace("rel", "http://schemas.openxmlformats.org/package/2006//relationships");
-                    $xpath = self::array_item($relsDoc->xpath("rel:Relationship[@Type='" . "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles']"));
+                    $xpath = self::array_item($relsDoc->xpath("rel:Relationship[@Type='" .
+                        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles']"));
                     $xmlDoc = simplexml_load_string($this->getFromZipArchive($zip, "{$rel['Target']}"));
                     if ($xmlDoc->body) {
                         $section = $word->createSection();
@@ -219,12 +220,18 @@ public function load($pFilename)
                     break;
             }
         }
-
         $zip->close();
 
         return $word;
     }
 
+    /**
+     * Get array item
+     *
+     * @param   array   $array
+     * @param   mixed   $key
+     * @return  mixed|null
+     */
     private static function array_item($array, $key = 0) {
         return (isset($array[$key]) ? $array[$key] : null);
     }