Fix var overwriting in loop.

milo · May 23, 2022 · 91ec679 · 91ec679
1 parent ceed5b0
commit 91ec679
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/EmbeddedSvg/LatteExtension.php b/src/EmbeddedSvg/LatteExtension.php
@@ -42,15 +42,16 @@ public function getTags(): array
 				return new Latte\Compiler\Nodes\AuxiliaryNode(function (Latte\Compiler\PrintContext $context) use ($macroArguments, $svgAttributes, $inner) {
 					return $context->format('
 						echo "<svg";
-						foreach (%0.args + %1.dump as $n => $v) {
-							if ($v === null || $v === false) {
+						foreach (%0.args + %1.dump as $__n => $__v) {
+							if ($__v === null || $__v === false) {
 								continue;
-							} elseif ($v === true) {
-								echo " " . %escape($n);
+							} elseif ($__v === true) {
+								echo " " . %escape($__n);
 							} else {
-								echo " " . %escape($n) . "=\"" . %escape($v) . "\"";
+								echo " " . %escape($__n) . "=\"" . %escape($__v) . "\"";
 							}
 						}
+						unset($__n, $__v);
 						echo ">" . %2.dump . "</svg>";
 					', [$macroArguments], $this->setting->defaultAttributes + $svgAttributes, $inner
 					);

diff --git a/src/EmbeddedSvg/Macro.php b/src/EmbeddedSvg/Macro.php
@@ -49,15 +49,16 @@ public function open(MacroNode $node, PhpWriter $writer)
 
 		return $writer->write('
 			echo "<svg";
-			foreach (%0.raw + %1.var as $n => $v) {
-				if ($v === null || $v === false) {
+			foreach (%0.raw + %1.var as $__n => $__v) {
+				if ($__v === null || $__v === false) {
 					continue;
-				} elseif ($v === true) {
-					echo " " . %escape($n);
+				} elseif ($__v === true) {
+					echo " " . %escape($__n);
 				} else {
-					echo " " . %escape($n) . "=\"" . %escape($v) . "\"";
+					echo " " . %escape($__n) . "=\"" . %escape($__v) . "\"";
 				}
 			}
+			unset($__n, $__v);
 			echo ">" . %2.var . "</svg>";
 			',
 			$macroAttributes, $this->setting->defaultAttributes + $svgAttributes, $inner