Merge branch 'PHPOffice#231-basjan' into develop

Author: ivanlanin

.scrutinizer.yml

@@ -5,6 +5,15 @@ before_commands:
     - "composer install --prefer-source --dev"
 
 tools:
+    php_code_sniffer:
+        enabled: true
+        config:
+            standard: PSR2
+    php_cpd: true
+    php_mess_detector:
+        enabled: true
+        config:
+            ruleset: phpmd.xml.dist
     external_code_coverage:
         enabled: true
         timeout: 900

.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 ./phpmd.xml.dist --exclude pclzip.lib.php
     ## PHPLOC
     #- php phploc.phar src/
     ## PHPUnit

CHANGELOG.md

@@ -11,6 +11,8 @@ This release changed PHPWord license from LGPL 2.1 to LGPL 3.
 - Image: Ability to define relative and absolute positioning - @basjan GH-217
 - Footer: Conform footer with header by adding firstPage, evenPage and by inheritance - @basjan @ivanlanin GH-219
 - TextBox: Ability to add textbox in section, header, and footer - @basjan @ivanlanin GH-228
+- TextBox: Ability to add textbox in table - @basjan GH-231
+- HTML: Ability to add elements to PHPWord object via html - @basjan GH-231
 
 ### Bugfixes
 

phpmd.xml.dist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ruleset name="PHPWord PHP Mess Detector Rule Set"
+    xmlns="http://pmd.sf.net/ruleset/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+    <rule ref="rulesets/naming.xml"/>
+    <rule ref="rulesets/design.xml/ExitExpression" />
+    <rule ref="rulesets/design.xml/EvalExpression" />
+    <rule ref="rulesets/design.xml/GotoStatement" />
+    <rule ref="rulesets/design.xml/NumberOfChildren" />
+    <rule ref="rulesets/design.xml/DepthOfInheritance" />
+    <rule ref="rulesets/design.xml/CouplingBetweenObjects">
+        <properties>
+            <property name="minimum" value="15" />
+        </properties>
+    </rule>
+    <rule ref="rulesets/unusedcode.xml" />
+    <rule ref="rulesets/controversial.xml" />
+</ruleset>

samples/Sample_26_Html.php

@@ -0,0 +1,19 @@
+<?php
+include_once 'Sample_Header.php';
+
+// New Word Document
+echo date('H:i:s') , ' Create new PhpWord object' , EOL;
+$phpWord = new \PhpOffice\PhpWord\PhpWord();
+
+$section = $phpWord->addSection();
+$html = '<h1>Adding element via HTML</h1>';
+$html .= '<p>Some well formed HTML snippet needs to be used</p>';
+$html .= '<p>With for example <strong>some <em>inline</em> formatting</strong></p>';
+
+\PhpOffice\PhpWord\Shared\Html::addHtml($section, $html);
+
+// Save file
+echo write($phpWord, basename(__FILE__, '.php'), $writers);
+if (!CLI) {
+    include_once 'Sample_Footer.php';
+}

src/PhpWord/Element/AbstractContainer.php

@@ -66,6 +66,31 @@ public function countElements()
         return count($this->elements);
     }
 
+    /**
+     * Add generic element with style
+     *
+     * This is how all elements should be added with dependency injection: with
+     * just one simple $style. Currently this function supports TextRun, Table,
+     * and TextBox since all other elements have different arguments
+     *
+     * @todo Change the function name into something better?
+     *
+     * @param string $elementName
+     * @param mixed $style
+     * @return \PhpOffice\PhpWord\Element\AbstractElement
+     */
+    private function addGenericElement($elementName, $style)
+    {
+        $elementClass = __NAMESPACE__ . '\\' . $elementName;
+
+        $this->checkValidity($elementName);
+        $element = new $elementClass($style);
+        $element->setDocPart($this->getDocPart(), $this->getDocPartId());
+        $this->addElement($element);
+
+        return $element;
+    }
+
     /**
      * Add text/preservetext element
      *
@@ -100,13 +125,7 @@ public function addText($text, $fontStyle = null, $paragraphStyle = null, $eleme
      */
     public function addTextRun($paragraphStyle = null)
     {
-        $this->checkValidity('TextRun');
-
-        $element = new TextRun($paragraphStyle);
-        $element->setDocPart($this->getDocPart(), $this->getDocPartId());
-        $this->addElement($element);
-
-        return $element;
+        return $this->addGenericElement('TextRun', $paragraphStyle);
     }
 
     /**
@@ -186,6 +205,18 @@ public function addListItem($text, $depth = 0, $fontStyle = null, $listStyle = n
         return $element;
     }
 
+    /**
+     * Add table element
+     *
+     * @param mixed $style
+     * @return \PhpOffice\PhpWord\Element\Table
+     * @todo Merge with the same function on Footer
+     */
+    public function addTable($style = null)
+    {
+        return $this->addGenericElement('Table', $style);
+    }
+
     /**
      * Add image element
      *
@@ -302,13 +333,7 @@ public function addCheckBox($name, $text, $fontStyle = null, $paragraphStyle = n
      */
     public function addTextBox($style = null)
     {
-        $this->checkValidity('TextBox');
-
-        $textbox = new TextBox($style);
-        $textbox->setDocPart($this->getDocPart(), $this->getDocPartId());
-        $this->addElement($textbox);
-
-        return $textbox;
+        return $this->addGenericElement('TextBox', $style);
     }
 
     /**
@@ -329,6 +354,7 @@ private function checkValidity($method)
             'Object'        => $allContainers,
             'TextRun'       => array('section', 'header', 'footer', 'cell', 'textbox'),
             'ListItem'      => array('section', 'header', 'footer', 'cell', 'textbox'),
+            'Table'         => array('section', 'header', 'footer', 'textbox'),
             'CheckBox'      => array('section', 'header', 'footer', 'cell'),
             'TextBox'       => array('section', 'header', 'footer', 'cell'),
             'Footnote'      => array('section', 'textrun', 'cell'),

src/PhpWord/Element/Footer.php

@@ -114,19 +114,4 @@ public function evenPage()
     {
         return $this->type = self::EVEN;
     }
-
-    /**
-     * Add table element
-     *
-     * @param mixed $style
-     * @return \PhpOffice\PhpWord\Element\Table
-     * @todo Merge with the same function on Section
-     */
-    public function addTable($style = null)
-    {
-        $table = new Table($this->getDocPart(), $this->getDocPartId(), $style);
-        $this->addElement($table);
-
-        return $table;
-    }
 }

src/PhpWord/Element/Section.php

@@ -117,21 +117,6 @@ public function addPageBreak()
         $this->addElement(new PageBreak());
     }
 
-    /**
-     * Add table element
-     *
-     * @param mixed $style
-     * @return \PhpOffice\PhpWord\Element\Table
-     * @todo Merge with the same function on Footer
-     */
-    public function addTable($style = null)
-    {
-        $table = new Table($this->getDocPart(), $this->getDocPartId(), $style);
-        $this->addElement($table);
-
-        return $table;
-    }
-
     /**
      * Add a Table-of-Contents Element
      *

src/PhpWord/Element/Table.php

@@ -53,9 +53,8 @@ class Table extends AbstractElement
      * @param integer $docPartId
      * @param mixed $style
      */
-    public function __construct($docPart, $docPartId, $style = null)
+    public function __construct($style = null)
     {
-        $this->setDocPart($docPart, $docPartId);
         $this->style = $this->setStyle(new TableStyle(), $style);
     }