From 91a8dd3b221e24b9654c38576119b804f8f66634 Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 10 Feb 2018 22:16:55 +0100
Subject: [PATCH 1/2] add parsing of p:br and add unit test

---
 src/PhpWord/Reader/Word2007/AbstractPart.php  | 10 +++-
 tests/PhpWord/Reader/Word2007/ElementTest.php | 46 +++++++++++++++
 .../PhpWord/_includes/AbstractTestReader.php  | 59 +++++++++++++++++++
 3 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 tests/PhpWord/Reader/Word2007/ElementTest.php
 create mode 100644 tests/PhpWord/_includes/AbstractTestReader.php

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
index 3d853e8f..5ce84650 100644
--- a/src/PhpWord/Reader/Word2007/AbstractPart.php
+++ b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -93,7 +93,7 @@ abstract class AbstractPart
      *
      * @param \PhpOffice\Common\XMLReader $xmlReader
      * @param \DOMElement $domNode
-     * @param mixed $parent
+     * @param \PhpOffice\PhpWord\Element\AbstractContainer $parent
      * @param string $docPart
      *
      * @todo Get font style for preserve text
@@ -177,7 +177,7 @@ abstract class AbstractPart
      *
      * @param \PhpOffice\Common\XMLReader $xmlReader
      * @param \DOMElement $domNode
-     * @param mixed $parent
+     * @param \PhpOffice\PhpWord\Element\AbstractContainer $parent
      * @param string $docPart
      * @param mixed $paragraphStyle
      *
@@ -226,7 +226,11 @@ abstract class AbstractPart
                     $textContent = "&lt;Object: {$target}>";
                     $parent->addText($textContent, $fontStyle, $paragraphStyle);
                 }
-            } else {
+            }
+            if ($xmlReader->elementExists('w:br', $domNode)) {
+                $parent->addTextBreak();
+            }
+            if ($xmlReader->elementExists('w:t', $domNode)) {
                 // TextRun
                 $textContent = $xmlReader->getValue('w:t', $domNode);
                 $parent->addText($textContent, $fontStyle, $paragraphStyle);
diff --git a/tests/PhpWord/Reader/Word2007/ElementTest.php b/tests/PhpWord/Reader/Word2007/ElementTest.php
new file mode 100644
index 00000000..67c2eb13
--- /dev/null
+++ b/tests/PhpWord/Reader/Word2007/ElementTest.php
@@ -0,0 +1,46 @@
+<?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.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord\Reader\Word2007;
+
+use PhpOffice\PhpWord\AbstractTestReader;
+
+/**
+ * Test class for PhpOffice\PhpWord\Reader\Word2007\Element subnamespace
+ */
+class ElementTest extends AbstractTestReader
+{
+    /**
+     * Test reading of textbreak
+     */
+    public function testReadTextBreak()
+    {
+        $documentXml = '<w:p>
+            <w:r>
+                <w:br/>
+                <w:t xml:space="preserve">test string</w:t>
+            </w:r>
+        </w:p>';
+
+        $phpWord = $this->getDocumentFromString($documentXml);
+
+        $elements = $this->get($phpWord->getSections(), 0)->getElements();
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\TextBreak', $elements[0]);
+        $this->assertInstanceOf('PhpOffice\PhpWord\Element\Text', $elements[1]);
+        $this->assertEquals('test string', $elements[1]->getText());
+    }
+}
diff --git a/tests/PhpWord/_includes/AbstractTestReader.php b/tests/PhpWord/_includes/AbstractTestReader.php
new file mode 100644
index 00000000..f138ac76
--- /dev/null
+++ b/tests/PhpWord/_includes/AbstractTestReader.php
@@ -0,0 +1,59 @@
+<?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.
+ *
+ * @see         https://github.com/PHPOffice/PHPWord
+ * @copyright   2010-2017 PHPWord contributors
+ * @license     http://www.gnu.org/licenses/lgpl.txt LGPL version 3
+ */
+
+namespace PhpOffice\PhpWord;
+
+use PhpOffice\PhpWord\Reader\Word2007\Document;
+
+/**
+ * Base class for Word2007 reader tests
+ */
+abstract class AbstractTestReader extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Builds a PhpWord instance based on the xml passed
+     *
+     * @param string $documentXml
+     * @return \PhpOffice\PhpWord\PhpWord
+     */
+    protected function getDocumentFromString($documentXml)
+    {
+        $phpWord = new PhpWord();
+        $file = __DIR__ . '/../_files/temp.docx';
+        $zip = new \ZipArchive();
+        $zip->open($file, \ZipArchive::CREATE);
+        $zip->addFromString('document.xml', '<w:document xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:body>' . $documentXml . '</w:body></w:document>');
+        $zip->close();
+        $documentReader = new Document($file, 'document.xml');
+        $documentReader->read($phpWord);
+        unlink($file);
+
+        return $phpWord;
+    }
+
+    /**
+     * Returns the element at position $index in the array
+     *
+     * @param array $array
+     * @param number $index
+     * @return mixed
+     */
+    protected function get(array $array, $index = 0)
+    {
+        return $array[$index];
+    }
+}

From 874c6d6fb6083ec2902e27d4e639f0b08aa3c76d Mon Sep 17 00:00:00 2001
From: troosan <antoine.de.troostembergh@gmail.com>
Date: Sat, 10 Feb 2018 22:19:04 +0100
Subject: [PATCH 2/2] update changelog

---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d3f60f3..ae661e5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,10 +11,11 @@ v0.15.0 (?? ??? 2018)
 - Parsing of CSS `direction` instruction, HTML `lang` attribute, formatting inside table cell - @troosan #1273 #1252 #1254
 
 ### Fixed
-- fix reading of docx default style - @troosan #1238
-- fix the size unit of when parsing html images - @troosan #1254
-- fixed HTML parsing of nested lists - @troosan #1265
+- Fix reading of docx default style - @troosan #1238
+- Fix the size unit of when parsing html images - @troosan #1254
+- Fixed HTML parsing of nested lists - @troosan #1265
 - Save PNG alpha information when using remote images. @samsullivan #779
+- fix parsing of `<w:br/>` tag. @troosan #1274