Fix hardcoded macro chars

glafarge · web-flow · commit eb4dd2ee2a5f · 2024-06-04T18:49:52.000+02:00
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -805,8 +805,8 @@ public function cloneRow($search, $numberOfClones): void`
`805`	`805`	`*/`
`806`	`806`	`public function deleteRow(string $search): void`
`807`	`807`	`{`
`808`		`- if ('${' !== substr($search, 0, 2) && '}' !== substr($search, -1)) {`
`809`		`- $search = '${' . $search . '}';`
	`808`	`+ if (self::$macroOpeningChars !== substr($search, 0, 2) && self::$macroClosingChars !== substr($search, -1)) {`
	`809`	`+ $search = self::$macroOpeningChars . $search . self::$macroClosingChars;`
`810`	`810`	`}`
`811`	`811`
`812`	`812`	`$tagPos = strpos($this->tempDocumentMainPart, $search);`