Reactivate PHPMD and fix some rules for textbox

Author: ivanlanin

.travis.yml

@@ -52,7 +52,7 @@ script:
     ## PHP Copy/Paste Detector
     - php phpcpd.phar src/ tests/ --verbose
     ## PHP Mess Detector
-    #- phpmd src/,tests/ text unusedcode,naming,design,controversial --exclude pclzip.lib.php
+    - phpmd src/,tests/ text unusedcode,naming,design,controversial --exclude pclzip.lib.php
     ## PHPLOC
     #- php phploc.phar src/
     ## PHPUnit

samples/Sample_25_TextBox.php

@@ -6,14 +6,29 @@
 $phpWord = new \PhpOffice\PhpWord\PhpWord();
 
 $section = $phpWord->addSection();
-$textbox = $section->addTextBox(array('align' => 'left', 'width' => 300, 'borderSize' => 1, 'borderColor' => '#FF0000'));
-$textbox->addText('Text box content ');
-$textbox->addText('with bold text', array('bold' => true));
-$textbox->addText(', ');
-$textbox->addLink('http://www.google.com', 'link');
-$textbox->addText(', and image ');
-$textbox->addImage('resources/_earth.jpg', array('width' => 18, 'height' => 18));
-$textbox->addText('.');
+
+// In section
+$textbox = $section->addTextBox(array('align' => 'left', 'width' => 400, 'borderSize' => 1, 'borderColor' => '#FF0000'));
+$textbox->addText('Text box content in section.');
+$textbox->addText('Another line.');
+
+// Inside table
+$section->addTextBreak(2);
+$cell = $section->addTable()->addRow()->addCell(300);
+$textbox = $cell->addTextBox(array('borderSize' => 1, 'borderColor' => '#0000FF', 'innerMargin' => 100));
+$textbox->addText('Inside table');
+
+// Inside header with textrun
+$header = $section->addHeader();
+$textbox = $header->addTextBox(array('align' => 'center', 'width' => 600, 'borderSize' => 1, 'borderColor' => '#00FF00'));
+$textrun = $textbox->addTextRun();
+$textrun->addText('TextBox in header. TextBox can contain a TextRun ');
+$textrun->addText('with bold text', array('bold' => true));
+$textrun->addText(', ');
+$textrun->addLink('http://www.google.com', 'link');
+$textrun->addText(', and image ');
+$textrun->addImage('resources/_earth.jpg', array('width' => 18, 'height' => 18));
+$textrun->addText('.');
 
 // Save file
 echo write($phpWord, basename(__FILE__, '.php'), $writers);

src/PhpWord/Element/AbstractContainer.php

@@ -100,7 +100,7 @@ public function addText($text, $fontStyle = null, $paragraphStyle = null, $eleme
      */
     public function addTextRun($paragraphStyle = null)
     {
-        $this->checkValidity('Textrun');
+        $this->checkValidity('TextRun');
 
         $element = new TextRun($paragraphStyle);
         $element->setDocPart($this->getDocPart(), $this->getDocPartId());
@@ -327,10 +327,10 @@ private function checkValidity($method)
             'TextBreak'     => $allContainers,
             'Image'         => $allContainers,
             'Object'        => $allContainers,
-            'TextRun'       => array('section', 'header', 'footer', 'cell'),
-            'ListItem'      => array('section', 'header', 'footer', 'cell'),
+            'TextRun'       => array('section', 'header', 'footer', 'cell', 'textbox'),
+            'ListItem'      => array('section', 'header', 'footer', 'cell', 'textbox'),
             'CheckBox'      => array('section', 'header', 'footer', 'cell'),
-            'TextBox'       => array('section', 'header', 'footer'),
+            'TextBox'       => array('section', 'header', 'footer', 'cell'),
             'Footnote'      => array('section', 'textrun', 'cell'),
             'Endnote'       => array('section', 'textrun', 'cell'),
             'PreserveText'  => array('header', 'footer', 'cell'),
@@ -346,7 +346,7 @@ private function checkValidity($method)
         // Check if a method is valid for current container
         if (array_key_exists($method, $validContainers)) {
             if (!in_array($this->container, $validContainers[$method])) {
-                throw new \BadMethodCallException();
+                throw new \BadMethodCallException("Cannot put $method in $this->container.");
             }
         }
         // Check if a method is valid for current container, located in other container
@@ -356,7 +356,7 @@ private function checkValidity($method)
             $allowedDocParts = $rules[1];
             foreach ($containers as $container) {
                 if ($this->container == $container && !in_array($this->getDocPart(), $allowedDocParts)) {
-                    throw new \BadMethodCallException();
+                    throw new \BadMethodCallException("Cannot put $method in $this->container.");
                 }
             }
         }
@@ -369,11 +369,12 @@ private function checkValidity($method)
      */
     private function checkElementDocPart()
     {
-        $isCellTextrun = in_array($this->container, array('cell', 'textrun', 'textbox'));
-        $docPart = $isCellTextrun ? $this->getDocPart() : $this->container;
-        $docPartId = $isCellTextrun ? $this->getDocPartId() : $this->sectionId;
+        $inOtherPart = in_array($this->container, array('cell', 'textrun', 'textbox'));
+        $docPart = $inOtherPart ? $this->getDocPart() : $this->container;
+        $docPartId = $inOtherPart ? $this->getDocPartId() : $this->sectionId;
         $inHeaderFooter = ($docPart == 'header' || $docPart == 'footer');
         $docPartId = $inHeaderFooter ? $this->getDocPartId() : $docPartId;
+
         return $inHeaderFooter ? $docPart . $docPartId : $docPart;
     }
 

src/PhpWord/Style/TextBox.php

@@ -177,7 +177,7 @@ public function getInnerMargin()
     public function hasInnerMargins()
     {
         $hasInnerMargins = false;
-        $margins = $this->getInnerMargins();
+        $margins = $this->getInnerMargin();
         for ($i = 0; $i < count($margins); $i++) {
             if (!is_null($margins[$i])) {
                 $hasInnerMargins = true;

src/PhpWord/Writer/Word2007/Element/Container.php

@@ -42,9 +42,9 @@ public function write()
         $container = $this->getElement();
 
         // Loop through subelements
-        $containerClass = substr(get_class($container), strrpos(get_class($this), '\\') + 1);
+        $containerClass = substr(get_class($container), strrpos(get_class($container), '\\') + 1);
         $subelements = $container->getElements();
-        $withoutP = in_array($containerClass, array('TextRun', 'Footnote', 'Endnote', 'TextBox')) ? true : false;
+        $withoutP = in_array($containerClass, array('TextRun', 'Footnote', 'Endnote')) ? true : false;
         if (count($subelements) > 0) {
             foreach ($subelements as $subelement) {
                 $writerClass = str_replace('PhpOffice\\PhpWord\\Element', $this->namespace, get_class($subelement));

src/PhpWord/Writer/Word2007/Element/TextBox.php

@@ -54,12 +54,13 @@ public function write()
         $styleWriter->write();
         $xmlWriter->startElement('v:textbox');
         $styleWriter->writeInnerMargin();
+
+        // TextBox content, serving as a container
         $xmlWriter->startElement('w:txbxContent');
-        $xmlWriter->startElement('w:p');
         $containerWriter = new Container($xmlWriter, $element);
         $containerWriter->write();
-        $xmlWriter->endElement(); // w:p
         $xmlWriter->endElement(); // w:txbxContent
+
         $xmlWriter->endElement(); // v: textbox
         $styleWriter->writeW10Wrap();
         $xmlWriter->endElement(); // v:shape