PHPOffice · Progi1984 · Mar 14, 2014 · Mar 14, 2014 · Mar 14, 2014
diff --git a/Classes/PHPWord/HashTable.php b/Classes/PHPWord/HashTable.php
@@ -27,6 +27,8 @@
 
 /**
  * PHPWord_HashTable
+ *
+ * @codeCoverageIgnore  Legacy from PHPExcel
  */
 class PHPWord_HashTable
 {

diff --git a/Classes/PHPWord/Section.php b/Classes/PHPWord/Section.php
@@ -156,12 +156,14 @@ public function addLink($linkSrc, $linkName = null, $styleFont = null, $stylePar
     /**
      * Add a TextBreak Element
      *
-     * @param int $count
+     * @param   int $count
+     * @param   null|string|array|PHPWord_Style_Font        $fontStyle
+     * @param   null|string|array|PHPWord_Style_Paragraph   $paragraphStyle
      */
-    public function addTextBreak($count = 1)
+    public function addTextBreak($count = 1, $fontStyle = null, $paragraphStyle = null)
     {
         for ($i = 1; $i <= $count; $i++) {
-            $this->_elementCollection[] = new PHPWord_Section_TextBreak();
+            $this->_elementCollection[] = new PHPWord_Section_TextBreak($fontStyle, $paragraphStyle);
         }
     }
 

diff --git a/Classes/PHPWord/Section/Footer.php b/Classes/PHPWord/Section/Footer.php
@@ -79,14 +79,16 @@ public function addText($text, $styleFont = null, $styleParagraph = null)
     }
 
     /**
-     * Add a TextBreak Element
+     * Add TextBreak
      *
-     * @param int $count
+     * @param   int $count
+     * @param   null|string|array|PHPWord_Style_Font        $fontStyle
+     * @param   null|string|array|PHPWord_Style_Paragraph   $paragraphStyle
      */
-    public function addTextBreak($count = 1)
+    public function addTextBreak($count = 1, $fontStyle = null, $paragraphStyle = null)
     {
         for ($i = 1; $i <= $count; $i++) {
-            $this->_elementCollection[] = new PHPWord_Section_TextBreak();
+            $this->_elementCollection[] = new PHPWord_Section_TextBreak($fontStyle, $paragraphStyle);
         }
     }
 

diff --git a/Classes/PHPWord/Section/Header.php b/Classes/PHPWord/Section/Header.php
@@ -108,14 +108,16 @@ public function addText($text, $styleFont = null, $styleParagraph = null)
     }
 
     /**
-     * Add a TextBreak Element
+     * Add TextBreak
      *
-     * @param int $count
+     * @param   int $count
+     * @param   null|string|array|PHPWord_Style_Font        $fontStyle
+     * @param   null|string|array|PHPWord_Style_Paragraph   $paragraphStyle
      */
-    public function addTextBreak($count = 1)
+    public function addTextBreak($count = 1, $fontStyle = null, $paragraphStyle = null)
     {
         for ($i = 1; $i <= $count; $i++) {
-            $this->_elementCollection[] = new PHPWord_Section_TextBreak();
+            $this->_elementCollection[] = new PHPWord_Section_TextBreak($fontStyle, $paragraphStyle);
         }
     }
 

diff --git a/Classes/PHPWord/Section/Table/Cell.php b/Classes/PHPWord/Section/Table/Cell.php
@@ -146,13 +146,17 @@ public function addLink($linkSrc, $linkName = null, $style = null)
     }
 
     /**
-     * Add a TextBreak Element
+     * Add TextBreak
      *
-     * @param int $count
+     * @param   int $count
+     * @param   null|string|array|PHPWord_Style_Font        $fontStyle
+     * @param   null|string|array|PHPWord_Style_Paragraph   $paragraphStyle
      */
