PHPOffice · dbarzin · Mar 29, 2017 · Dec 3, 2018 · Dec 30, 2018 · Dec 31, 2018
diff --git a/.gitattributes b/.gitattributes
@@ -10,6 +10,7 @@
 # git files
 /.gitignore export-ignore
 /.gitattributes export-ignore
+/.github export-ignore
 
 # project directories
 /build export-ignore

diff --git a/.travis.yml b/.travis.yml
@@ -90,8 +90,6 @@ script:
     - if [ -z "$COVERAGE" ]; then ./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php ; fi
     ## PHPUnit
     - ./vendor/bin/phpunit -c ./ $(if [ -n "$COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi)
-    ## PHPLOC
-    - if [ -z "$COVERAGE" ]; then ./vendor/bin/phploc src/ ; fi
     ## PHPDocumentor
     ##- if [ -z "$COVERAGE" ]; then ./vendor/bin/phpdoc -q -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig" ; fi
 

diff --git a/docs/templates-processing.rst b/docs/templates-processing.rst
@@ -35,6 +35,16 @@ You can also set multiple values by passing all of them in an array.
 
     $templateProcessor->setValues(array('firstname' => 'John', 'lastname' => 'Doe'));
 
+setChartValue
+"""""""""""""
+Replace a variable by a chart.
+
+.. code-block:: php
+    $categories = array('A', 'B', 'C', 'D', 'E');
+    $series1 = array(1, 3, 2, 5, 4);
+    $chart = new Chart('doughnut', $categories, $series1);
+    $templateProcessor->setChartValue('myChart', $chart);
+
 setImageValue
 """""""""""""
 The search-pattern model for images can be like:

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,4 +1,6 @@
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
+         backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="./tests/bootstrap.php"
          colors="true"

diff --git a/samples/Sample_41_TemplateSetChart.php b/samples/Sample_41_TemplateSetChart.php
@@ -0,0 +1,45 @@
+<?php
+use PhpOffice\PhpWord\Element\Chart;
+use PhpOffice\PhpWord\Shared\Converter;
+
+include_once 'Sample_Header.php';
+
+// Template processor instance creation
+echo date('H:i:s'), ' Creating new TemplateProcessor instance...', EOL;
+$templateProcessor = new \PhpOffice\PhpWord\TemplateProcessor('resources/Sample_41_TemplateSetChart.docx');
+
+$chartTypes = array('pie', 'doughnut', 'bar', 'column', 'line', 'area', 'scatter', 'radar', 'stacked_bar', 'percent_stacked_bar', 'stacked_column', 'percent_stacked_column');
+$twoSeries = array('bar', 'column', 'line', 'area', 'scatter', 'radar', 'stacked_bar', 'percent_stacked_bar', 'stacked_column', 'percent_stacked_column');
+$threeSeries = array('bar', 'line');
+
+$categories = array('A', 'B', 'C', 'D', 'E');
+$series1 = array(1, 3, 2, 5, 4);
+$series2 = array(3, 1, 7, 2, 6);
+$series3 = array(8, 3, 2, 5, 4);
+
+$i=0;
+foreach ($chartTypes as $chartType) {
+	$chart = new Chart($chartType, $categories, $series1);
+
+	if (in_array($chartType, $twoSeries)) {
+	    $chart->addSeries($categories, $series2);
+	}
+	if (in_array($chartType, $threeSeries)) {
+	    $chart->addSeries($categories, $series3);
+	}
+
+	$chart->getStyle()
+		->setWidth(Converter::inchToEmu(3))
+		->setHeight(Converter::inchToEmu(3));
+
+	$templateProcessor->setChart("chart{$i}", $chart);
+	$i++;
+}
+
+echo date('H:i:s'), ' Saving the result document...', EOL;
+$templateProcessor->saveAs('results/Sample_41_TemplateSetChart.docx');
+
+echo getEndingNotes(array('Word2007' => 'docx'), 'results/Sample_41_TemplateSetChart.docx');
+if (!CLI) {
+    include_once 'Sample_Footer.php';
+}
diff --git a/samples/resources/Sample_41_TemplateSetChart.docx b/samples/resources/Sample_41_TemplateSetChart.docx
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
@@ -71,6 +71,9 @@ public static function addHtml($element, $html, $fullHTML = false, $preserveWhit
             $html = '<body>' . $html . '</body>';
         }
 
+        //need to remove whitespaces between tags, as loadHTML seems to take those into account
+        $html = preg_replace('/(\>)\s*(\<)/m', '$1$2', $html);
+
         // Load DOM
         if (\PHP_VERSION_ID < 80000) {
             $orignalLibEntityLoader = libxml_disable_entity_loader(true);

diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
@@ -355,6 +355,47 @@ public function setValues(array $values)
         }
     }
 
+
+    /**
+     * @param string $search
+     * @param \PhpOffice\PhpWord\Element\AbstractElement $complexType
+     */
+    public function setChart($search, \PhpOffice\PhpWord\Element\AbstractElement $chart)
+    {
+        $elementName = substr(get_class($chart), strrpos(get_class($chart), '\\') + 1);
+        $objectClass = 'PhpOffice\\PhpWord\\Writer\\Word2007\\Element\\' . $elementName;
+
+        // Get the next relation id
+        $rId= $this->getNextRelationsIndex($this->getMainPartName());
+        $chart->setRelationId($rId);
+
+        // Define the chart filename
+        $filename = "charts/chart{$rId}.xml";
+
+        // Get the part writer
+        $writerPart = new \PhpOffice\PhpWord\Writer\Word2007\Part\Chart();
+        $writerPart->setElement($chart);
+
+        // ContentTypes.xml
+        $this->zipClass->addFromString("word/{$filename}", $writerPart->write());
+
+        // add chart to content type
+        $xmlRelationsType = "<Override PartName=\"/word/{$filename}\" ContentType=\"application/vnd.openxmlformats-officedocument.drawingml.chart+xml\"/>";
+        $this->tempDocumentContentTypes = str_replace('</Types>', $xmlRelationsType, $this->tempDocumentContentTypes) . '</Types>';
+
+        // Add the chart to relations
+        $xmlChartRelation = "<Relationship Id=\"rId{$rId}\" Type=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart\" Target=\"charts/chart{$rId}.xml\"/>";
+        $this->tempDocumentRelations[$this->getMainPartName()] = str_replace('</Relationships>', $xmlChartRelation, $this->tempDocumentRelations[$this->getMainPartName()]) . '</Relationships>';
+
+        // Write the chart
+        $xmlWriter = new XMLWriter();
+        $elementWriter = new $objectClass($xmlWriter, $chart, true);
+        $elementWriter->write();
+
+        // Place it in the template
+        $this->replaceXmlBlock($search, "<w:p>" . $xmlWriter->getData() . "</w:p>", 'w:p');
+    }
+
     private function getImageArgs($varNameWithArgs)
     {
         $varElements = explode(':', $varNameWithArgs);

diff --git a/src/PhpWord/Writer/Word2007/Part/Chart.php b/src/PhpWord/Writer/Word2007/Part/Chart.php
@@ -219,6 +219,7 @@ private function writeSeries(XMLWriter $xmlWriter, $scatter = false)
         $colors = $style->getColors();
 
         $index = 0;
+        $colorIndex = 0;
         foreach ($series as $seriesItem) {
             $categories = $seriesItem['categories'];
             $values = $seriesItem['values'];
@@ -265,23 +266,21 @@ private function writeSeries(XMLWriter $xmlWriter, $scatter = false)
                 $this->writeSeriesItem($xmlWriter, 'cat', $categories);
                 $this->writeSeriesItem($xmlWriter, 'val', $values);
 
-                // setting the chart colors was taken from https://github.com/PHPOffice/PHPWord/issues/494
-                if (is_array($colors) && count($colors)) {
-                    // This is a workaround to make each series in a stack chart use a different color
-                    if ($this->options['type'] == 'bar' && stristr($this->options['grouping'], 'stacked')) {
-                        array_shift($colors);
-                    }
-                    $colorIndex = 0;
-                    foreach ($colors as $color) {
+                // check that there are colors
+                if (is_array($colors) && count($colors)>0) {
+                    // assign a color to each value
+                    $valueIndex=0;
+                    foreach ($values as $value) {
+                        // check that there are still enought colors
                         $xmlWriter->startElement('c:dPt');
-                        $xmlWriter->writeElementBlock('c:idx', 'val', $colorIndex);
+                        $xmlWriter->writeElementBlock('c:idx', 'val', $valueIndex);
                         $xmlWriter->startElement('c:spPr');
                         $xmlWriter->startElement('a:solidFill');
-                        $xmlWriter->writeElementBlock('a:srgbClr', 'val', $color);
+                        $xmlWriter->writeElementBlock('a:srgbClr', 'val', $colors[$colorIndex++ % count($colors)]);
                         $xmlWriter->endElement(); // a:solidFill
                         $xmlWriter->endElement(); // c:spPr
                         $xmlWriter->endElement(); // c:dPt
-                        $colorIndex++;
+                        $valueIndex++;
                     }
                 }
             }
@@ -414,6 +413,7 @@ private function writeShape(XMLWriter $xmlWriter, $line = false)
         }
         $xmlWriter->endElement(); // a:ln
         $xmlWriter->endElement(); // c:spPr
+
     }
 
     private function writeAxisTitle(XMLWriter $xmlWriter, $title)