wip

Author: brendt

docs/1-essentials/02-views.md

@@ -232,18 +232,6 @@ The example above will only render the child `div` elements:
 <div>Post C</div>
 ```
 
-### Invalid single quotes
-
-While attributes with single quotes are allowed by the HTML spec, they are not by Tempest View. You must always use double quotes for attribute values, for all attributes.
-
-```
-<{:hl-keyword:div:} {:hl-property::isset:}="$title">{{ $title }}</{:hl-keyword:div:}>
-<{:hl-keyword:div:} {:hl-property:class:}="foo bar"></{:hl-keyword:div:}>
-
-<{:hl-keyword:div:} {:hl-property::isset:}={:hl-error:'title':}>{{ $title }}</{:hl-keyword:div:}> 
-<{:hl-keyword:div:} {:hl-property:class:}={:hl-error:'foo bar':}></{:hl-keyword:div:}>
-```
-
 ## View components
 
 Components allow for splitting the user interface into independent and reusable pieces.

packages/view/src/Exceptions/AttributesWithSingleQuotesWereNotAllowed.php

@@ -2,8 +2,6 @@
 
 namespace Tempest\View\Parser;
 
-use Tempest\View\Exceptions\AttributesWithSingleQuotesWereNotAllowed;
-
 final class TempestViewLexer
 {
     private const string WHITESPACE = PHP_EOL . "\n\t\f ";
@@ -133,12 +131,12 @@ private function lexTag(): array
                 );
 
                 if ($hasValue) {
-                    if ($this->seek() === '\'') {
-                        throw new AttributesWithSingleQuotesWereNotAllowed();
-                    }
+                    $quote = $this->seek() === '\''
+                        ? '\''
+                        : '"';
 
-                    $attributeValue = $this->consumeIncluding('"');
-                    $attributeValue .= $this->consumeIncluding('"');
+                    $attributeValue = $this->consumeIncluding($quote);
+                    $attributeValue .= $this->consumeIncluding($quote);
 
                     $tokens[] = new Token(
                         content: $attributeValue,

packages/view/src/Parser/TempestViewLexer.php

@@ -142,6 +142,10 @@ private function attributeName(string $name): string
 
     private function attributeValue(string $value): string
     {
-        return str($value)->afterFirst('"')->beforeLast('"')->toString();
+        $value = str($value);
+
+        $quote = $value->startsWith('"') ? '"' : "'";
+
+        return str($value)->afterFirst($quote)->beforeLast($quote)->toString();
     }
 }

packages/view/src/Parser/Token.php

@@ -4,7 +4,6 @@
 
 use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
-use Tempest\View\Exceptions\AttributesWithSingleQuotesWereNotAllowed;
 use Tempest\View\Parser\TempestViewLexer;
 use Tempest\View\Parser\Token;
 use Tempest\View\Parser\TokenCollection;
@@ -353,9 +352,18 @@ public function test_single_quote_attributes(): void
         <div class='hello'></div>
         HTML;
 
-        $this->expectException(AttributesWithSingleQuotesWereNotAllowed::class);
+        $tokens = new TempestViewLexer($html)->lex();
 
-        new TempestViewLexer($html)->lex();
+        $this->assertTokens(
+            expected: [
+                new Token('<div', TokenType::OPEN_TAG_START),
+                new Token(' class=', TokenType::ATTRIBUTE_NAME),
+                new Token('\'hello\'', TokenType::ATTRIBUTE_VALUE),
+                new Token('>', TokenType::OPEN_TAG_END),
+                new Token('</div>', TokenType::CLOSING_TAG),
+            ],
+            actual: $tokens,
+        );
     }
 
     private function assertTokens(array $expected, TokenCollection $actual): void

packages/view/tests/TempestViewLexerTest.php

@@ -5,7 +5,6 @@
 namespace Tests\Tempest\Integration\View;
 
 use Tempest\Support\Html\HtmlString;
-use Tempest\View\Exceptions\AttributesWithSingleQuotesWereNotAllowed;
 use Tempest\View\Exceptions\ElementWasInvalid;
 use Tempest\View\ViewCache;
 use Tests\Tempest\Fixtures\Controllers\RelativeViewController;
@@ -851,10 +850,10 @@ public function test_parse_rss_feed(): void
 
     public function test_attributes_with_single_quotes(): void
     {
-        $this->expectException(AttributesWithSingleQuotesWereNotAllowed::class);
-
         $html = $this->render(<<<'HTML'
         <div class='hello'></div>
         HTML);
+
+        $this->assertSnippetsMatch('<div class="hello"></div>', $html);
     }
 }