-    public function addTextBreak()
+    public function addTextBreak($count = 1, $fontStyle = null, $paragraphStyle = null)
     {
-        $this->_elementCollection[] = new PHPWord_Section_TextBreak();
+        for ($i = 1; $i <= $count; $i++) {
+            $this->_elementCollection[] = new PHPWord_Section_TextBreak($fontStyle, $paragraphStyle);
+        }
     }
 
     /**

diff --git a/Classes/PHPWord/Section/TextBreak.php b/Classes/PHPWord/Section/TextBreak.php
@@ -30,11 +30,91 @@
  */
 class PHPWord_Section_TextBreak
 {
+    /**
+     * Paragraph style
+     *
+     * @var PHPWord_Style_Pagaraph
+     */
+    private $paragraphStyle = null;
+
+    /**
+     * Text style
+     *
+     * @var PHPWord_Style_Font
+     */
+    private $fontStyle = null;
 
     /**
      * Create a new TextBreak Element
      */
-    public function __construct()
+    public function __construct($fontStyle = null, $paragraphStyle = null)
+    {
+        if (!is_null($paragraphStyle)) {
+            $paragraphStyle = $this->setParagraphStyle($paragraphStyle);
+        }
+        if (!is_null($fontStyle)) {
+            $this->setFontStyle($fontStyle, $paragraphStyle);
+        }
+    }
+
+    /**
+     * Set Text style
+     *
+     * @param null|array|\PHPWord_Style_Font $style
+     * @param null|array|\PHPWord_Style_Paragraph $paragraphStyle
+     * @return PHPWord_Style_Font
+     */
+    public function setFontStyle($style = null, $paragraphStyle = null)
+    {
+        if ($style instanceof PHPWord_Style_Font) {
+            $this->fontStyle = $style;
+            $this->setParagraphStyle($paragraphStyle);
+        } elseif (is_array($style)) {
+            $this->fontStyle = new PHPWord_Style_Font('text', $paragraphStyle);
+            $this->fontStyle->setArrayStyle($style);
+        } else {
+            $this->fontStyle = $style;
+            $this->setParagraphStyle($paragraphStyle);
+        }
+        return $this->fontStyle;
+    }
+
+    /**
+     * Get Text style
+     *
+     * @return PHPWord_Style_Font
+     */
+    public function getFontStyle()
+    {
+        return $this->fontStyle;
+    }
+
+    /**
+     * Set Paragraph style
+     *
+     * @param   null|array|\PHPWord_Style_Paragraph $style
+     * @return  null|\PHPWord_Style_Paragraph
+     */
+    public function setParagraphStyle($style = null)
+    {
+        if (is_array($style)) {
+            $this->paragraphStyle = new PHPWord_Style_Paragraph;
+            $this->paragraphStyle->setArrayStyle($style);
+        } elseif ($style instanceof PHPWord_Style_Paragraph) {
+            $this->paragraphStyle = $style;
+        } else {
+            $this->paragraphStyle = $style;
+        }
+        return $this->paragraphStyle;
+    }
+
+    /**
+     * Get Paragraph style
+     *
+     * @return PHPWord_Style_Paragraph
+     */
+    public function getParagraphStyle()
     {
+        return $this->paragraphStyle;
     }
 }
diff --git a/Classes/PHPWord/Section/TextRun.php b/Classes/PHPWord/Section/TextRun.php
@@ -132,14 +132,16 @@ public function addImage($imageSrc, $style = null)
     }
 
     /**
-     * Add a Text Break
+     * Add TextBreak
      *
-     * @param int $count
+     * @param   int $count
+     * @param   null|string|array|PHPWord_Style_Font        $fontStyle
+     * @param   null|string|array|PHPWord_Style_Paragraph   $paragraphStyle
      */
