Merge pull request #1430 from nicoder/patch-4

troosan · web-flow · commit 7b3b7236465c · 2018-12-03T01:01:51.000+01:00
allow to override TemplateProcessor#ensureUtf8Encoded
diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
@@ -217,10 +217,10 @@ public function setValue($search, $replace, $limit = self::MAXIMUM_REPLACEMENTS_
 
         if (is_array($replace)) {
             foreach ($replace as &$item) {
-                $item = self::ensureUtf8Encoded($item);
+                $item = static::ensureUtf8Encoded($item);
             }
         } else {
-            $replace = self::ensureUtf8Encoded($replace);
+            $replace = static::ensureUtf8Encoded($replace);
         }
 
         if (Settings::isOutputEscapingEnabled()) {

Original file line number	Diff line number	Diff line change
`@@ -217,10 +217,10 @@ public function setValue($search, $replace, $limit = self::MAXIMUM_REPLACEMENTS_`
`217`	`217`
`218`	`218`	`if (is_array($replace)) {`
`219`	`219`	`foreach ($replace as &$item) {`
`220`		`- $item = self::ensureUtf8Encoded($item);`
	`220`	`+ $item = static::ensureUtf8Encoded($item);`
`221`	`221`	`}`
`222`	`222`	`} else {`
`223`		`- $replace = self::ensureUtf8Encoded($replace);`
	`223`	`+ $replace = static::ensureUtf8Encoded($replace);`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`if (Settings::isOutputEscapingEnabled()) {`