Merge remote-tracking branch 'origin/develop' into develop

Author: Roman Syroeshko

.gitignore

@@ -4,13 +4,16 @@
 .Trashes
 Thumbs.db
 Desktop.ini
-composer.phar
+.idea
+_build
 phpunit.xml
+composer.lock
+composer.phar
+vendor
+/report
+/samples/resources
+/samples/results
+/.settings
 phpword.ini
 /.buildpath
-/.idea
-/.project
-/.settings
-/build
-/vendor
-/phpunit.bat
+/.project

CHANGELOG.md

@@ -4,7 +4,7 @@ This is the changelog between releases of PHPWord. Releases are listed in revers
 
 ## 0.12.0 - Not yet released
 
-This release added form fields (textinput, checkbox, and dropdown), drawing shapes (arc, curve, line, polyline, rect, oval), and basic 2D chart (pie, doughnut, bar, line, area, scatter, radar) elements along with some new styles.
+This release added form fields (textinput, checkbox, and dropdown), drawing shapes (arc, curve, line, polyline, rect, oval), and basic 2D chart (pie, doughnut, bar, line, area, scatter, radar) elements along with some new styles. Basic MsDoc reader is introduced.
 
 ### Features
 
@@ -23,6 +23,7 @@ This release added form fields (textinput, checkbox, and dropdown), drawing shap
 - SDT: Ability to add structured document tag elements (comboBox, dropDownList, date) - @ivanlanin
 - Paragraph: Support for paragraph with borders - @ivanlanin GH-294
 - Word2007 Writer : Support for RTL - @Progi1984 GH-331
+- MsDOC Reader: Basic MsDOC Reader - @Progi1984 GH-23 GH-287
 
 ### Bugfixes
 

samples/Sample_11_ReadWord97.php

@@ -0,0 +1,19 @@
+<?php
+include_once 'Sample_Header.php';
+
+// Read contents
+$name = basename(__FILE__, '.php');
+$source = "resources/{$name}.doc";
+echo date('H:i:s'), " Reading contents from `{$source}`", EOL;
+$phpWord = \PhpOffice\PhpWord\IOFactory::load($source, 'MsDoc');
+
+// (Re)write contents
+$writers = array('Word2007' => 'docx', 'ODText' => 'odt', 'RTF' => 'rtf');
+foreach ($writers as $writer => $extension) {
+    echo date('H:i:s'), " Write to {$writer} format", EOL;
+    $xmlWriter = \PhpOffice\PhpWord\IOFactory::createWriter($phpWord, $writer);
+    $xmlWriter->save("{$name}.{$extension}");
+    rename("{$name}.{$extension}", "results/{$name}.{$extension}");
+}
+
+include_once 'Sample_Footer.php';

samples/Sample_Footer.php

@@ -2,6 +2,9 @@
 /**
  * Footer file
  */
+if (CLI) {
+    return;
+}
 ?>
 </div>
 <script src="bootstrap/js/jquery.min.js"></script>

samples/Sample_Header.php

@@ -1,4 +1,7 @@
 <?php
+
+date_default_timezone_set('Europe/Paris');
+
 /**
  * Header file
  */

samples/resources/Sample_11_ReadWord97.doc

@@ -1,46 +1,47 @@
 <?php
 /**
- * This file is part of PHPWord - A pure PHP library for reading and writing
- * word processing documents.
- *
- * PHPWord is free software distributed under the terms of the GNU Lesser
- * General Public License version 3 as published by the Free Software Foundation.
- *
- * For the full copyright and license information, please read the LICENSE
- * file that was distributed with this source code. For the full list of
- * contributors, visit https://github.com/PHPOffice/PHPWord/contributors.
+ * PHPWord
  *
  * @link        https://github.com/PHPOffice/PHPWord
- * @copyright   2010-2014 PHPWord contributors
- * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ * @copyright   2014 PHPWord
+ * @license     http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
  */
 
 namespace PhpOffice\PhpWord;
 
 use PhpOffice\PhpWord\Exception\Exception;
+use PhpOffice\PhpWord\Writer\WriterInterface;
+use PhpOffice\PhpWord\Reader\ReaderInterface;
 
 /**
- * IO Factory
+ * IO factory
  */
 abstract class IOFactory
 {
     /**
      * Create new writer
      *
-     * @param \PhpOffice\PhpWord\PhpWord $phpWord
+     * @param PhpWord $phpWord
      * @param string $name
-     * @return \PhpOffice\PhpWord\Writer\WriterInterface
+     * @return WriterInterface
+     * @throws Exception
      */
     public static function createWriter(PhpWord $phpWord, $name = 'Word2007')
     {
-        return self::createObject('Writer', $name, $phpWord);
+        if ($name !== 'WriterInterface' && $name !== 'ODText' && $name !== 'RTF' && $name !== 'Word2007') {
+            throw new Exception("\"{$name}\" is not a valid writer.");
+        }
+
+        $fqName = "PhpOffice\\PhpWord\\Writer\\{$name}";
+        return new $fqName($phpWord);
     }
 
     /**
      * Create new reader
      *
      * @param string $name
-     * @return \PhpOffice\PhpWord\Reader\ReaderInterface
+     * @return ReaderInterface
+     * @throws Exception
      */
     public static function createReader($name = 'Word2007')
     {
@@ -65,7 +66,6 @@ private static function createObject($type, $name, $phpWord = null)
             throw new Exception("\"{$name}\" is not a valid {$type}.");
         }
     }
-
     /**
      * Loads PhpWord from file
      *
@@ -77,10 +77,8 @@ public static function load($filename, $readerName = 'Word2007')
     {
         /** @var \PhpOffice\PhpWord\Reader\ReaderInterface $reader */
         $reader = self::createReader($readerName);
-
         return $reader->load($filename);
     }
-
     /**
      * Check if it's a concrete class (not abstract nor interface)
      *
@@ -90,7 +88,6 @@ public static function load($filename, $readerName = 'Word2007')
     private static function isConcreteClass($class)
     {
         $reflection = new \ReflectionClass($class);
-
         return !$reflection->isAbstract() && !$reflection->isInterface();
     }
 }