-    public function addTextBreak($count = 1)
+    public function addTextBreak($count = 1, $fontStyle = null, $paragraphStyle = null)
     {
-        for ($i=1; $i<=$count; $i++) {
-            $this->_elementCollection[] = new PHPWord_Section_TextBreak();
+        for ($i = 1; $i <= $count; $i++) {
+            $this->_elementCollection[] = new PHPWord_Section_TextBreak($fontStyle, $paragraphStyle);
         }
     }
 

diff --git a/Classes/PHPWord/Shared/ZipStreamWrapper.php b/Classes/PHPWord/Shared/ZipStreamWrapper.php
@@ -25,11 +25,10 @@
  * @version    0.7.0
  */
 
-/** Register new zip wrapper */
-PHPWord_Shared_ZipStreamWrapper::register();
-
 /**
  * Class PHPWord_Shared_ZipStreamWrapper
+ *
+ * @codeCoverageIgnore  Legacy from PHPExcel
  */
 class PHPWord_Shared_ZipStreamWrapper
 {

diff --git a/Classes/PHPWord/Writer/ODText.php b/Classes/PHPWord/Writer/ODText.php
@@ -141,7 +141,8 @@ public function save($pFilename = null)
             // Add META-INF/manifest.xml
             $objZip->addFromString('META-INF/manifest.xml', $this->getWriterPart('manifest')->writeManifest($this->_document));
 
-            // Add media
+            // Add media. Has not used yet. Legacy from PHPExcel.
+            // @codeCoverageIgnoreStart
             for ($i = 0; $i < $this->getDrawingHashTable()->count(); ++$i) {
                 if ($this->getDrawingHashTable()->getByIndex($i) instanceof PHPWord_Shape_Drawing) {
                     $imageContents = null;

diff --git a/Classes/PHPWord/Writer/ODText/Manifest.php b/Classes/PHPWord/Writer/ODText/Manifest.php
@@ -77,6 +77,8 @@ public function writeManifest(PHPWord $pPHPWord = null)
         $objWriter->writeAttribute('manifest:full-path', 'styles.xml');
         $objWriter->endElement();
 
+        // Not used yet. Legacy from PHPExcel
+        // @codeCoverageIgnoreStart
         for ($i = 0; $i < $this->getParentWriter()->getDrawingHashTable()->count(); ++$i) {
             if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof PHPWord_Shape_Drawing) {
                 $extension = strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getExtension());

diff --git a/Classes/PHPWord/Writer/Word2007/Base.php b/Classes/PHPWord/Writer/Word2007/Base.php
@@ -477,10 +477,51 @@ protected function _writeTextStyle(PHPWord_Shared_XMLWriter $objWriter = null, P
 
     /**
      * Write text break
+     *
+     * @param   PHPWord_Shared_XMLWriter    $objWriter
+     * @param   PHPWord_Section_TextBreak   $element
      */
-    protected function _writeTextBreak(PHPWord_Shared_XMLWriter $objWriter = null)
+    protected function _writeTextBreak($objWriter, $element = null)
     {
-        $objWriter->writeElement('w:p', null);
+        $hasStyle = false;
+        if (!is_null($element)) {
+            $fontStyle = $element->getFontStyle();
+            $sfIsObject = ($fontStyle instanceof PHPWord_Style_Font) ? true : false;
+            $paragraphStyle = $element->getParagraphStyle();
+            $spIsObject = ($paragraphStyle instanceof PHPWord_Style_Paragraph) ? true : false;
+            $hasStyle = !is_null($fontStyle) || !is_null($paragraphStyle);
+        }
+        if ($hasStyle) {
+            // Paragraph style
+            $objWriter->startElement('w:p');
+            if ($spIsObject) {
+                $this->_writeParagraphStyle($objWriter, $paragraphStyle);
+            } elseif (!$spIsObject && !is_null($paragraphStyle)) {
+                $objWriter->startElement('w:pPr');
+                $objWriter->startElement('w:pStyle');
+                $objWriter->writeAttribute('w:val', $paragraphStyle);
+                $objWriter->endElement(); // w:pStyle
+                $objWriter->endElement(); // w:pPr
+            }
+            // Font style
+            if (!is_null($fontStyle)) {
+                $objWriter->startElement('w:pPr');
+                if ($sfIsObject) {
+                    $this->_writeTextStyle($objWriter, $fontStyle);
+                } elseif (!$sfIsObject && !is_null($fontStyle)) {
+                    $objWriter->startElement('w:rPr');
+                    $objWriter->startElement('w:rStyle');
+                    $objWriter->writeAttribute('w:val', $fontStyle);
+                    $objWriter->endElement(); // w:rStyle
+                    $objWriter->endElement(); // w:rPr
+                }
+                $objWriter->endElement(); // w:pPr
+            }
+            $objWriter->endElement(); // w:p
+        } else {
+            // Null element. No paragraph nor font style
+            $objWriter->writeElement('w:p', null);
+        }
     }
 
     /**
@@ -570,7 +611,7 @@ protected function _writeTable(PHPWord_Shared_XMLWriter $objWriter = null, PHPWo
                             } elseif ($element instanceof PHPWord_Section_Link) {
                                 $this->_writeLink($objWriter, $element);
                             } elseif ($element instanceof PHPWord_Section_TextBreak) {
-                                $this->_writeTextBreak($objWriter);
+                                $this->_writeTextBreak($objWriter, $element);
                             } elseif ($element instanceof PHPWord_Section_ListItem) {
                                 $this->_writeListItem($objWriter, $element);
                             } elseif ($element instanceof PHPWord_Section_Image ||

diff --git a/Classes/PHPWord/Writer/Word2007/Document.php b/Classes/PHPWord/Writer/Word2007/Document.php
@@ -79,7 +79,7 @@ public function writeDocument(PHPWord $pPHPWord = null)
                     } elseif ($element instanceof PHPWord_Section_Title) {
                         $this->_writeTitle($objWriter, $element);
                     } elseif ($element instanceof PHPWord_Section_TextBreak) {
-                        $this->_writeTextBreak($objWriter);
+                        $this->_writeTextBreak($objWriter, $element);
                     } elseif ($element instanceof PHPWord_Section_PageBreak) {
                         $this->_writePageBreak($objWriter);
                     } elseif ($element instanceof PHPWord_Section_Table) {

diff --git a/Classes/PHPWord/Writer/Word2007/Footer.php b/Classes/PHPWord/Writer/Word2007/Footer.php
@@ -63,7 +63,7 @@ public function writeFooter(PHPWord_Section_Footer $footer)
             } elseif ($element instanceof PHPWord_Section_TextRun) {
                 $this->_writeTextRun($objWriter, $element);
             } elseif ($element instanceof PHPWord_Section_TextBreak) {
-                $this->_writeTextBreak($objWriter);
+                $this->_writeTextBreak($objWriter, $element);
             } elseif ($element instanceof PHPWord_Section_Table) {
                 $this->_writeTable($objWriter, $element);
             } elseif ($element instanceof PHPWord_Section_Image ||

diff --git a/Classes/PHPWord/Writer/Word2007/Header.php b/Classes/PHPWord/Writer/Word2007/Header.php
@@ -63,7 +63,7 @@ public function writeHeader(PHPWord_Section_Header $header)
             } elseif ($element instanceof PHPWord_Section_TextRun) {
                 $this->_writeTextRun($objWriter, $element);
             } elseif ($element instanceof PHPWord_Section_TextBreak) {
-                $this->_writeTextBreak($objWriter);
+                $this->_writeTextBreak($objWriter, $element);
             } elseif ($element instanceof PHPWord_Section_Table) {
                 $this->_writeTable($objWriter, $element);
             } elseif ($element instanceof PHPWord_Section_Image ||

diff --git a/Tests/PHPWord/Section/TextBreakTest.php b/Tests/PHPWord/Section/TextBreakTest.php
@@ -2,17 +2,59 @@
 namespace PHPWord\Tests\Section;
 
 use PHPWord_Section_TextBreak;
+use PHPWord_Style_Paragraph;
+use PHPWord_Style_Font;
 
+/**
+ * @package             PHPWord\Tests
+ * @coversDefaultClass  PHPWord_Section_TextBreak
+ * @runTestsInSeparateProcesses
+ */
 class TextBreakTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Executed before each method of the class
+     * Construct with empty value
      */
     public function testConstruct()
     {
-        // Section Settings
-        $oTextBreak = new PHPWord_Section_TextBreak();
+        $object = new PHPWord_Section_TextBreak();
+        $this->assertNull($object->getFontStyle());
+        $this->assertNull($object->getParagraphStyle());
+    }
+
+    /**
+     * Construct with style object
+     */
+    public function testConstructWithStyleObject()
+    {
+        $fStyle = new PHPWord_Style_Font();
+        $pStyle = new PHPWord_Style_Paragraph();
+        $object = new PHPWord_Section_TextBreak($fStyle, $pStyle);
+        $this->assertEquals($fStyle, $object->getFontStyle());
+        $this->assertEquals($pStyle, $object->getParagraphStyle());
+    }
+
+    /**
+     * Construct with style array
+     */
+    public function testConstructWithStyleArray()
+    {
+        $fStyle = array('size' => 12);
+        $pStyle = array('spacing' => 240);
+        $object = new PHPWord_Section_TextBreak($fStyle, $pStyle);
+        $this->assertInstanceOf('PHPWord_Style_Font', $object->getFontStyle());
+        $this->assertInstanceOf('PHPWord_Style_Paragraph', $object->getParagraphStyle());
+    }
 
-        $this->assertInstanceOf('PHPWord_Section_TextBreak', $oTextBreak);
+    /**
+     * Construct with style name
+     */
+    public function testConstructWithStyleName()
+    {
+        $fStyle = 'fStyle';
+        $pStyle = 'pStyle';
+        $object = new PHPWord_Section_TextBreak($fStyle, $pStyle);
+        $this->assertEquals($fStyle, $object->getFontStyle());
+        $this->assertEquals($pStyle, $object->getParagraphStyle());
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,8 @@ @@
     /**
      * PHPWord_HashTable
+     *
+     * @codeCoverageIgnore  Legacy from PHPExcel
      */
     class PHPWord_HashTable
     {
@@ Expand Down @@