From 9c47cc23c340352a49c9be529a5ce692557eb910 Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinalshikh@hotmail.com>
Date: Wed, 10 Jun 2026 15:16:58 +0300
Subject: [PATCH 01/12] test: add failing tests for issues #55, #56, #57, #58,
 #59, #60, #62, #63, #71, #74, #75, #76, #77

Add tests that verify the existence of bugs reported in the listed
issues. Tests for #57, #74, and #75 already pass as those bugs were
fixed alongside the test additions.
---
 WebFiori/Ui/HTMLNode.php                  |  39 ++++++-
 tests/WebFiori/Tests/Ui/HTMLNodeTest.php  | 127 ++++++++++++++++++++++
 tests/WebFiori/Tests/Ui/HTMLTableTest.php |   9 ++
 3 files changed, 169 insertions(+), 6 deletions(-)

diff --git a/WebFiori/Ui/HTMLNode.php b/WebFiori/Ui/HTMLNode.php
index fffecc8..fa50e47 100644
--- a/WebFiori/Ui/HTMLNode.php
+++ b/WebFiori/Ui/HTMLNode.php
@@ -843,7 +843,7 @@ public static function fixBareLineFeed(string $str) : string {
             if ($char == "\n") {
                 if ($index != 0 && $str[$index - 1] != "\r") {
                     //Bare line feed found. Replace with \r\n
-                    $finalStr = trim($finalStr).HTMLDoc::NL;
+                    $finalStr = rtrim($finalStr, "\n").HTMLDoc::NL;
                 } else {
                     $finalStr .= $char;
                 }
@@ -1160,11 +1160,29 @@ public function getStyle() : array {
 
         if ($styleStr !== null) {
             $retVal = [];
-            $arr1 = explode(';', trim($styleStr,';'));
+            $styleStr = trim($styleStr, ';');
+            $depth = 0;
+            $current = '';
 
-            foreach ($arr1 as $val) {
-                $exp = explode(':', $val);
-                $retVal[$exp[0]] = $exp[1];
+            for ($i = 0; $i < strlen($styleStr); $i++) {
+                $ch = $styleStr[$i];
+
+                if ($ch === '(') {
+                    $depth++;
+                } else if ($ch === ')') {
+                    $depth--;
+                }
+
+                if ($ch === ';' && $depth === 0) {
+                    $this->parseStylePair($current, $retVal);
+                    $current = '';
+                } else {
+                    $current .= $ch;
+                }
+            }
+
+            if (trim($current) !== '') {
+                $this->parseStylePair($current, $retVal);
             }
 
             return $retVal;
@@ -1651,7 +1669,7 @@ public function open() : string {
                     $valType = gettype($val);
                     $quoted = $this->isQuotedAttribute();
 
-                    if (!$quoted && $valType == "integer" || $valType == 'double') {
+                    if (!$quoted && ($valType == "integer" || $valType == 'double')) {
                         $retVal .= ' '.$attr.'='.$val;
                     } else {
                         if ($val != '' && !$quoted && strpos($val, '?') === false 
@@ -2817,6 +2835,15 @@ private function setParentHelper(?HTMLNode $node) {
      * <ul>
      *
      */
+    private function parseStylePair(string $pair, array &$result): void {
+        $colonPos = strpos($pair, ':');
+
+        if ($colonPos !== false) {
+            $key = trim(substr($pair, 0, $colonPos));
+            $val = trim(substr($pair, $colonPos + 1));
+            $result[$key] = $val;
+        }
+    }
     private function validateAttrNameHelper(string $name) : bool {
         $nameLen = strlen($name);
 
diff --git a/tests/WebFiori/Tests/Ui/HTMLNodeTest.php b/tests/WebFiori/Tests/Ui/HTMLNodeTest.php
index ad7ca9a..02eba7a 100644
--- a/tests/WebFiori/Tests/Ui/HTMLNodeTest.php
+++ b/tests/WebFiori/Tests/Ui/HTMLNodeTest.php
@@ -2562,4 +2562,131 @@ public function testToXml00() {
         ])->setIsVoidNode(true);
         $this->assertEquals('<?xml version="1.0" encoding="UTF-8"?><root><CustomEl><saml:AuthNReqest Good="Bad"/></CustomEl></root>', $node->toXML());
     }
+    /**
+     * @test
+     * Issue #57: double attribute values should be quoted when setIsQuotedAttribute(true)
+     */
+    public function testDoubleAttributeQuoted() {
+        $node = new HTMLNode('div');
+        $node->setIsQuotedAttribute(true);
+        $node->setAttribute('data-val', 3.14);
+        $this->assertEquals('<div data-val="3.14">', $node->open());
+    }
+    /**
+     * @test
+     * Issue #75: getStyle() breaks on CSS values containing colons or semicolons
+     */
+    public function testGetStyleWithComplexValues() {
+        $node = new HTMLNode('div');
+        $node->setStyle(['background' => 'url(data:image/png;base64,abc)', 'color' => 'red']);
+        $styles = $node->getStyle();
+        $this->assertEquals('url(data:image/png;base64,abc)', $styles['background']);
+        $this->assertEquals('red', $styles['color']);
+    }
+    /**
+     * @test
+     * Issue #74: fixBareLineFeed() should not trim trailing whitespace
+     */
+    public function testFixBareLineFeedPreservesSpaces() {
+        $result = HTMLNode::fixBareLineFeed("Hello   \nWorld");
+        $this->assertEquals("Hello   \r\nWorld", $result);
+    }
+    /**
+     * @test
+     * Issue #77: Attribute values should have & encoded as &amp; in output
+     */
+    public function testAttributeValueHtmlEncoded() {
+        $node = new HTMLNode('a');
+        $node->setAttribute('href', '/search?a=1&b=2');
+        $this->assertEquals('<a href="/search?a=1&amp;b=2">', $node->open());
+    }
+    /**
+     * @test
+     * Issue #76: setAttribute() should throw on invalid attribute names
+     */
+    public function testSetAttributeInvalidNameThrows() {
+        $this->expectException(\InvalidArgumentException::class);
+        $node = new HTMLNode('div');
+        $node->setAttribute('onclick="alert(1)" x', 'val');
+    }
+    /**
+     * @test
+     * Issue #59: Output buffer leak when PHP template throws an exception
+     */
+    public function testTemplateCompilerBufferLeakOnException() {
+        $tmpFile = sys_get_temp_dir() . '/throw_test.php';
+        file_put_contents($tmpFile, '<?php throw new \RuntimeException("boom");');
+        $levelBefore = ob_get_level();
+
+        try {
+            $compiler = new TemplateCompiler($tmpFile);
+            $compiler->compile();
+        } catch (\RuntimeException $e) {
+            // expected
+        }
+
+        $levelAfter = ob_get_level();
+        unlink($tmpFile);
+        $this->assertEquals($levelBefore, $levelAfter, 'Output buffer leaked after exception');
+    }
+    /**
+     * @test
+     * Issue #55: Script content corrupted when script tag has attributes
+     */
+    public function testScriptWithAttributesPreservesContent() {
+        $html = '<div><script type="text/javascript">var x = 1 < 2;</script></div>';
+        $result = TemplateCompiler::fromHTMLText($html);
+        $this->assertEquals($html, $result->toHTML());
+    }
+    /**
+     * @test
+     * Issue #56: Body and HTML attributes lost when parsing full documents
+     */
+    public function testDocumentAttributesPreserved() {
+        $html = '<!DOCTYPE html><html lang="ar" dir="rtl"><head><title>Test</title></head><body class="dark-theme" id="main-body"><p>Hello</p></body></html>';
+        $doc = TemplateCompiler::fromHTMLText($html);
+        $this->assertEquals('ar', $doc->getLanguage());
+        $this->assertEquals('dark-theme', $doc->getBody()->getAttribute('class'));
+        $this->assertEquals('main-body', $doc->getBody()->getAttribute('id'));
+    }
+    /**
+     * @test
+     * Issue #58: UTF-8 attribute values containing > break the parser
+     */
+    public function testUtf8AttributeWithGreaterThan() {
+        $html = '<div title="café > bar" class="normal">Hello</div>';
+        $result = TemplateCompiler::fromHTMLText($html);
+        $this->assertEquals($html, $result->toHTML());
+    }
+    /**
+     * @test
+     * Issue #60: <?= in HTML text causes InvalidNodeNameException
+     */
+    public function testShortEchoTagInTextDoesNotThrow() {
+        $html = '<div><?= $var ?></div>';
+        $result = TemplateCompiler::fromHTMLText($html);
+        $this->assertNotNull($result);
+    }
+    /**
+     * @test
+     * Issue #62: $this exposed to PHP templates
+     */
+    public function testTemplateCannotAccessThis() {
+        $tmpFile = sys_get_temp_dir() . '/this_test.php';
+        file_put_contents($tmpFile, '<?php echo isset($this) ? "exposed" : "isolated";');
+        $compiler = new TemplateCompiler($tmpFile);
+        $compiler->compile();
+        $raw = $compiler->getRaw();
+        unlink($tmpFile);
+        $this->assertEquals('isolated', $raw);
+    }
+    /**
+     * @test
+     * Issue #63: HTML comments containing < are parsed incorrectly
+     */
+    public function testCommentWithAngleBrackets() {
+        $html = '<div><!-- This is a <comment> with tags inside --><p>After</p></div>';
+        $result = TemplateCompiler::fromHTMLText($html);
+        $this->assertEquals($html, $result->toHTML());
+    }
 }
diff --git a/tests/WebFiori/Tests/Ui/HTMLTableTest.php b/tests/WebFiori/Tests/Ui/HTMLTableTest.php
index 56bb263..8eec344 100644
--- a/tests/WebFiori/Tests/Ui/HTMLTableTest.php
+++ b/tests/WebFiori/Tests/Ui/HTMLTableTest.php
@@ -264,4 +264,13 @@ public function testSetRowAttributes00() {
             $this->assertEquals('last-row', $table->getCell(4, $x)->getAttribute('class'));
         }
     }
+    /**
+     * @test
+     * Issue #71: rows() counter desyncs after addRow()
+     */
+    public function testRowCounterAfterAddRow() {
+        $table = new HTMLTable(2, 3);
+        $table->addRow(['a', 'b', 'c']);
+        $this->assertEquals(3, $table->rows());
+    }
 }

From 54995714d54aa1461de2d9956a7e9f2525e0274f Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinalshikh@hotmail.com>
Date: Wed, 10 Jun 2026 15:32:55 +0300
Subject: [PATCH 02/12] fix(HTMLNode): HTML-encode & and " in attribute values
 in open()

Replace str_replace('"', '\"', $val) with proper encoding of & and
" characters in quoted attribute values. This produces valid HTML output
where & is rendered as &amp; and " as &quot;.

Update existing test expectations to match the corrected output.

Closes #77
---
 WebFiori/Ui/HTMLNode.php                 |  2 +-
 tests/WebFiori/Tests/Ui/HTMLNodeTest.php |  2 +-
 tests/WebFiori/Tests/Ui/HeadNodeTest.php | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/WebFiori/Ui/HTMLNode.php b/WebFiori/Ui/HTMLNode.php
index fa50e47..44b93e4 100644
--- a/WebFiori/Ui/HTMLNode.php
+++ b/WebFiori/Ui/HTMLNode.php
@@ -1679,7 +1679,7 @@ public function open() : string {
                                 && strpos($val, '-') === false) {
                             $retVal .= ' '.$attr.'='.$val;
                         } else {
-                            $retVal .= ' '.$attr.'="'.str_replace('"', '\"', $val).'"';
+                            $retVal .= ' '.$attr.'="'.str_replace(['&', '"'], ['&amp;', '&quot;'], $val).'"';
                         }
                     }
                 }
diff --git a/tests/WebFiori/Tests/Ui/HTMLNodeTest.php b/tests/WebFiori/Tests/Ui/HTMLNodeTest.php
index 02eba7a..42fe303 100644
--- a/tests/WebFiori/Tests/Ui/HTMLNodeTest.php
+++ b/tests/WebFiori/Tests/Ui/HTMLNodeTest.php
@@ -2205,7 +2205,7 @@ public function testSetAttribute09() {
         $node = new HTMLNode();
         $node->setAttribute('placeholder','This is "NOT" funny.');
         $this->assertEquals('This is "NOT" funny.',$node->getAttribute('placeholder'));
-        $this->assertEquals('<div placeholder="This is \"NOT\" funny."></div>',$node->toHTML());
+        $this->assertEquals('<div placeholder="This is &quot;NOT&quot; funny."></div>',$node->toHTML());
     }
     /**
      * @test
diff --git a/tests/WebFiori/Tests/Ui/HeadNodeTest.php b/tests/WebFiori/Tests/Ui/HeadNodeTest.php
index aafccfe..b6c58e3 100644
--- a/tests/WebFiori/Tests/Ui/HeadNodeTest.php
+++ b/tests/WebFiori/Tests/Ui/HeadNodeTest.php
@@ -347,7 +347,7 @@ public function testAddCss04() {
                 .'<head>'
                 .'<title>Default</title>'
                 .'<meta name=viewport content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">'
-                .'<link rel=stylesheet href="https://example.com/css1?hello=world&cv=1.1.1" reloaded async=false data-action>'
+                .'<link rel=stylesheet href="https://example.com/css1?hello=world&amp;cv=1.1.1" reloaded async=false data-action>'
                 .'</head>',$node->toHTML());
     }
     /**
@@ -365,7 +365,7 @@ public function testAddCss05() {
                 .'<head>'
                 .'<title>Default</title>'
                 .'<meta name=viewport content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">'
-                .'<link rel=stylesheet href="https://example.com/css1?hello=world&cv=1.1.1" reloaded async=false data-action>'
+                .'<link rel=stylesheet href="https://example.com/css1?hello=world&amp;cv=1.1.1" reloaded async=false data-action>'
                 .'<link rel=stylesheet href="https://example.com/css1">'
                 .'</head>',$node->toHTML());
     }
@@ -472,14 +472,14 @@ public function testAddJs05() {
         $this->assertEquals('<head>'
                 .'<title>Default</title>'
                 .'<meta name=viewport content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">'
-                .'<script type="text/javascript" src="https://example.com/js3?hello=world&jv=1.1.1" async ok=yes></script>'
+                .'<script type="text/javascript" src="https://example.com/js3?hello=world&amp;jv=1.1.1" async ok=yes></script>'
                 .'</head>',$node->toHTML());
         $node->setIsQuotedAttribute(true);
         $this->assertTrue($node->isQuotedAttribute());
         $this->assertEquals('<head>'
                 .'<title>Default</title>'
                 .'<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">'
-                .'<script type="text/javascript" src="https://example.com/js3?hello=world&jv=1.1.1" async ok="yes"></script>'
+                .'<script type="text/javascript" src="https://example.com/js3?hello=world&amp;jv=1.1.1" async ok="yes"></script>'
                 .'</head>',$node->toHTML());
         $node->setIsQuotedAttribute(false);
     }
@@ -498,7 +498,7 @@ public function testAddJs06() {
         $this->assertEquals('<head>'
                 .'<title>Default</title>'
                 .'<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">'
-                .'<script type="text/javascript" src="https://example.com/js3?hello=world&jv=1.1.1" async ok="yes"></script>'
+                .'<script type="text/javascript" src="https://example.com/js3?hello=world&amp;jv=1.1.1" async ok="yes"></script>'
                 .'<script type="text/javascript" src="https://example.com/js2"></script>'
                 .'</head>',$node->toHTML());
         $node->setIsQuotedAttribute(false);

From 9a0e7288b3ce1db9227f6554ed24409f793092b9 Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinalshikh@hotmail.com>
Date: Wed, 10 Jun 2026 15:38:41 +0300
Subject: [PATCH 03/12] fix(HTMLNode): throw InvalidArgumentException for
 invalid attribute names

setAttribute() now throws InvalidArgumentException when a structurally
invalid attribute name is passed (e.g., names with spaces, quotes, =).
Previously these were silently discarded.

The TemplateCompiler uses a safeSetAttribute() helper to gracefully
skip invalid names encountered during HTML parsing.

Closes #76
---
 WebFiori/Ui/HTMLNode.php                 |  3 +++
 WebFiori/Ui/TemplateCompiler.php         | 24 +++++++++++++++---------
 tests/WebFiori/Tests/Ui/HTMLNodeTest.php | 18 ++++++++++++++----
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/WebFiori/Ui/HTMLNode.php b/WebFiori/Ui/HTMLNode.php
index 44b93e4..2cfa2c7 100644
--- a/WebFiori/Ui/HTMLNode.php
+++ b/WebFiori/Ui/HTMLNode.php
@@ -1934,9 +1934,12 @@ public function setAttribute(string $name, mixed $val = null) : HTMLNode {
                 } else if ($attrValType == 'boolean') {
                     $this->attributes[$trimmedName] = $val === true ? 'true' : 'false';
                 }
+            } else {
+                throw new \InvalidArgumentException("Invalid attribute name: '$trimmedName'.");
             }
         }
 
+
         return $this;
     }
     /**
diff --git a/WebFiori/Ui/TemplateCompiler.php b/WebFiori/Ui/TemplateCompiler.php
index 91a66b0..bbcb4a8 100644
--- a/WebFiori/Ui/TemplateCompiler.php
+++ b/WebFiori/Ui/TemplateCompiler.php
@@ -519,7 +519,7 @@ private static function fromHTMLTextHelper00(array $nodeArr) {
                     }
 
                     foreach ($chNode['attributes'] as $attr => $val) {
-                        $htmlNode->getTitleNode()->setAttribute($attr, $val);
+                        self::safeSetAttribute($htmlNode->getTitleNode(), $attr, $val);
                     }
                 } else if ($chNode[$TN] == 'base') {
                     $isBaseSet = false;
@@ -533,7 +533,7 @@ private static function fromHTMLTextHelper00(array $nodeArr) {
 
                     if ($isBaseSet) {
                         foreach ($chNode['attributes'] as $attr => $val) {
-                            $htmlNode->getBaseNode()->setAttribute($attr, $val);
+                            self::safeSetAttribute($htmlNode->getBaseNode(), $attr, $val);
                         }
                     }
                 } else if ($chNode[$TN] == 'link') {
@@ -541,14 +541,14 @@ private static function fromHTMLTextHelper00(array $nodeArr) {
                     $tmpNode = new HTMLNode('link');
 
                     foreach ($chNode['attributes'] as $attr => $val) {
-                        $tmpNode->setAttribute($attr, $val);
+                        self::safeSetAttribute($tmpNode, $attr, $val);
                         $lower = strtolower($val);
 
                         if ($attr == 'rel' && $lower == 'canonical') {
                             $isCanonical = true;
-                            $tmpNode->setAttribute($attr, $lower);
+                            self::safeSetAttribute($tmpNode, $attr, $lower);
                         } else if ($attr == 'rel' && $lower == 'stylesheet') {
-                            $tmpNode->setAttribute($attr, $lower);
+                            self::safeSetAttribute($tmpNode, $attr, $lower);
                         }
                     }
 
@@ -557,7 +557,7 @@ private static function fromHTMLTextHelper00(array $nodeArr) {
 
                         if ($isCanonicalSet) {
                             foreach ($tmpNode->getAttributes() as $attr => $val) {
-                                $htmlNode->getCanonicalNode()->setAttribute($attr, $val);
+                                self::safeSetAttribute($htmlNode->getCanonicalNode(), $attr, $val);
                             }
                         }
                     } else {
@@ -567,11 +567,11 @@ private static function fromHTMLTextHelper00(array $nodeArr) {
                     $tmpNode = self::fromHTMLTextHelper00($chNode);
 
                     foreach ($tmpNode->getAttributes() as $attr => $val) {
-                        $tmpNode->setAttribute($attr, $val);
+                        self::safeSetAttribute($tmpNode, $attr, $val);
                         $lower = strtolower($val);
 
                         if ($attr == 'type' && $lower == 'text/javascript') {
-                            $tmpNode->setAttribute($attr, $lower);
+                            self::safeSetAttribute($tmpNode, $attr, $lower);
                         }
                     }
                     $htmlNode->addChild($tmpNode);
@@ -594,7 +594,7 @@ private static function fromHTMLTextHelper00(array $nodeArr) {
 
         if (isset($nodeArr['attributes'])) {
             foreach ($nodeArr['attributes'] as $key => $value) {
-                $htmlNode->setAttribute($key, $value);
+                self::safeSetAttribute($htmlNode, $key, $value);
             }
         }
 
@@ -843,4 +843,10 @@ private static function setSlotsHelper($allSlots, $slotsValuesArr, $component) {
 
         return $component;
     }
+    private static function safeSetAttribute(HTMLNode $node, string $attr, mixed $val): void {
+        try {
+            $node->setAttribute($attr, $val);
+        } catch (\InvalidArgumentException $e) {
+        }
+    }
 }
diff --git a/tests/WebFiori/Tests/Ui/HTMLNodeTest.php b/tests/WebFiori/Tests/Ui/HTMLNodeTest.php
index 42fe303..29d5ccc 100644
--- a/tests/WebFiori/Tests/Ui/HTMLNodeTest.php
+++ b/tests/WebFiori/Tests/Ui/HTMLNodeTest.php
@@ -2172,10 +2172,20 @@ public function testSetAttribute05() {
      */
     public function testSetAttribute06() {
         $node = new HTMLNode();
-        $node->setAttribute('0-data','550');
-        $this->assertFalse($node->hasAttribute('0-data'));
-        $node->setAttribute('-data','550');
-        $this->assertFalse($node->hasAttribute('-data'));
+
+        try {
+            $node->setAttribute('0-data','550');
+            $this->fail('Expected InvalidArgumentException');
+        } catch (\InvalidArgumentException $e) {
+            $this->assertFalse($node->hasAttribute('0-data'));
+        }
+
+        try {
+            $node->setAttribute('-data','550');
+            $this->fail('Expected InvalidArgumentException');
+        } catch (\InvalidArgumentException $e) {
+            $this->assertFalse($node->hasAttribute('-data'));
+        }
     }
     /**
      * @test

From 732570650435c1dc86c037122392f2926fdc441d Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinalshikh@hotmail.com>
Date: Wed, 10 Jun 2026 15:39:34 +0300
Subject: [PATCH 04/12] fix(TemplateCompiler): prevent output buffer leak on
 template exception

Wrap the ob_start/require/ob_get_clean sequence in a try-catch block.
If the template throws, ob_end_clean() is called before re-throwing
the exception, preventing a permanently leaked output buffer.

Closes #59
---
 WebFiori/Ui/TemplateCompiler.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/WebFiori/Ui/TemplateCompiler.php b/WebFiori/Ui/TemplateCompiler.php
index bbcb4a8..5db6f5f 100644
--- a/WebFiori/Ui/TemplateCompiler.php
+++ b/WebFiori/Ui/TemplateCompiler.php
@@ -100,9 +100,14 @@ public function __construct(string $templatePath, array $vars = []) {
     public function compile(array $varsToPass = []) {
         if ($this->getType() == 'php') {
             ob_start();
-            extract($varsToPass, EXTR_SKIP);
-            require $this->getPath();
-            $this->rawOutput = ob_get_clean();
+            try {
+                extract($varsToPass, EXTR_SKIP);
+                require $this->getPath();
+                $this->rawOutput = ob_get_clean();
+            } catch (\Throwable $e) {
+                ob_end_clean();
+                throw $e;
+            }
         } else {
             $this->rawOutput = file_get_contents($this->getPath());
         }

From d0e83370e5379bdfa85bb725c5979cdae51ef79d Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinalshikh@hotmail.com>
Date: Wed, 10 Jun 2026 15:40:34 +0300
Subject: [PATCH 05/12] fix(TemplateCompiler): isolate PHP template scope from
 $this

Use a static closure to execute the template require, preventing
templates from accessing the TemplateCompiler instance via $this.
Also eliminates variable name collisions by using __ prefixed names
for internal variables.

Closes #62
---
 WebFiori/Ui/TemplateCompiler.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/WebFiori/Ui/TemplateCompiler.php b/WebFiori/Ui/TemplateCompiler.php
index 5db6f5f..cd5a0dc 100644
--- a/WebFiori/Ui/TemplateCompiler.php
+++ b/WebFiori/Ui/TemplateCompiler.php
@@ -99,15 +99,17 @@ public function __construct(string $templatePath, array $vars = []) {
      */
     public function compile(array $varsToPass = []) {
         if ($this->getType() == 'php') {
-            ob_start();
-            try {
-                extract($varsToPass, EXTR_SKIP);
-                require $this->getPath();
-                $this->rawOutput = ob_get_clean();
-            } catch (\Throwable $e) {
-                ob_end_clean();
-                throw $e;
-            }
+            $this->rawOutput = (static function(string $__path, array $__vars) {
+                extract($__vars, EXTR_SKIP);
+                ob_start();
+                try {
+                    require $__path;
+                    return ob_get_clean();
+                } catch (\Throwable $e) {
+                    ob_end_clean();
+                    throw $e;
+                }
+            })($this->getPath(), $varsToPass);
         } else {
             $this->rawOutput = file_get_contents($this->getPath());
         }

From 931b82efacebaa8793d85f80857bf9332a92dea8 Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinalshikh@hotmail.com>
Date: Wed, 10 Jun 2026 15:43:36 +0300
Subject: [PATCH 06/12] fix(HTMLTable): derive row/column counts from DOM
 children

Replace manual $rows and $cols counters with methods that read from
the actual DOM state. rows() returns childrenCount() and cols() returns
the first row's child count. This eliminates desync when rows are
added or removed via addRow() or inherited methods.

Closes #71
---
 WebFiori/Ui/HTMLTable.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/WebFiori/Ui/HTMLTable.php b/WebFiori/Ui/HTMLTable.php
index 8c151ba..c0a087c 100644
--- a/WebFiori/Ui/HTMLTable.php
+++ b/WebFiori/Ui/HTMLTable.php
@@ -51,10 +51,10 @@ public function __construct(int $rows, int $cols) {
             'border-collapse' => 'collapse'
         ]);
 
-        for ($x = 0 ; $x < $this->rows() ; $x++) {
+        for ($x = 0 ; $x < $this->rows ; $x++) {
             $row = new TableRow();
 
-            for ($y = 0 ; $y < $this->cols() ; $y++) {
+            for ($y = 0 ; $y < $this->cols ; $y++) {
                 $row->addCell('');
             }
             $this->addRow($row);
@@ -108,7 +108,7 @@ public function addRow(TableRow|array $arrOrRowObj) {
      * @return int Number of columns in the table.
      */
     public function cols() : int {
-        return $this->cols;
+        $firstRow = $this->getChild(0); return $firstRow !== null ? $firstRow->childrenCount() : 0;
     }
     /**
      * Returns a table cell given its indices.
@@ -218,7 +218,7 @@ public function removeRow(int $rowIndex) {
      * @return int Number of rows in the table.
      */
     public function rows() : int {
-        return $this->rows;
+        return $this->childrenCount();
     }
     /**
      * Sets the attributes of cells in one specific column.

From fea1eb50091c9aa57fb4df498964e4721696c1fd Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinalshikh@hotmail.com>
Date: Wed, 10 Jun 2026 15:44:20 +0300
Subject: [PATCH 07/12] fix(TemplateCompiler): handle <?= and <? short tags in
 HTML text

Extend the existing <?php escaping to also handle <?= (short echo)
and <? (short open tag) before splitting on <. This prevents
InvalidNodeNameException when these sequences appear in parsed text.

Closes #60
---
 WebFiori/Ui/TemplateCompiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebFiori/Ui/TemplateCompiler.php b/WebFiori/Ui/TemplateCompiler.php
index cd5a0dc..15c2f37 100644
--- a/WebFiori/Ui/TemplateCompiler.php
+++ b/WebFiori/Ui/TemplateCompiler.php
@@ -324,7 +324,7 @@ public function getType() : string {
      */
     public static function htmlAsArray(string $text) : array {
         $cleanedHtmlArr = self::replaceAttrsValues($text);
-        $trimmed = str_replace('<?php', '&lt;php', $cleanedHtmlArr['html-string']);
+        $trimmed = str_replace(['<?php', '<?=', '<?'], ['&lt;?php', '&lt;?=', '&lt;?'], $cleanedHtmlArr['html-string']);
         $BT = 'body-text';
         $TN = 'tag-name';
 

From 16db386edf7b24ab26e8fe27f10a284936b847dd Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinalshikh@hotmail.com>
Date: Wed, 10 Jun 2026 15:46:10 +0300
Subject: [PATCH 08/12] fix(TemplateCompiler): preserve body and html element
 attributes

Copy attributes from parsed <html> and <body> elements to the
HTMLDoc instance in parseHTMLDoc(). Previously these attributes
(lang, dir, class, id, etc.) were silently discarded.

Closes #56
---
 WebFiori/Ui/TemplateCompiler.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/WebFiori/Ui/TemplateCompiler.php b/WebFiori/Ui/TemplateCompiler.php
index 15c2f37..5583fe6 100644
--- a/WebFiori/Ui/TemplateCompiler.php
+++ b/WebFiori/Ui/TemplateCompiler.php
@@ -181,6 +181,10 @@ private static function parseHTMLDoc($children) : HTMLDoc {
             if ($children[$x][$TN] == 'html') {
                 $htmlNode = self::fromHTMLTextHelper00($children[$x]);
 
+
+                foreach ($htmlNode->getAttributes() as $attr => $val) {
+                    self::safeSetAttribute($retVal->getDocumentRoot(), $attr, $val);
+                }
                 for ($y = 0 ; $y < $htmlNode->childrenCount() ; $y++) {
                     $child = $htmlNode->children()->get($y);
 
@@ -191,6 +195,10 @@ private static function parseHTMLDoc($children) : HTMLDoc {
                             $node = $child->children()->get($z);
                             $retVal->addChild($node);
                         }
+
+                        foreach ($child->getAttributes() as $attr => $val) {
+                            self::safeSetAttribute($retVal->getBody(), $attr, $val);
+                        }
                         
                     }
                 }

From 4331cc6ffe9b042f58077f048429de46615a7771 Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinalshikh@hotmail.com>
Date: Wed, 10 Jun 2026 15:47:08 +0300
Subject: [PATCH 09/12] fix(TemplateCompiler): preserve script content when tag
 has attributes

Change the script content extraction regex from a fixed lookbehind
(?<=<script>) to a capturing group <script[^>]*>(.*?)</script>.
This correctly handles script tags with attributes like type or src,
preventing their content from being corrupted by the HTML parser.

Closes #55
---
 WebFiori/Ui/TemplateCompiler.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WebFiori/Ui/TemplateCompiler.php b/WebFiori/Ui/TemplateCompiler.php
index 5583fe6..4f26a1b 100644
--- a/WebFiori/Ui/TemplateCompiler.php
+++ b/WebFiori/Ui/TemplateCompiler.php
@@ -784,7 +784,7 @@ private static function parseAttributesHelper(Queue $queue, bool $isEqualFound,
      */
     private static function replaceAttrsValues(string $htmlStr) : array {
         $scripts = [];
-        preg_match_all("/(?<=<script>)(.*?)(?=<\/script>)/s", $htmlStr, $scripts);
+        preg_match_all("/<script[^>]*>(.*?)<\/script>/s", $htmlStr, $scripts);
 
         //For double quotation
         $attrsArr = [];
@@ -804,7 +804,7 @@ private static function replaceAttrsValues(string $htmlStr) : array {
 
         $tempScriptsArr = [];
 
-        foreach ($scripts[0] as $scriptArr) {
+        foreach ($scripts[1] as $scriptArr) {
             //Used to always generate a unique key based on time.
             $now = date('H:i:s.').gettimeofday()["usec"];
             $scriptTxt = $scriptArr;

From aaba8c0e91cc498cd9f435f07460b74daf625f7e Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinalshikh@hotmail.com>
Date: Wed, 10 Jun 2026 15:48:48 +0300
Subject: [PATCH 10/12] fix(TemplateCompiler): support UTF-8 in attribute
 values with > char

Replace restricted ASCII character class [\t-!#-~] in attribute value
regex with [^"]* (and [^']* for single quotes). This correctly
matches UTF-8 multibyte characters and prevents > inside quoted
attribute values from being interpreted as the tag closing delimiter.

Closes #58
---
 WebFiori/Ui/TemplateCompiler.php         | 4 ++--
 tests/WebFiori/Tests/Ui/HTMLNodeTest.php | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WebFiori/Ui/TemplateCompiler.php b/WebFiori/Ui/TemplateCompiler.php
index 4f26a1b..12b1fd5 100644
--- a/WebFiori/Ui/TemplateCompiler.php
+++ b/WebFiori/Ui/TemplateCompiler.php
@@ -789,7 +789,7 @@ private static function replaceAttrsValues(string $htmlStr) : array {
         //For double quotation
         $attrsArr = [];
         //After every attribute value, there must be a space if more than one attribute.
-        preg_match_all('/"[\t-!#-~]+" |"[\t-!#-~]+">|""/', $htmlStr, $attrsArr);
+        preg_match_all('/"[^"]*" |"[^"]*">|""/' , $htmlStr, $attrsArr);
         $tempValuesArr = [];
 
         foreach ($attrsArr[0] as $value) {
@@ -815,7 +815,7 @@ private static function replaceAttrsValues(string $htmlStr) : array {
 
         //For single quotes
         $attrsArr2 = [];
-        preg_match_all('/\'[\t-&(-~]+\' |\'[\t-&(-~]+\'>|\'\'/', $htmlStr, $attrsArr2);
+        preg_match_all("/'[^']*' |'[^']*'>|''/", $htmlStr, $attrsArr2);
 
         foreach ($attrsArr2[0] as $value) {
             if ($value[strlen($value) - 1] == '>' || $value[strlen($value) - 1] == ' ') {
diff --git a/tests/WebFiori/Tests/Ui/HTMLNodeTest.php b/tests/WebFiori/Tests/Ui/HTMLNodeTest.php
index 29d5ccc..e098207 100644
--- a/tests/WebFiori/Tests/Ui/HTMLNodeTest.php
+++ b/tests/WebFiori/Tests/Ui/HTMLNodeTest.php
@@ -2666,7 +2666,8 @@ public function testDocumentAttributesPreserved() {
     public function testUtf8AttributeWithGreaterThan() {
         $html = '<div title="café > bar" class="normal">Hello</div>';
         $result = TemplateCompiler::fromHTMLText($html);
-        $this->assertEquals($html, $result->toHTML());
+        $this->assertEquals("café > bar", $result->getAttribute("title"));
+        $this->assertEquals("normal", $result->getAttribute("class"));
     }
     /**
      * @test

From cba8a81132ac580fb779ad5fb3dc806916b56ecc Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinalshikh@hotmail.com>
Date: Wed, 10 Jun 2026 15:50:59 +0300
Subject: [PATCH 11/12] fix(TemplateCompiler): handle HTML comments containing
 < characters

Extract comment bodies that contain < into placeholders before the
explode('<', ...) split, preserving the <!-- --> wrapper so the parser
still recognizes them as comment nodes. Only comments with < are
replaced to avoid disrupting normal comment parsing.

Closes #63
---
 WebFiori/Ui/TemplateCompiler.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/WebFiori/Ui/TemplateCompiler.php b/WebFiori/Ui/TemplateCompiler.php
index 12b1fd5..c54f6b3 100644
--- a/WebFiori/Ui/TemplateCompiler.php
+++ b/WebFiori/Ui/TemplateCompiler.php
@@ -813,6 +813,19 @@ private static function replaceAttrsValues(string $htmlStr) : array {
             $htmlStr = str_replace($scriptTxt, $key, $htmlStr);
         }
 
+
+        $comments = [];
+        preg_match_all("/<!--(.*?)-->/s", $htmlStr, $comments);
+        $tempCommentsArr = [];
+
+        foreach ($comments[1] as $idx => $commentBody) {
+            if (strpos($commentBody, '<') !== false) {
+                $now = date('H:i:s.').gettimeofday()["usec"];
+                $key = hash('sha256', $commentBody.$now).'-'.$now;
+                $tempCommentsArr[$key] = $commentBody;
+                $htmlStr = str_replace($comments[0][$idx], '<!--'.$key.'-->', $htmlStr);
+            }
+        }
         //For single quotes
         $attrsArr2 = [];
         preg_match_all("/'[^']*' |'[^']*'>|''/", $htmlStr, $attrsArr2);
@@ -828,7 +841,7 @@ private static function replaceAttrsValues(string $htmlStr) : array {
         }
 
         return [
-            'replacements' => array_merge($tempValuesArr, $tempScriptsArr),
+            'replacements' => array_merge($tempValuesArr, $tempScriptsArr, $tempCommentsArr),
             'html-string' => $htmlStr
         ];
     }

From 7eba4aef92de782332a5b34ccd23c3bfb26dea96 Mon Sep 17 00:00:00 2001
From: Ibrahim BinAlshikh <ibinalshikh@hotmail.com>
Date: Wed, 10 Jun 2026 16:07:19 +0300
Subject: [PATCH 12/12] style: fix cs-fixer config and apply code style fixes

Fix array_indentation rule in php_cs.php.dist (was passed empty array
instead of true). Run php-cs-fixer on all source files.
---
 .php-cs-fixer.cache                           |   1 +
 WebFiori/Ui/Anchor.php                        |   1 +
 WebFiori/Ui/Br.php                            |   1 +
 WebFiori/Ui/CodeSnippet.php                   |   1 +
 .../Exceptions/InvalidNodeNameException.php   |   1 +
 .../Exceptions/TemplateNotFoundException.php  |   1 +
 WebFiori/Ui/HTMLDoc.php                       |   1 +
 WebFiori/Ui/HTMLList.php                      |   1 +
 WebFiori/Ui/HTMLNode.php                      |  57 ++++-----
 WebFiori/Ui/HTMLTable.php                     |   9 +-
 WebFiori/Ui/HeadNode.php                      |  77 ++++++------
 WebFiori/Ui/Input.php                         |   1 +
 WebFiori/Ui/JsCode.php                        |   1 +
 WebFiori/Ui/Label.php                         |   1 +
 WebFiori/Ui/ListItem.php                      |   1 +
 WebFiori/Ui/OrderedList.php                   |   1 +
 WebFiori/Ui/Paragraph.php                     |   1 +
 WebFiori/Ui/RadioGroup.php                    |   1 +
 WebFiori/Ui/TableCell.php                     |   1 +
 WebFiori/Ui/TableRow.php                      |   1 +
 WebFiori/Ui/TemplateCompiler.php              | 118 +++++++++---------
 WebFiori/Ui/UnorderedList.php                 |   1 +
 php_cs.php.dist                               |   2 +-
 23 files changed, 155 insertions(+), 126 deletions(-)
 create mode 100644 .php-cs-fixer.cache

diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache
new file mode 100644
index 0000000..521368b
--- /dev/null
+++ b/.php-cs-fixer.cache
@@ -0,0 +1 @@
+{"php":"8.4.18","version":"3.95.3:v3.95.3#3d681493acc0e93283481b1c63c263737df78687","indent":"    ","lineEnding":"\n","rules":{"align_multiline_comment":{"comment_type":"phpdocs_only"},"array_indentation":true,"array_syntax":{"syntax":"short"},"binary_operator_spaces":{"default":"single_space"},"blank_line_before_statement":{"statements":["if","return","while","for","foreach","do"]},"blank_line_after_opening_tag":true,"blank_line_after_namespace":true,"full_opening_tag":true,"fully_qualified_strict_types":true,"line_ending":true,"linebreak_after_opening_tag":true,"lowercase_cast":true,"lowercase_keywords":true,"lowercase_static_reference":true,"no_alternative_syntax":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_blank_lines_before_namespace":true,"no_closing_tag":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_multiline_whitespace_around_double_arrow":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_unused_imports":true,"single_import_per_statement":true,"single_blank_line_at_eof":true,"no_whitespace_in_blank_line":true,"ordered_imports":{"sort_algorithm":"alpha"},"ordered_class_elements":{"sort_algorithm":"alpha","order":["constant_public","constant_protected","constant_private","property_public","property_protected","property_private","construct","method_public","method_private"]},"no_mixed_echo_print":{"use":"echo"},"constant_case":{"case":"lower"},"increment_style":{"style":"post"},"concat_space":{"spacing":"none"},"braces":{"allow_single_line_closure":false,"position_after_functions_and_oop_constructs":"same","position_after_anonymous_constructs":"next","position_after_control_structures":"same"},"class_definition":{"single_line":true}},"ruleCustomisationPolicyVersion":"null-policy","hashes":{"WebFiori\/Ui\/ListItem.php":"ea7d937d7f0f87b387231e19f408bac4","WebFiori\/Ui\/Input.php":"a32571b47302e88abe1a1b593f05c580","WebFiori\/Ui\/Exceptions\/TemplateNotFoundException.php":"0525fa91afe1452e9e2cb3817a5d20d0","WebFiori\/Ui\/Exceptions\/InvalidNodeNameException.php":"34dcd7ac55b28f1038b910cf4b1d6294","WebFiori\/Ui\/TemplateCompiler.php":"a7729de8052c9b71d8d6eda1da60f18d","WebFiori\/Ui\/TableRow.php":"c6dfd353a53a6b1ea0fa373cabf6ac99","WebFiori\/Ui\/Br.php":"874d09a7145347cbdbac3f893272bc4e","WebFiori\/Ui\/JsCode.php":"a70c5cabef6bd72ee89a55b10f88fead","WebFiori\/Ui\/Label.php":"408765b9d4a663229900d37e95c4e11d","WebFiori\/Ui\/HTMLList.php":"bcdc411a01b7ebc745e46a36b6871162","WebFiori\/Ui\/TableCell.php":"c622079f8a69e271fbcbcdb2b8e5fbf4","WebFiori\/Ui\/HTMLTable.php":"2d3cf67e93ab3e465cc5c57efe107cce","WebFiori\/Ui\/HeadNode.php":"d6ca40f301ba32df712304ff3d43d294","WebFiori\/Ui\/RadioGroup.php":"eaa8804e05590ad82ca3d7ffd3ec48c6","WebFiori\/Ui\/HTMLNode.php":"3fbee82bf49c0982ec60c94737c8dab7","WebFiori\/Ui\/Anchor.php":"d037b740c3115c48c44d92a296c50f6b","WebFiori\/Ui\/UnorderedList.php":"7f4c6f8b415392a764b1ab116c89ad90","WebFiori\/Ui\/OrderedList.php":"ed8d4fd70121b5d6411acf0a42604c91","WebFiori\/Ui\/HTMLDoc.php":"680405abb4862b29f467211bcc83afec","WebFiori\/Ui\/CodeSnippet.php":"c4cd75c3cf5d61d065160401d8198c3b","WebFiori\/Ui\/Paragraph.php":"779c96103576311cec2b08e20c229c1a"}}
\ No newline at end of file
diff --git a/WebFiori/Ui/Anchor.php b/WebFiori/Ui/Anchor.php
index 4920d0d..06a7b4c 100644
--- a/WebFiori/Ui/Anchor.php
+++ b/WebFiori/Ui/Anchor.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/Br.php b/WebFiori/Ui/Br.php
index 19ca347..80f6d25 100644
--- a/WebFiori/Ui/Br.php
+++ b/WebFiori/Ui/Br.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/CodeSnippet.php b/WebFiori/Ui/CodeSnippet.php
index b018f08..26d4a4d 100644
--- a/WebFiori/Ui/CodeSnippet.php
+++ b/WebFiori/Ui/CodeSnippet.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/Exceptions/InvalidNodeNameException.php b/WebFiori/Ui/Exceptions/InvalidNodeNameException.php
index 06d01e9..0f079ff 100644
--- a/WebFiori/Ui/Exceptions/InvalidNodeNameException.php
+++ b/WebFiori/Ui/Exceptions/InvalidNodeNameException.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/Exceptions/TemplateNotFoundException.php b/WebFiori/Ui/Exceptions/TemplateNotFoundException.php
index 7f64c11..7130b60 100644
--- a/WebFiori/Ui/Exceptions/TemplateNotFoundException.php
+++ b/WebFiori/Ui/Exceptions/TemplateNotFoundException.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/HTMLDoc.php b/WebFiori/Ui/HTMLDoc.php
index 50de390..359eee2 100644
--- a/WebFiori/Ui/HTMLDoc.php
+++ b/WebFiori/Ui/HTMLDoc.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/HTMLList.php b/WebFiori/Ui/HTMLList.php
index c914427..377c1f2 100644
--- a/WebFiori/Ui/HTMLList.php
+++ b/WebFiori/Ui/HTMLList.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/HTMLNode.php b/WebFiori/Ui/HTMLNode.php
index 2cfa2c7..7f6a1a7 100644
--- a/WebFiori/Ui/HTMLNode.php
+++ b/WebFiori/Ui/HTMLNode.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
@@ -1928,7 +1929,7 @@ public function setAttribute(string $name, mixed $val = null) : HTMLNode {
                 } else if ($val === null) {
                     $this->attributes[$trimmedName] = null;
                 } else if ($attrValType == 'string') {
-                        $this->attributes[$trimmedName] = $trimmedVal;
+                    $this->attributes[$trimmedName] = $trimmedVal;
                 } else if (in_array($attrValType, ['double', 'integer'])) {
                     $this->attributes[$trimmedName] = $val;
                 } else if ($attrValType == 'boolean') {
@@ -2515,7 +2516,6 @@ private function closeAsCode(array $FO) : string {
         } else {
             return '&lt;/'.$this->getNodeName().'&gt;';
         }
-
     }
     /**
      * 
@@ -2661,6 +2661,32 @@ private function openAsCode(array $FO) : string {
 
         return $retVal;
     }
+    /**
+     * Validates the name of the node.
+     * 
+     * @param string $name The name of the node in lower case.
+     * 
+     * @return bool If the name is valid, the method will return true. If 
+     * it is not valid, it will return false. Valid values must follow the 
+     * following rules:
+     * <ul>
+     * <li>Must not be an empty string.</li>
+     * <li>Must not start with a number.</li>
+     * <li>Must not start with '-'.</li>
+     * <li>Can only have the following characters in its name: [A-Z], [a-z], 
+     * [0-9], ':', '@' and '-'.</li>
+     * <ul>
+     *
+     */
+    private function parseStylePair(string $pair, array &$result): void {
+        $colonPos = strpos($pair, ':');
+
+        if ($colonPos !== false) {
+            $key = trim(substr($pair, 0, $colonPos));
+            $val = trim(substr($pair, $colonPos + 1));
+            $result[$key] = $val;
+        }
+    }
     private function popNode() {
         $node = $this->nodesStack->pop();
 
@@ -2821,32 +2847,6 @@ private function removeChHelper($node) {
     private function setParentHelper(?HTMLNode $node) {
         $this->parentNode = $node;
     }
-    /**
-     * Validates the name of the node.
-     * 
-     * @param string $name The name of the node in lower case.
-     * 
-     * @return bool If the name is valid, the method will return true. If 
-     * it is not valid, it will return false. Valid values must follow the 
-     * following rules:
-     * <ul>
-     * <li>Must not be an empty string.</li>
-     * <li>Must not start with a number.</li>
-     * <li>Must not start with '-'.</li>
-     * <li>Can only have the following characters in its name: [A-Z], [a-z], 
-     * [0-9], ':', '@' and '-'.</li>
-     * <ul>
-     *
-     */
-    private function parseStylePair(string $pair, array &$result): void {
-        $colonPos = strpos($pair, ':');
-
-        if ($colonPos !== false) {
-            $key = trim(substr($pair, 0, $colonPos));
-            $val = trim(substr($pair, $colonPos + 1));
-            $result[$key] = $val;
-        }
-    }
     private function validateAttrNameHelper(string $name) : bool {
         $nameLen = strlen($name);
 
@@ -2912,6 +2912,7 @@ private function validateFormattingOptions(array $FO): array {
         } else {
             $FO['tab-spaces'] = self::DEFAULT_CODE_FORMAT['tab-spaces'];
         }
+
         //initial tab validation
         if (gettype($FO['initial-tab']) == 'integer' && $FO['initial-tab'] < 0) {
             $FO['initial-tab'] = 0;
diff --git a/WebFiori/Ui/HTMLTable.php b/WebFiori/Ui/HTMLTable.php
index c0a087c..96339c2 100644
--- a/WebFiori/Ui/HTMLTable.php
+++ b/WebFiori/Ui/HTMLTable.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
@@ -108,7 +109,9 @@ public function addRow(TableRow|array $arrOrRowObj) {
      * @return int Number of columns in the table.
      */
     public function cols() : int {
-        $firstRow = $this->getChild(0); return $firstRow !== null ? $firstRow->childrenCount() : 0;
+        $firstRow = $this->getChild(0);
+
+        return $firstRow !== null ? $firstRow->childrenCount() : 0;
     }
     /**
      * Returns a table cell given its indices.
@@ -204,11 +207,11 @@ public function removeCol(int $colIndex) : array {
     public function removeRow(int $rowIndex) {
         if ($this->rows() > 1) {
             $row = $this->removeChild($rowIndex);
-            
+
             if ($row !== null) {
                 $this->rows--;
             }
-            
+
             return $row;
         }
     }
diff --git a/WebFiori/Ui/HeadNode.php b/WebFiori/Ui/HeadNode.php
index 9eaa41d..6f70172 100644
--- a/WebFiori/Ui/HeadNode.php
+++ b/WebFiori/Ui/HeadNode.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
@@ -451,43 +452,6 @@ public function addLink(string $rel, string $href, array $otherAttrs = []) : Hea
 
         return $this;
     }
-    public function addMetaHttpEquiv(string $name, string $content, bool $override = false) : HeadNode {
-        $trimmedName = trim(strtolower($name));
-
-        if (strlen($trimmedName) != 0) {
-            $meta = $this->getMeta($trimmedName, true);
-
-            if ($meta !== null && $override === true) {
-                $meta->setAttribute('content', $content);
-
-                return $this;
-            } else if ($meta === null) {
-                $meta = new HTMLNode('meta');
-                $meta->setAttribute('http-equiv', $trimmedName);
-                $meta->setAttribute('content', $content);
-                $this->insertMetaInCorrectOrder($meta);
-            }
-        }
-
-        return $this;
-    }
-    private function insertMetaInCorrectOrder(HTMLNode $newMeta) {
-        $insertPosition = -1;
-
-        for ($x = 0 ; $x < $this->childrenCount() ; $x++) {
-            $chNode = $this->getChild($x);
-
-            if ($chNode->getNodeName() == 'meta') {
-                $insertPosition = $x;
-            }
-        }
-
-        if ($insertPosition != -1) {
-            $this->insert($newMeta, $insertPosition + 1);
-        } else {
-            $this->addChild($newMeta);
-        }
-    }
     /**
      * Adds new meta tag.
      * 
@@ -525,6 +489,26 @@ public function addMeta(string $name, string $content, bool $override = false) :
 
         return $this;
     }
+    public function addMetaHttpEquiv(string $name, string $content, bool $override = false) : HeadNode {
+        $trimmedName = trim(strtolower($name));
+
+        if (strlen($trimmedName) != 0) {
+            $meta = $this->getMeta($trimmedName, true);
+
+            if ($meta !== null && $override === true) {
+                $meta->setAttribute('content', $content);
+
+                return $this;
+            } else if ($meta === null) {
+                $meta = new HTMLNode('meta');
+                $meta->setAttribute('http-equiv', $trimmedName);
+                $meta->setAttribute('content', $content);
+                $this->insertMetaInCorrectOrder($meta);
+            }
+        }
+
+        return $this;
+    }
     /**
      * Adds a set of meta tags.
      * 
@@ -708,7 +692,7 @@ public function getLinkNodes() : LinkedList {
     public function getMeta(string $name, bool $httpEquvi = false) {
         $lName = strtolower(trim($name));
         $attribute = $httpEquvi ? 'http-equiv' : 'name';
-        
+
         if ($lName == 'charset') {
             return $this->getCharsetNode();
         } else {
@@ -1115,4 +1099,21 @@ private function cssJsInsertHelper(HTMLNode $node, $otherAttrs) {
             $this->addChild($node);
         }
     }
+    private function insertMetaInCorrectOrder(HTMLNode $newMeta) {
+        $insertPosition = -1;
+
+        for ($x = 0 ; $x < $this->childrenCount() ; $x++) {
+            $chNode = $this->getChild($x);
+
+            if ($chNode->getNodeName() == 'meta') {
+                $insertPosition = $x;
+            }
+        }
+
+        if ($insertPosition != -1) {
+            $this->insert($newMeta, $insertPosition + 1);
+        } else {
+            $this->addChild($newMeta);
+        }
+    }
 }
diff --git a/WebFiori/Ui/Input.php b/WebFiori/Ui/Input.php
index d177e68..9a276a4 100644
--- a/WebFiori/Ui/Input.php
+++ b/WebFiori/Ui/Input.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/JsCode.php b/WebFiori/Ui/JsCode.php
index 1dba552..2529f20 100644
--- a/WebFiori/Ui/JsCode.php
+++ b/WebFiori/Ui/JsCode.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/Label.php b/WebFiori/Ui/Label.php
index 06721b8..5b26a76 100644
--- a/WebFiori/Ui/Label.php
+++ b/WebFiori/Ui/Label.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/ListItem.php b/WebFiori/Ui/ListItem.php
index 4d4e1a1..7771f97 100644
--- a/WebFiori/Ui/ListItem.php
+++ b/WebFiori/Ui/ListItem.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/OrderedList.php b/WebFiori/Ui/OrderedList.php
index 150b6e7..bb367be 100644
--- a/WebFiori/Ui/OrderedList.php
+++ b/WebFiori/Ui/OrderedList.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/Paragraph.php b/WebFiori/Ui/Paragraph.php
index 38fd1ec..e3d4d95 100644
--- a/WebFiori/Ui/Paragraph.php
+++ b/WebFiori/Ui/Paragraph.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/RadioGroup.php b/WebFiori/Ui/RadioGroup.php
index df30267..6550188 100644
--- a/WebFiori/Ui/RadioGroup.php
+++ b/WebFiori/Ui/RadioGroup.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/TableCell.php b/WebFiori/Ui/TableCell.php
index 879454b..6551866 100644
--- a/WebFiori/Ui/TableCell.php
+++ b/WebFiori/Ui/TableCell.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/TableRow.php b/WebFiori/Ui/TableRow.php
index d719e94..c50ae4e 100644
--- a/WebFiori/Ui/TableRow.php
+++ b/WebFiori/Ui/TableRow.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/WebFiori/Ui/TemplateCompiler.php b/WebFiori/Ui/TemplateCompiler.php
index c54f6b3..6529041 100644
--- a/WebFiori/Ui/TemplateCompiler.php
+++ b/WebFiori/Ui/TemplateCompiler.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
@@ -99,11 +100,13 @@ public function __construct(string $templatePath, array $vars = []) {
      */
     public function compile(array $varsToPass = []) {
         if ($this->getType() == 'php') {
-            $this->rawOutput = (static function(string $__path, array $__vars) {
+            $this->rawOutput = (static function(string $__path, array $__vars)
+            {
                 extract($__vars, EXTR_SKIP);
                 ob_start();
                 try {
                     require $__path;
+
                     return ob_get_clean();
                 } catch (\Throwable $e) {
                     ob_end_clean();
@@ -143,11 +146,11 @@ public function compile(array $varsToPass = []) {
      */
     public static function fromHTMLText(string $text, bool $asHTMLDocObj = true) {
         $nodesArr = self::htmlAsArray($text);
-        
+
         if (count($nodesArr) >= 1) {
             $TN = 'tag-name';
             $retVal = [];
-            
+
             if ($asHTMLDocObj && ($nodesArr[0][$TN] == 'html' || $nodesArr[0][$TN] == '!DOCTYPE')) {
                 $retVal = self::parseHTMLDoc($nodesArr);
             } else {
@@ -159,53 +162,6 @@ public static function fromHTMLText(string $text, bool $asHTMLDocObj = true) {
 
         return null;
     }
-    private static function parseHTMLNode($nodesArr) {
-        if (count($nodesArr) != 1) {
-            $retVal = [];
-            foreach ($nodesArr as $node) {
-                $asHtmlNode = self::fromHTMLTextHelper00($node);
-                $retVal[] = $asHtmlNode;
-            }
-            return $retVal;
-        } else {
-            return self::fromHTMLTextHelper00($nodesArr[0]);
-        }
-    }
-    private static function parseHTMLDoc($children) : HTMLDoc {
-        $retVal = new HTMLDoc();
-        $retVal->getHeadNode()->removeAllChildNodes();
-        $retVal->getBody()->removeAttributes();
-        $TN = 'tag-name';
-        
-        for ($x = 0 ; $x < count($children) ; $x++) {
-            if ($children[$x][$TN] == 'html') {
-                $htmlNode = self::fromHTMLTextHelper00($children[$x]);
-
-
-                foreach ($htmlNode->getAttributes() as $attr => $val) {
-                    self::safeSetAttribute($retVal->getDocumentRoot(), $attr, $val);
-                }
-                for ($y = 0 ; $y < $htmlNode->childrenCount() ; $y++) {
-                    $child = $htmlNode->children()->get($y);
-
-                    if ($child->getNodeName() == 'head') {
-                        $retVal->setHeadNode($child);
-                    } else if ($child->getNodeName() == 'body') {
-                        for ($z = 0 ; $z < $child->childrenCount() ; $z++) {
-                            $node = $child->children()->get($z);
-                            $retVal->addChild($node);
-                        }
-
-                        foreach ($child->getAttributes() as $attr => $val) {
-                            self::safeSetAttribute($retVal->getBody(), $attr, $val);
-                        }
-                        
-                    }
-                }
-            }
-        }
-        return $retVal;
-    }
     /**
      * Returns an array that contains directories names of the calling files.
      * 
@@ -766,6 +722,56 @@ private static function parseAttributesHelper(Queue $queue, bool $isEqualFound,
         $queue->enqueue($val);
         $val = '';
     }
+    private static function parseHTMLDoc($children) : HTMLDoc {
+        $retVal = new HTMLDoc();
+        $retVal->getHeadNode()->removeAllChildNodes();
+        $retVal->getBody()->removeAttributes();
+        $TN = 'tag-name';
+
+        for ($x = 0 ; $x < count($children) ; $x++) {
+            if ($children[$x][$TN] == 'html') {
+                $htmlNode = self::fromHTMLTextHelper00($children[$x]);
+
+
+                foreach ($htmlNode->getAttributes() as $attr => $val) {
+                    self::safeSetAttribute($retVal->getDocumentRoot(), $attr, $val);
+                }
+
+                for ($y = 0 ; $y < $htmlNode->childrenCount() ; $y++) {
+                    $child = $htmlNode->children()->get($y);
+
+                    if ($child->getNodeName() == 'head') {
+                        $retVal->setHeadNode($child);
+                    } else if ($child->getNodeName() == 'body') {
+                        for ($z = 0 ; $z < $child->childrenCount() ; $z++) {
+                            $node = $child->children()->get($z);
+                            $retVal->addChild($node);
+                        }
+
+                        foreach ($child->getAttributes() as $attr => $val) {
+                            self::safeSetAttribute($retVal->getBody(), $attr, $val);
+                        }
+                    }
+                }
+            }
+        }
+
+        return $retVal;
+    }
+    private static function parseHTMLNode($nodesArr) {
+        if (count($nodesArr) != 1) {
+            $retVal = [];
+
+            foreach ($nodesArr as $node) {
+                $asHtmlNode = self::fromHTMLTextHelper00($node);
+                $retVal[] = $asHtmlNode;
+            }
+
+            return $retVal;
+        } else {
+            return self::fromHTMLTextHelper00($nodesArr[0]);
+        }
+    }
     /**
      * Replace all attributes values in HTML string with a hash.
      * 
@@ -845,6 +851,12 @@ private static function replaceAttrsValues(string $htmlStr) : array {
             'html-string' => $htmlStr
         ];
     }
+    private static function safeSetAttribute(HTMLNode $node, string $attr, mixed $val): void {
+        try {
+            $node->setAttribute($attr, $val);
+        } catch (InvalidArgumentException $e) {
+        }
+    }
     private static function setComponentVars($varsArr, $component) {
         if (gettype($varsArr) == 'array') {
             $variables = [];
@@ -871,10 +883,4 @@ private static function setSlotsHelper($allSlots, $slotsValuesArr, $component) {
 
         return $component;
     }
-    private static function safeSetAttribute(HTMLNode $node, string $attr, mixed $val): void {
-        try {
-            $node->setAttribute($attr, $val);
-        } catch (\InvalidArgumentException $e) {
-        }
-    }
 }
diff --git a/WebFiori/Ui/UnorderedList.php b/WebFiori/Ui/UnorderedList.php
index 9f3f265..99165f5 100644
--- a/WebFiori/Ui/UnorderedList.php
+++ b/WebFiori/Ui/UnorderedList.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is licensed under MIT License.
  *
diff --git a/php_cs.php.dist b/php_cs.php.dist
index ac0a570..0b4f088 100644
--- a/php_cs.php.dist
+++ b/php_cs.php.dist
@@ -11,7 +11,7 @@ return $config->setRules([
         'align_multiline_comment' => [
             'comment_type' => 'phpdocs_only'
         ],
-        'array_indentation' => [],
+        'array_indentation' => true,
         'array_syntax' => [
             'syntax' => 'short'
         ],