From f7cb73e8a6260822731b14fbf837f3f2986476e5 Mon Sep 17 00:00:00 2001
From: Dmitry Lukashin <dlukashin@gmail.com>
Date: Thu, 19 Oct 2017 17:33:46 +0300
Subject: [PATCH 1/2] Get rid of duplicated code in TemplateProcessor.php

---
 src/PhpWord/TemplateProcessor.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 2f6d6258..27ffa458 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -268,9 +268,7 @@ class TemplateProcessor
      */
     public function cloneRow($search, $numberOfClones)
     {
-        if ('${' !== substr($search, 0, 2) && '}' !== substr($search, -1)) {
-            $search = '${' . $search . '}';
-        }
+        $search = static::ensureMacroCompleted($search);
 
         $tagPos = strpos($this->tempDocumentMainPart, $search);
         if (!$tagPos) {

From ba9e8958d71074f7d43ee83e20b1508e4a9886f7 Mon Sep 17 00:00:00 2001
From: Dmitry Lukashin <dlukashin@gmail.com>
Date: Thu, 19 Oct 2017 18:51:57 +0300
Subject: [PATCH 2/2] Replace self:: with static:: calls

---
 src/PhpWord/TemplateProcessor.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 27ffa458..13dcc71c 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -212,18 +212,18 @@ class TemplateProcessor
     {
         if (is_array($search)) {
             foreach ($search as &$item) {
-                $item = self::ensureMacroCompleted($item);
+                $item = static::ensureMacroCompleted($item);
             }
         } else {
-            $search = self::ensureMacroCompleted($search);
+            $search = static::ensureMacroCompleted($search);
         }
 
         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()) {