1

Author: jhfangying

Classes/PHPWord.php

@@ -26,12 +26,13 @@
  */
 
 /** PHPWORD_BASE_PATH */
+// @codeCoverageIgnoreStart
 if (!defined('PHPWORD_BASE_PATH')) {
     define('PHPWORD_BASE_PATH', dirname(__FILE__) . '/');
     require PHPWORD_BASE_PATH . 'PHPWord/Autoloader.php';
     PHPWord_Autoloader::Register();
 }
-
+// @codeCoverageIgnoreEnd
 
 /**
  * PHPWord
@@ -155,7 +156,7 @@ public function setDefaultFontName($pValue)
     }
 
     /**
-     * Get default Font size
+     * Get default Font size (in points)
      * @return string
      */
     public function getDefaultFontSize()
@@ -164,15 +165,24 @@ public function getDefaultFontSize()
     }
 
     /**
-     * Set default Font size
+     * Set default Font size (in points)
      * @param int $pValue
      */
     public function setDefaultFontSize($pValue)
     {
-        $pValue = $pValue * 2;
         $this->_defaultFontSize = $pValue;
     }
 
+    /**
+     * Set default paragraph style definition to styles.xml
+     *
+     * @param   array   $styles Paragraph style definition
+     */
+    public function setDefaultParagraphStyle($styles)
+    {
+        PHPWord_Style::setDefaultParagraphStyle($styles);
+    }
+
     /**
      * Adds a paragraph style definition to styles.xml
      *
@@ -217,16 +227,6 @@ public function addTitleStyle($titleCount, $styleFont, $styleParagraph = null)
         PHPWord_Style::addTitleStyle($titleCount, $styleFont, $styleParagraph);
     }
 
-    /**
-     * Set default paragraph style definition to styles.xml
-     *
-     * @param   array   $styles Paragraph style definition
-     */
-    public function setDefaultParagraphStyle($styles)
-    {
-        PHPWord_Style::setDefaultParagraphStyle($styles);
-    }
-
     /**
      * Adds a hyperlink style to styles.xml
      *
@@ -247,15 +247,6 @@ public function getSections()
         return $this->_sectionCollection;
     }
 
-    /**
-     * Get section count
-     * @return int
-     */
-    private function _countSections()
-    {
-        return count($this->_sectionCollection);
-    }
-
     /**
      * Load a Template File
      *
@@ -268,7 +259,18 @@ public function loadTemplate($strFilename)
             $template = new PHPWord_Template($strFilename);
             return $template;
         } else {
-            trigger_error('Template file ' . $strFilename . ' not found.', E_USER_ERROR);
+            throw new PHPWord_Exception(
+                "Template file {$strFilename} not found."
+            );
         }
     }
-}
+
+    /**
+     * Get section count
+     * @return int
+     */
+    private function _countSections()
+    {
+        return count($this->_sectionCollection);
+    }
+}

Classes/PHPWord/Autoloader.php

@@ -82,4 +82,4 @@ public static function autoload($class)
             }
         }
     }
-}
+}