Merge pull request #134 from PHPOffice/develop

Version 0.8.0

.gitignore

@@ -9,6 +9,7 @@ phpunit.xml
 composer.lock
 composer.phar
 vendor
+/report
 /.settings
 /.buildpath
 /.project

Classes/PHPWord.php

@@ -26,19 +26,42 @@
  */
 
 /** 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
  */
 class PHPWord
 {
 
+ /**
+ * Default font name (Arial)
+ */
+ const DEFAULT_FONT_NAME = 'Arial';
+ /**
+ * Default Font Content Type(default)
+ * default|eastAsia|cs
+ */
+ const DEFAULT_FONT_CONTENT_TYPE='default';
+ /**
+ * Default font size in points (10pt)
+ *
+ * OOXML defined font size values in halfpoints, i.e. twice of what PHPWord
+ * use, and the conversion will be conducted during XML writing.
+ */
+ const DEFAULT_FONT_SIZE = 10;
+
+ /**
+ * Default font color (black)
+ */
+ const DEFAULT_FONT_COLOR = '000000';
+
  /**
  * Document properties
  *
@@ -74,8 +97,8 @@ class PHPWord
  public function __construct()
  {
  $this->_properties = new PHPWord_DocumentProperties();
- $this->_defaultFontName = 'Arial';
- $this->_defaultFontSize = 20;
+ $this->_defaultFontName = PHPWord::DEFAULT_FONT_NAME;
+ $this->_defaultFontSize = PHPWord::DEFAULT_FONT_SIZE;
  }
 
  /**
@@ -133,7 +156,7 @@ public function setDefaultFontName($pValue)
  }
 
  /**
- * Get default Font size
+ * Get default Font size (in points)
  * @return string
  */
  public function getDefaultFontSize()
@@ -142,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
  *
@@ -215,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
  *
@@ -236,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

@@ -36,7 +36,7 @@
  */
 class PHPWord_Autoloader
 {
- const PREFIX = 'PHPWord';
+ const PREFIX = 'PhpOffice\PhpWord';
 
  /**
  * Register the autoloader
@@ -82,4 +82,4 @@ public static function autoload($class)
  }
  }
  }
-}
+}