From b99230a3c058b89f22d0247e260bc8e4ec9b1d86 Mon Sep 17 00:00:00 2001
From: Guillaume Lafarge <670645+glafarge@users.noreply.github.com>
Date: Wed, 7 Aug 2024 18:45:59 +0200
Subject: [PATCH] [TYPO] Fix hardcoded macro chars in TemplateProcessor method
 (#2618)

* Fix hardcoded macro chars

* Update changelog

---------

Co-authored-by: glafarge <glafarge@users.noreply.github.com>
---
 docs/changes/2.x/2.0.0.md         | 1 +
 src/PhpWord/TemplateProcessor.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changes/2.x/2.0.0.md b/docs/changes/2.x/2.0.0.md
index c0423d8caf..2d4b3b9cca 100644
--- a/docs/changes/2.x/2.0.0.md
+++ b/docs/changes/2.x/2.0.0.md
@@ -16,6 +16,7 @@
 - TemplateProcessor Destructor Problem with Php7 [@oleibman](https://github.com/oleibman) fixing [#2548](https://github.com/PHPOffice/PHPWord/issues/2548) in [#2554](https://github.com/PHPOffice/PHPWord/pull/2554)
 - bug: TemplateProcessor fix multiline values [@gimler](https://github.com/gimler) fixing [#268](https://github.com/PHPOffice/PHPWord/issues/268), [#2323](https://github.com/PHPOffice/PHPWord/issues/2323) and [#2486](https://github.com/PHPOffice/PHPWord/issues/2486) in [#2522](https://github.com/PHPOffice/PHPWord/pull/2522)
 - 32-bit Problem in PasswordEncoder [@oleibman](https://github.com/oleibman) fixing [#2550](https://github.com/PHPOffice/PHPWord/issues/2550) in [#2551](https://github.com/PHPOffice/PHPWord/pull/2551)
+- Typo : Fix hardcoded macro chars in TemplateProcessor method [@glafarge](https://github.com/glafarge) in [#2618](https://github.com/PHPOffice/PHPWord/pull/2618)
 
 ### Miscellaneous
 
diff --git a/src/PhpWord/TemplateProcessor.php b/src/PhpWord/TemplateProcessor.php
index 8aee40c546..900169bd68 100644
--- a/src/PhpWord/TemplateProcessor.php
+++ b/src/PhpWord/TemplateProcessor.php
@@ -805,8 +805,8 @@ public function cloneRow($search, $numberOfClones): void
      */
     public function deleteRow(string $search): void
     {
-        if ('${' !== substr($search, 0, 2) && '}' !== substr($search, -1)) {
-            $search = '${' . $search . '}';
+        if (self::$macroOpeningChars !== substr($search, 0, 2) && self::$macroClosingChars !== substr($search, -1)) {
+            $search = self::$macroOpeningChars . $search . self::$macroClosingChars;
         }
 
         $tagPos = strpos($this->tempDocumentMainPart, $search);