Merge branch 'develop-html-br' of https://github.com/anrikun/PHPWord

into develop

Conflicts:
	src/PhpWord/Shared/Html.php

Author: troosan

src/PhpWord/Shared/Html.php

@@ -136,6 +136,7 @@ protected static function parseNode($node, $element, $styles = array(), $data =
             'ul'        => array('List',        null,   null,       $styles,    $data,  3,              null),
             'ol'        => array('List',        null,   null,       $styles,    $data,  7,              null),
             'li'        => array('ListItem',    $node,  $element,   $styles,    $data,  null,           null),
+            'br'        => array('LineBreak',   null,   $element,   $styles,    null,   null,           null),
         );
 
         $newElement = null;
@@ -523,4 +524,14 @@ private static function mapBorderStyle($cssBorderStyle)
                 return 'single';
         }
     }
-}
+
+    /**
+     * Parse line break
+    *
+    * @param \PhpOffice\PhpWord\Element\AbstractContainer $element
+    */
+    private static function parseLineBreak($element)
+    {
+        $element->addTextBreak();
+    }
+}

tests/PhpWord/Shared/HtmlTest.php

@@ -234,4 +234,22 @@ public function testParseList()
         $this->assertEquals('list item1', $doc->getElement('/w:document/w:body/w:p[1]/w:r/w:t')->nodeValue);
         $this->assertEquals('list item2', $doc->getElement('/w:document/w:body/w:p[2]/w:r/w:t')->nodeValue);
     }
+
+    /**
+     * Tests parsing of br
+     */
+    public function testParseLineBreak()
+    {
+        $phpWord = new \PhpOffice\PhpWord\PhpWord();
+        $section = $phpWord->addSection();
+        $html = '<p>This is some text<br/>with a linebreak.</p>';
+        Html::addHtml($section, $html);
+
+        $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:br'));
+        $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:t'));
+        $this->assertEquals('This is some text', $doc->getElement('/w:document/w:body/w:p/w:r[1]/w:t')->nodeValue);
+        $this->assertEquals('with a linebreak.', $doc->getElement('/w:document/w:body/w:p/w:r[2]/w:t')->nodeValue);
+    }
 }