AttributeNode: Removed support for URL checking, it remains in ExpressionAttributeNode

Author: dg

src/Latte/Compiler/Escaper.php

@@ -152,7 +152,7 @@ public function enterHtmlRaw(string $subType): void
 	}
 
 
-	public function enterHtmlAttribute(?string $name = null): void
+	public function enterHtmlAttribute(?string $name, bool $expression = false): void
 	{
 		$this->state = self::HtmlAttribute;
 		$this->subType = '';
@@ -163,8 +163,8 @@ public function enterHtmlAttribute(?string $name = null): void
 				$this->subType = self::JavaScript;
 			} elseif ($name === 'style') {
 				$this->subType = self::Css;
-			} elseif ((in_array($name, ['href', 'src', 'action', 'formaction'], true)
-				|| ($name === 'data' && strcasecmp($this->tag, 'object') === 0))
+			} elseif ($expression && ((in_array($name, ['href', 'src', 'action', 'formaction'], true)
+				|| ($name === 'data' && strcasecmp($this->tag, 'object') === 0)))
 			) {
 				$this->subType = self::Url;
 			}

src/Latte/Compiler/Nodes/Html/AttributeNode.php

@@ -11,7 +11,6 @@
 
 use Latte\Compiler\NodeHelpers;
 use Latte\Compiler\Nodes\AreaNode;
-use Latte\Compiler\Nodes\FragmentNode;
 use Latte\Compiler\Nodes\TextNode;
 use Latte\Compiler\Position;
 use Latte\Compiler\PrintContext;
@@ -35,23 +34,14 @@ public function print(PrintContext $context): string
 			return $res;
 		}
 
-		$res .= "echo '=';";
-		$quote = $this->quote ?? ($this->value instanceof TextNode ? null : '"');
-		$res .= $quote ? 'echo ' . var_export($quote, true) . ';' : '';
-
 		$escaper = $context->beginEscape();
 		$escaper->enterHtmlAttribute(NodeHelpers::toText($this->name));
-		if ($this->value instanceof FragmentNode && $escaper->export() === 'html/attr/url') {
-			foreach ($this->value->children as $child) {
-				$res .= $child->print($context);
-				$escaper->enterHtmlAttribute(null);
-			}
-		} else {
-			$res .= $this->value->print($context);
-		}
-
+		$res .= $context->format(
+			"echo '='; echo %dump; %node echo %0.dump;",
+			$this->quote ?? ($this->value instanceof TextNode ? null : '"'),
+			$this->value,
+		);
 		$context->restoreEscape();
-		$res .= $quote ? 'echo ' . var_export($quote, true) . ';' : '';
 		return $res;
 	}
 

src/Latte/Compiler/Nodes/Html/ExpressionAttributeNode.php

@@ -31,7 +31,7 @@ public function __construct(
 	public function print(PrintContext $context): string
 	{
 		$escaper = $context->beginEscape();
-		$escaper->enterHtmlAttribute($this->name);
+		$escaper->enterHtmlAttribute($this->name, expression: true);
 		$res = $context->format(
 			'echo %3.dump; echo %modify(%node) %line; echo \'"\';',
 			$this->modifier,