From a45c741c8d1a04936c2e47750454632d2e5ef4e2 Mon Sep 17 00:00:00 2001
From: "i.lisitski" <dev05icontext@gmail.com>
Date: Tue, 14 Jan 2025 23:45:19 +0300
Subject: [PATCH 01/12] Fix #234. Remove useless tags attributes sorting. Fix
 tests

---
 src/Html.php                           |  49 ------
 tests/HtmlTest.php                     |   8 +-
 tests/Tag/Base/BooleanInputTagTest.php |  30 ++--
 tests/Tag/Base/MediaTagTest.php        |   6 +-
 tests/Tag/Base/TagTest.php             |   4 +-
 tests/Tag/ColgroupTest.php             |   4 +-
 tests/Tag/FormTest.php                 |   4 +-
 tests/Tag/Input/CheckboxTest.php       |   2 +-
 tests/Tag/Input/FileTest.php           |  32 ++--
 tests/Tag/Input/RadioTest.php          |   2 +-
 tests/Tag/Input/RangeTest.php          |  40 ++---
 tests/Tag/InputTest.php                |   8 +-
 tests/Tag/LinkTest.php                 |   8 +-
 tests/Tag/SelectTest.php               |   8 +-
 tests/Tag/SourceTest.php               |   2 +-
 tests/Tag/TrackTest.php                |   2 +-
 tests/Widget/ButtonGroupTest.php       |   4 +-
 tests/Widget/CheckboxListTest.php      | 220 ++++++++++++-------------
 tests/Widget/RadioListTest.php         |   4 +-
 19 files changed, 194 insertions(+), 243 deletions(-)

diff --git a/src/Html.php b/src/Html.php
index 1dd35949..e95c0cea 100644
--- a/src/Html.php
+++ b/src/Html.php
@@ -96,45 +96,6 @@
  */
 final class Html
 {
-    /**
-     * The preferred order of attributes in a tag. This mainly affects the order of the attributes that are
-     * rendered by {@see renderTagAttributes()}.
-     */
-    private const ATTRIBUTE_ORDER = [
-        'type',
-        'id',
-        'class',
-        'name',
-        'value',
-
-        'href',
-        'loading',
-        'src',
-        'srcset',
-        'form',
-        'action',
-        'method',
-
-        'selected',
-        'checked',
-        'readonly',
-        'disabled',
-        'multiple',
-
-        'size',
-        'maxlength',
-        'minlength',
-        'width',
-        'height',
-        'rows',
-        'cols',
-
-        'alt',
-        'title',
-        'rel',
-        'media',
-    ];
-
     /**
      * List of tag attributes that should be specially handled when their values are of array type.
      * In particular, if the value of the `data` attribute is `['name' => 'xyz', 'age' => 13]`, two attributes will be
@@ -1613,16 +1574,6 @@ public static function address(string|Stringable $content = '', array $attribute
      */
     public static function renderTagAttributes(array $attributes): string
     {
-        if (count($attributes) > 1) {
-            $sorted = [];
-            foreach (self::ATTRIBUTE_ORDER as $name) {
-                if (isset($attributes[$name])) {
-                    $sorted[$name] = $attributes[$name];
-                }
-            }
-            $attributes = array_merge($sorted, $attributes);
-        }
-
         $html = '';
         /**
          * @var string $name
diff --git a/tests/HtmlTest.php b/tests/HtmlTest.php
index 196079c4..1988dbf3 100644
--- a/tests/HtmlTest.php
+++ b/tests/HtmlTest.php
@@ -206,7 +206,7 @@ public function testMailto(): void
             Html::mailto('contact me', 'info@example.com')->render()
         );
         $this->assertSame(
-            '<a id="contact" href="mailto:info@example.com">contact me</a>',
+            '<a href="mailto:info@example.com" id="contact">contact me</a>',
             Html::mailto('contact me', 'info@example.com', ['id' => 'contact'])->render()
         );
     }
@@ -534,9 +534,9 @@ public function testRadioList(): void
         $this->assertSame(
             '<input type="hidden" name="test" value="0">' . "\n" .
             '<div id="main">' . "\n" .
-            '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" name="test" value="2" checked> Two</label>' . "\n" .
-            '<label><input type="radio" name="test" value="5"> Five</label>' . "\n" .
+            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" checked type="radio"> Two</label>' . "\n" .
+            '<label><input name="test" value="5" type="radio"> Five</label>' . "\n" .
             '</div>',
             Html::radioList('test')
                 ->items([1 => 'One', 2 => 'Two', 5 => 'Five'])
diff --git a/tests/Tag/Base/BooleanInputTagTest.php b/tests/Tag/Base/BooleanInputTagTest.php
index b35fb133..3bb6b032 100644
--- a/tests/Tag/Base/BooleanInputTagTest.php
+++ b/tests/Tag/Base/BooleanInputTagTest.php
@@ -12,7 +12,7 @@ final class BooleanInputTagTest extends TestCase
 {
     public function testChecked(): void
     {
-        $this->assertSame('<input type="test" checked>', (string)TestBooleanInputTag::tag()->checked());
+        $this->assertSame('<input checked type="test">', (string)TestBooleanInputTag::tag()->checked());
         $this->assertSame('<input type="test">', (string)TestBooleanInputTag::tag()->checked(false));
         $this->assertSame('<input type="test">', (string)TestBooleanInputTag::tag()
             ->checked(true)
@@ -64,7 +64,7 @@ public function testLabel(string $expected, ?string $label, array $attributes):
     public function testLabelNoWrap(): void
     {
         $this->assertSame(
-            '<input type="test" id="ID"> <label for="ID">Voronezh</label>',
+            '<input id="ID" type="test"> <label for="ID">Voronezh</label>',
             (string) TestBooleanInputTag::tag()
                 ->id('ID')
                 ->label('Voronezh', wrap: false),
@@ -74,7 +74,7 @@ public function testLabelNoWrap(): void
     public function testLabelWithId(): void
     {
         $this->assertSame(
-            '<label><input type="test" id="Test"> One</label>',
+            '<label><input id="Test" type="test"> One</label>',
             TestBooleanInputTag::tag()
                 ->id('Test')
                 ->label('One')
@@ -85,7 +85,7 @@ public function testLabelWithId(): void
     public function testSideLabel(): void
     {
         $this->assertMatchesRegularExpression(
-            '~<input type="test" id="i(\d*?)"> <label for="i\1">One</label>~',
+            '~<input id="i(\d*?)" type="test"> <label for="i\1">One</label>~',
             TestBooleanInputTag::tag()
                 ->sideLabel('One')
                 ->render()
@@ -95,7 +95,7 @@ public function testSideLabel(): void
     public function testSideLabelEmpty(): void
     {
         $this->assertMatchesRegularExpression(
-            '~<input type="test" id="i(\d*?)"> <label for="i\1"></label>~',
+            '~<input id="i(\d*?)" type="test"> <label for="i\1"></label>~',
             TestBooleanInputTag::tag()
                 ->sideLabel('')
                 ->render()
@@ -115,7 +115,7 @@ public function testSideLabelNull(): void
     public function testSideLabelWithId(): void
     {
         $this->assertSame(
-            '<input type="test" id="Test"> <label for="Test">One</label>',
+            '<input id="Test" type="test"> <label for="Test">One</label>',
             TestBooleanInputTag::tag()
                 ->id('Test')
                 ->sideLabel('One')
@@ -126,7 +126,7 @@ public function testSideLabelWithId(): void
     public function testSideLabelWithAttributes(): void
     {
         $this->assertMatchesRegularExpression(
-            '~<input type="test" id="i(\d*?)"> <label class="red" for="i\1">One</label>~',
+            '~<input id="i(\d*?)" type="test"> <label class="red" for="i\1">One</label>~',
             TestBooleanInputTag::tag()
                 ->sideLabel('One', ['class' => 'red'])
                 ->render()
@@ -136,7 +136,7 @@ public function testSideLabelWithAttributes(): void
     public function testSideLabelId(): void
     {
         $this->assertSame(
-            '<input type="test" id="count"> <label for="count">One</label>',
+            '<input id="count" type="test"> <label for="count">One</label>',
             TestBooleanInputTag::tag()
                 ->sideLabel('One')
                 ->id('count')
@@ -160,15 +160,15 @@ public static function dataUncheckValue(): array
         return [
             ['<input type="test">', null, null],
             ['<input type="test">', null, 7],
-            ['<input type="test" name="color">', 'color', null],
-            ['<input type="test" name="color[]">', 'color[]', null],
+            ['<input name="color" type="test">', 'color', null],
+            ['<input name="color[]" type="test">', 'color[]', null],
             [
-                '<input type="hidden" name="color" value="7"><input type="test" name="color">',
+                '<input type="hidden" name="color" value="7"><input name="color" type="test">',
                 'color',
                 7,
             ],
             [
-                '<input type="hidden" name="color" value="7"><input type="test" name="color[]">',
+                '<input type="hidden" name="color" value="7"><input name="color[]" type="test">',
                 'color[]',
                 7,
             ],
@@ -191,7 +191,7 @@ public function testUncheckValueDisabled(): void
     {
         $this->assertSame(
             '<input type="hidden" name="color" value="7" disabled>' .
-            '<input type="test" name="color" disabled>',
+            '<input name="color" disabled type="test">',
             TestBooleanInputTag::tag()
                 ->name('color')
                 ->uncheckValue(7)
@@ -204,7 +204,7 @@ public function testUncheckValueForm(): void
     {
         $this->assertSame(
             '<input type="hidden" name="color" value="7" form="post">' .
-            '<input type="test" name="color" form="post">',
+            '<input name="color" form="post" type="test">',
             TestBooleanInputTag::tag()
                 ->name('color')
                 ->uncheckValue(7)
@@ -217,7 +217,7 @@ public function testUncheckValueWithLabel(): void
     {
         $this->assertSame(
             '<input type="hidden" name="color" value="7">' .
-            '<label><input type="test" name="color"> Seven</label>',
+            '<label><input name="color" type="test"> Seven</label>',
             TestBooleanInputTag::tag()
                 ->name('color')
                 ->uncheckValue(7)
diff --git a/tests/Tag/Base/MediaTagTest.php b/tests/Tag/Base/MediaTagTest.php
index 8b89c9ba..6f103d5b 100644
--- a/tests/Tag/Base/MediaTagTest.php
+++ b/tests/Tag/Base/MediaTagTest.php
@@ -169,9 +169,9 @@ public function testWrongTrackDefault(): void
 
         $this->assertSame(
             '<test>' . "\n" .
-            '<track src="sampleCaptions.vtt" kind="captions" srclang="en" default>' . "\n" .
-            '<track src="sampleDescriptions.vtt" kind="descriptions" srclang="de">' . "\n" .
-            '<track src="sampleChapters.vtt" kind="chapters" srclang="ja">' . "\n" .
+            '<track kind="captions" src="sampleCaptions.vtt" srclang="en" default>' . "\n" .
+            '<track kind="descriptions" src="sampleDescriptions.vtt" srclang="de">' . "\n" .
+            '<track kind="chapters" src="sampleChapters.vtt" srclang="ja">' . "\n" .
             '</test>',
             $tag->render()
         );
diff --git a/tests/Tag/Base/TagTest.php b/tests/Tag/Base/TagTest.php
index d5bc4a5a..ec0205f7 100644
--- a/tests/Tag/Base/TagTest.php
+++ b/tests/Tag/Base/TagTest.php
@@ -28,7 +28,7 @@ public static function dataAttributes(): array
             ['<test class="first second">', ['class' => ['first', 'second']]],
             ['<test>', ['class' => []]],
             ['<test style="width: 100px; height: 200px;">', ['style' => ['width' => '100px', 'height' => '200px']]],
-            ['<test name="position" value="42">', ['value' => 42, 'name' => 'position']],
+            ['<test value="42" name="position">', ['value' => 42, 'name' => 'position']],
             [
                 '<test id="x" class="a b" data-a="1" data-b="2" style="width: 100px;" any=\'[1,2]\'>',
                 [
@@ -93,7 +93,7 @@ public function testReplaceAttributes(): void
     public function testUnionAttributes(): void
     {
         $this->assertSame(
-            '<test id="color" class="red">',
+            '<test class="red" id="color">',
             TestTag::tag()
                 ->class('red')
                 ->unionAttributes(['class' => 'green', 'id' => 'color'])
diff --git a/tests/Tag/ColgroupTest.php b/tests/Tag/ColgroupTest.php
index dedeab0d..492040c0 100644
--- a/tests/Tag/ColgroupTest.php
+++ b/tests/Tag/ColgroupTest.php
@@ -16,8 +16,8 @@ public function testBase(): void
         $this->assertSame(
             '<colgroup>' . "\n" .
             '<col>' . "\n" .
-            '<col class="red" span="2">' . "\n" .
-            '<col class="blue" span="2">' . "\n" .
+            '<col span="2" class="red">' . "\n" .
+            '<col span="2" class="blue">' . "\n" .
             '</colgroup>',
             Colgroup::tag()
                 ->columns(
diff --git a/tests/Tag/FormTest.php b/tests/Tag/FormTest.php
index 17c8f58b..88d20dbc 100644
--- a/tests/Tag/FormTest.php
+++ b/tests/Tag/FormTest.php
@@ -36,7 +36,7 @@ public function testBase(): void
     public function testGet(): void
     {
         $this->assertSame(
-            '<form action="https://example.com/send" method="GET"></form>',
+            '<form method="GET" action="https://example.com/send"></form>',
             Form::tag()
                 ->get('https://example.com/send')
                 ->render()
@@ -56,7 +56,7 @@ public function testGetWithoutUrl(): void
     public function testPost(): void
     {
         $this->assertSame(
-            '<form action="https://example.com/send" method="POST"></form>',
+            '<form method="POST" action="https://example.com/send"></form>',
             Form::tag()
                 ->post('https://example.com/send')
                 ->render()
diff --git a/tests/Tag/Input/CheckboxTest.php b/tests/Tag/Input/CheckboxTest.php
index 066c16b3..40334a88 100644
--- a/tests/Tag/Input/CheckboxTest.php
+++ b/tests/Tag/Input/CheckboxTest.php
@@ -12,7 +12,7 @@ final class CheckboxTest extends TestCase
     public function testBase(): void
     {
         $this->assertSame(
-            '<input type="checkbox" name="number" value="42">',
+            '<input name="number" value="42" type="checkbox">',
             Checkbox::tag()
                 ->name('number')
                 ->value(42)
diff --git a/tests/Tag/Input/FileTest.php b/tests/Tag/Input/FileTest.php
index 02d8ed4a..943a5cb2 100644
--- a/tests/Tag/Input/FileTest.php
+++ b/tests/Tag/Input/FileTest.php
@@ -13,7 +13,7 @@ final class FileTest extends TestCase
     public function testBase(): void
     {
         $this->assertSame(
-            '<input type="file" name="avatar">',
+            '<input name="avatar" type="file">',
             File::tag()
                 ->name('avatar')
                 ->render()
@@ -25,15 +25,15 @@ public static function dataUncheckValue(): array
         return [
             ['<input type="file">', null, null],
             ['<input type="file">', null, 7],
-            ['<input type="file" name="avatar">', 'avatar', null],
-            ['<input type="file" name="avatar[]">', 'avatar[]', null],
+            ['<input name="avatar" type="file">', 'avatar', null],
+            ['<input name="avatar[]" type="file">', 'avatar[]', null],
             [
-                '<input type="hidden" name="avatar" value="7"><input type="file" name="avatar">',
+                '<input type="hidden" name="avatar" value="7"><input name="avatar" type="file">',
                 'avatar',
                 7,
             ],
             [
-                '<input type="hidden" name="avatar" value="7"><input type="file" name="avatar[]">',
+                '<input type="hidden" name="avatar" value="7"><input name="avatar[]" type="file">',
                 'avatar[]',
                 7,
             ],
@@ -56,7 +56,7 @@ public function testUncheckValueDisabled(): void
     {
         $this->assertSame(
             '<input type="hidden" name="avatar" value="7" disabled>' .
-            '<input type="file" name="avatar" disabled>',
+            '<input name="avatar" disabled type="file">',
             File::tag()
                 ->name('avatar')
                 ->uncheckValue(7)
@@ -69,7 +69,7 @@ public function testUncheckValueForm(): void
     {
         $this->assertSame(
             '<input type="hidden" name="avatar" value="7" form="post">' .
-            '<input type="file" name="avatar" form="post">',
+            '<input name="avatar" form="post" type="file">',
             File::tag()
                 ->name('avatar')
                 ->uncheckValue(7)
@@ -89,8 +89,8 @@ public function testUncheckInputAttributes(): void
             ->render();
 
         $this->assertSame(
-            '<input type="hidden" id="FileHidden" name="avatar" value="7" form="post" data-key="100">' .
-            '<input type="file" name="avatar" form="post">',
+            '<input type="hidden" name="avatar" value="7" id="FileHidden" data-key="100" form="post">' .
+            '<input name="avatar" form="post" type="file">',
             $result
         );
     }
@@ -106,8 +106,8 @@ public function testReplaceUncheckInputAttributes(): void
             ->render();
 
         $this->assertSame(
-            '<input type="hidden" name="avatar" value="7" form="post" data-key="100">' .
-            '<input type="file" name="avatar" form="post">',
+            '<input type="hidden" name="avatar" value="7" data-key="100" form="post">' .
+            '<input name="avatar" form="post" type="file">',
             $result
         );
     }
@@ -116,11 +116,11 @@ public static function dataAccept(): array
     {
         return [
             [
-                '<input type="file" name="avatar">',
+                '<input name="avatar" type="file">',
                 null,
             ],
             [
-                '<input type="file" name="avatar" accept=".doc,.docx">',
+                '<input name="avatar" accept=".doc,.docx" type="file">',
                 '.doc,.docx',
             ],
         ];
@@ -142,11 +142,11 @@ public static function dataMultiple(): array
     {
         return [
             [
-                '<input type="file" name="avatar" multiple>',
+                '<input name="avatar" multiple type="file">',
                 true,
             ],
             [
-                '<input type="file" name="avatar">',
+                '<input name="avatar" type="file">',
                 false,
             ],
         ];
@@ -167,7 +167,7 @@ public function testMultiple(string $expected, ?bool $multiple): void
     public function testMultipleDefault(): void
     {
         $this->assertSame(
-            '<input type="file" name="avatar" multiple>',
+            '<input name="avatar" multiple type="file">',
             File::tag()
                 ->name('avatar')
                 ->multiple()
diff --git a/tests/Tag/Input/RadioTest.php b/tests/Tag/Input/RadioTest.php
index 0040cebe..1372dab2 100644
--- a/tests/Tag/Input/RadioTest.php
+++ b/tests/Tag/Input/RadioTest.php
@@ -12,7 +12,7 @@ final class RadioTest extends TestCase
     public function testBase(): void
     {
         $this->assertSame(
-            '<input type="radio" name="number" value="42">',
+            '<input name="number" value="42" type="radio">',
             Radio::tag()
                 ->name('number')
                 ->value(42)
diff --git a/tests/Tag/Input/RangeTest.php b/tests/Tag/Input/RangeTest.php
index c10eeba5..49f857f2 100644
--- a/tests/Tag/Input/RangeTest.php
+++ b/tests/Tag/Input/RangeTest.php
@@ -21,7 +21,7 @@ public function testBase(): void
             ->step(10);
 
         $this->assertSame(
-            '<input type="range" name="opacity" min="0" max="100" step="10">',
+            '<input name="opacity" min="0" max="100" step="10" type="range">',
             $tag->render()
         );
     }
@@ -30,11 +30,11 @@ public static function dataMin(): array
     {
         return [
             ['<input type="range">', null],
-            ['<input type="range" min>', ''],
-            ['<input type="range" min="2.5">', '2.5'],
-            ['<input type="range" min="10">', 10],
-            ['<input type="range" min="42.7">', 42.7],
-            ['<input type="range" min="99">', new StringableObject('99')],
+            ['<input min type="range">', ''],
+            ['<input min="2.5" type="range">', '2.5'],
+            ['<input min="10" type="range">', 10],
+            ['<input min="42.7" type="range">', 42.7],
+            ['<input min="99" type="range">', new StringableObject('99')],
         ];
     }
 
@@ -50,11 +50,11 @@ public static function dataMax(): array
     {
         return [
             ['<input type="range">', null],
-            ['<input type="range" max>', ''],
-            ['<input type="range" max="2.5">', '2.5'],
-            ['<input type="range" max="10">', 10],
-            ['<input type="range" max="42.7">', 42.7],
-            ['<input type="range" max="99">', new StringableObject('99')],
+            ['<input max type="range">', ''],
+            ['<input max="2.5" type="range">', '2.5'],
+            ['<input max="10" type="range">', 10],
+            ['<input max="42.7" type="range">', 42.7],
+            ['<input max="99" type="range">', new StringableObject('99')],
         ];
     }
 
@@ -70,11 +70,11 @@ public static function dataStep(): array
     {
         return [
             ['<input type="range">', null],
-            ['<input type="range" step>', ''],
-            ['<input type="range" step="2.5">', '2.5'],
-            ['<input type="range" step="10">', 10],
-            ['<input type="range" step="42.7">', 42.7],
-            ['<input type="range" step="99">', new StringableObject('99')],
+            ['<input step type="range">', ''],
+            ['<input step="2.5" type="range">', '2.5'],
+            ['<input step="10" type="range">', 10],
+            ['<input step="42.7" type="range">', 42.7],
+            ['<input step="99" type="range">', new StringableObject('99')],
         ];
     }
 
@@ -90,7 +90,7 @@ public static function dataList(): array
     {
         return [
             ['<input type="range">', null],
-            ['<input type="range" list="DataList">', 'DataList'],
+            ['<input list="DataList" type="range">', 'DataList'],
         ];
     }
 
@@ -124,7 +124,7 @@ public function testAddOutputAttributes(): void
         $this->assertSame(
             '<input type="range" ' .
             'oninput="document.getElementById(&quot;UID&quot;).innerHTML=this.value">' .
-            "\n" . '<span id="UID" class="red">-</span>',
+            "\n" . '<span class="red" id="UID">-</span>',
             $tag->render()
         );
     }
@@ -181,7 +181,7 @@ public function testOutputWithCustomAttributes(): void
         $this->assertMatchesRegularExpression(
             '~<input type="range" ' .
             'oninput="document\.getElementById\(\&quot;(?<id>rangeOutput\d*)\&quot;\)\.innerHTML=this\.value">' .
-            "\n" . '<span id="(?P=id)" class="red">-</span>~',
+            "\n" . '<span class="red" id="(?P=id)">-</span>~',
             $tag->render()
         );
     }
@@ -193,7 +193,7 @@ public function testOutputWithValue(): void
             ->value(10);
 
         $this->assertMatchesRegularExpression(
-            '~<input type="range" value="10" ' .
+            '~<input value="10" type="range" ' .
             'oninput="document\.getElementById\(\&quot;(?<id>rangeOutput\d*)\&quot;\)\.innerHTML=this\.value">' .
             "\n" . '<span id="(?P=id)">10</span>~',
             $tag->render()
diff --git a/tests/Tag/InputTest.php b/tests/Tag/InputTest.php
index a6daebe8..d06639dd 100644
--- a/tests/Tag/InputTest.php
+++ b/tests/Tag/InputTest.php
@@ -48,7 +48,7 @@ public function testPassword(): void
     public function testFile(): void
     {
         $this->assertSame(
-            '<input type="file" name="photo" value="c:\path\">',
+            '<input name="photo" value="c:\path\" type="file">',
             (string)Input::file('photo', 'c:\\path\\')
         );
     }
@@ -56,7 +56,7 @@ public function testFile(): void
     public function testCheckbox(): void
     {
         $this->assertSame(
-            '<input type="checkbox" name="subscribe" checked>',
+            '<input name="subscribe" checked type="checkbox">',
             (string)Input::checkbox('subscribe')->checked()
         );
     }
@@ -64,7 +64,7 @@ public function testCheckbox(): void
     public function testRadio(): void
     {
         $this->assertSame(
-            '<input type="radio" name="count" value="one">',
+            '<input name="count" value="one" type="radio">',
             (string)Input::radio('count', 'one')
         );
     }
@@ -72,7 +72,7 @@ public function testRadio(): void
     public function testRange(): void
     {
         $this->assertSame(
-            '<input type="range" name="count" value="10">',
+            '<input name="count" value="10" type="range">',
             (string) Input::range('count', 10)
         );
     }
diff --git a/tests/Tag/LinkTest.php b/tests/Tag/LinkTest.php
index 0a404202..ee5d15c9 100644
--- a/tests/Tag/LinkTest.php
+++ b/tests/Tag/LinkTest.php
@@ -13,7 +13,7 @@ final class LinkTest extends TestCase
     public function testBase(): void
     {
         $this->assertSame(
-            '<link type="application/rss+xml" href="/rss" title="Новости компании" rel="alternate">',
+            '<link href="/rss" type="application/rss+xml" rel="alternate" title="Новости компании">',
             (string)Link::tag()
                 ->url('/rss')
                 ->type('application/rss+xml')
@@ -25,7 +25,7 @@ public function testBase(): void
     public function testToCssFile(): void
     {
         $this->assertSame(
-            '<link href="main.css" rel="stylesheet">',
+            '<link rel="stylesheet" href="main.css">',
             (string)Link::toCssFile('main.css')
         );
     }
@@ -119,8 +119,8 @@ public function testAs(string $expected, ?string $as): void
     public static function dataPreload(): array
     {
         return [
-            ['<link href="/main.css" rel="preload">', '/main.css'],
-            ['<link href="/main.css" rel="preload" as="style">', '/main.css', 'style'],
+            ['<link rel="preload" href="/main.css">', '/main.css'],
+            ['<link rel="preload" href="/main.css" as="style">', '/main.css', 'style'],
         ];
     }
 
diff --git a/tests/Tag/SelectTest.php b/tests/Tag/SelectTest.php
index 2a7f6c6b..97847f2c 100644
--- a/tests/Tag/SelectTest.php
+++ b/tests/Tag/SelectTest.php
@@ -33,15 +33,15 @@ public static function dataNameForMultiple(): array
     {
         return [
             ['<select multiple></select>', null],
-            ['<select name multiple></select>', ''],
+            ['<select multiple name></select>', ''],
             [
                 '<input type="hidden" name="age" value>' . "\n" .
-                '<select name="age[]" multiple></select>',
+                '<select multiple name="age[]"></select>',
                 'age',
             ],
             [
                 '<input type="hidden" name="place" value>' . "\n" .
-                '<select name="place[]" multiple></select>',
+                '<select multiple name="place[]"></select>',
                 'place[]',
             ],
         ];
@@ -360,7 +360,7 @@ public function testOptionsAndGroupsAttributes(): void
         $this->assertStringContainsStringIgnoringLineEndings(
             <<<HTML
             <select>
-            <option value="1" data-key="42">One</option>
+            <option data-key="42" value="1">One</option>
             <optgroup label="Group A">
             <option value="2">Two</option>
             <option id="UniqueOption" value="3">Three</option>
diff --git a/tests/Tag/SourceTest.php b/tests/Tag/SourceTest.php
index f7c28a63..ea660ba8 100644
--- a/tests/Tag/SourceTest.php
+++ b/tests/Tag/SourceTest.php
@@ -13,7 +13,7 @@ final class SourceTest extends TestCase
     public function testBase(): void
     {
         $this->assertSame(
-            '<source type="audio/ogg; codecs=vorbis" src="audio.ogg">',
+            '<source src="audio.ogg" type="audio/ogg; codecs=vorbis">',
             (string) Source::tag()
                 ->src('audio.ogg')
                 ->type('audio/ogg; codecs=vorbis')
diff --git a/tests/Tag/TrackTest.php b/tests/Tag/TrackTest.php
index 7c6f7555..b89a0863 100644
--- a/tests/Tag/TrackTest.php
+++ b/tests/Tag/TrackTest.php
@@ -13,7 +13,7 @@ final class TrackTest extends TestCase
     public function testBase(): void
     {
         $this->assertSame(
-            '<track src="brave.en.vtt" kind="subtitles" srclang="en" label="English">',
+            '<track kind="subtitles" src="brave.en.vtt" srclang="en" label="English">',
             (string) Track::tag()
                 ->kind(Track::SUBTITLES)
                 ->src('brave.en.vtt')
diff --git a/tests/Widget/ButtonGroupTest.php b/tests/Widget/ButtonGroupTest.php
index 88f7f4c4..048f31b2 100644
--- a/tests/Widget/ButtonGroupTest.php
+++ b/tests/Widget/ButtonGroupTest.php
@@ -198,8 +198,8 @@ public function testMergeButtonAttributes(): void
         $this->assertStringContainsStringIgnoringLineEndings(
             <<<HTML
             <div>
-            <button type="button" class="base" disabled data-key="42">Show</button>
-            <button type="button" class="base" disabled data-key="42">Hide</button>
+            <button type="button" class="base" data-key="42" disabled>Show</button>
+            <button type="button" class="base" data-key="42" disabled>Hide</button>
             </div>
             HTML,
             $widget->render(),
diff --git a/tests/Widget/CheckboxListTest.php b/tests/Widget/CheckboxListTest.php
index 230a19cd..982e4001 100644
--- a/tests/Widget/CheckboxListTest.php
+++ b/tests/Widget/CheckboxListTest.php
@@ -21,9 +21,9 @@ public function testBase(): void
         $this->assertSame(
             '<input type="hidden" name="test" value="0">' . "\n" .
             '<div id="main">' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="2" checked> Two</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="5" checked> Five</label>' . "\n" .
+            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n" .
+            '<label><input name="test[]" value="5" checked type="checkbox"> Five</label>' . "\n" .
             '</div>',
             CheckboxList::create('test')
                 ->items([1 => 'One', 2 => 'Two', 5 => 'Five'])
@@ -42,7 +42,7 @@ public function testName(): void
 
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="checkbox" name="b[]" value="1"> One</label>' . "\n" .
+            '<label><input name="b[]" value="1" type="checkbox"> One</label>' . "\n" .
             '</div>',
             $widget->render()
         );
@@ -51,7 +51,7 @@ public function testName(): void
     public function testWithoutContainer(): void
     {
         $this->assertSame(
-            '<label><input type="checkbox" name="test[]" value="1"> One</label>',
+            '<label><input name="test[]" value="1" type="checkbox"> One</label>',
             CheckboxList::create('test')
                 ->items([1 => 'One'])
                 ->withoutContainer()
@@ -63,16 +63,16 @@ public static function dataContainerTag(): array
     {
         return [
             [
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>',
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>',
                 null,
             ],
             [
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>',
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>',
                 '',
             ],
             [
                 '<section>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
                 '</section>',
                 'section',
             ],
@@ -95,7 +95,7 @@ public function testContainerAttributes(): void
     {
         $this->assertSame(
             '<div id="main">' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
+            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
             '</div>',
             CheckboxList::create('test')
                 ->items([1 => 'One'])
@@ -107,8 +107,8 @@ public function testContainerAttributes(): void
     public function testCheckboxAttributes(): void
     {
         $this->assertSame(
-            '<label><input type="checkbox" class="red" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" class="red" name="test[]" value="2"> Two</label>',
+            '<label><input name="test[]" value="1" class="red" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" class="red" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -123,8 +123,8 @@ public function testCheckboxAttributes(): void
     public function testCheckboxAttributesMerge(): void
     {
         $this->assertSame(
-            '<label><input type="checkbox" class="red" name="test[]" value="1" readonly> One</label>' . "\n" .
-            '<label><input type="checkbox" class="red" name="test[]" value="2" readonly> Two</label>',
+            '<label><input name="test[]" value="1" readonly class="red" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" readonly class="red" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -140,8 +140,8 @@ public function testCheckboxAttributesMerge(): void
     public function testReplaceCheckboxAttributes(): void
     {
         $this->assertSame(
-            '<label><input type="checkbox" class="red" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" class="red" name="test[]" value="2"> Two</label>',
+            '<label><input name="test[]" value="1" class="red" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" class="red" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -157,8 +157,8 @@ public function testReplaceCheckboxAttributes(): void
     public function testCheckboxLabelAttributes(): void
     {
         $this->assertSame(
-            '<label class="red"><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-            '<label class="red"><input type="checkbox" name="test[]" value="2"> Two</label>',
+            '<label class="red"><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+            '<label class="red"><input name="test[]" value="2" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
                 ->checkboxLabelAttributes(['class' => 'red'])
@@ -170,8 +170,8 @@ public function testCheckboxLabelAttributes(): void
     public function testCheckboxLabelAttributesMerge(): void
     {
         $this->assertSame(
-            '<label class="red" data-type="label"><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-            '<label class="red" data-type="label"><input type="checkbox" name="test[]" value="2"> Two</label>',
+            '<label class="red" data-type="label"><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+            '<label class="red" data-type="label"><input name="test[]" value="2" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
                 ->checkboxLabelAttributes(['class' => 'red'])
@@ -184,9 +184,9 @@ public function testCheckboxLabelAttributesMerge(): void
     public function testAddIndividualInputAttributes(): void
     {
         $this->assertSame(
-            '<label><input type="checkbox" class="red" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" class="blue" name="test[]" value="2"> Two</label>' . "\n" .
-            '<label><input type="checkbox" class="green" name="test[]" value="3"> Three</label>',
+            '<label><input name="test[]" value="1" class="red" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" class="blue" type="checkbox"> Two</label>' . "\n" .
+            '<label><input name="test[]" value="3" class="green" type="checkbox"> Three</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -206,9 +206,9 @@ public function testAddIndividualInputAttributes(): void
     public function testIndividualUncheckInputAttributes(): void
     {
         $this->assertSame(
-            '<input type="hidden" class="blue" name="test" value="0">' . "\n" .
-            '<label><input type="checkbox" class="red" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" class="red" name="test[]" value="2"> Two</label>',
+            '<input type="hidden" name="test" value="0" class="blue">' . "\n" .
+            '<label><input name="test[]" value="1" class="red" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" class="red" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -227,9 +227,9 @@ public function testIndividualUncheckInputAttributes(): void
     public function testIndividualInputAttributesMerge(): void
     {
         $this->assertSame(
-            '<label><input type="checkbox" class="yellow" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" class="cyan" name="test[]" value="2"> Two</label>' . "\n" .
-            '<label><input type="checkbox" class="green" name="test[]" value="3"> Three</label>',
+            '<label><input name="test[]" value="1" class="yellow" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" class="cyan" type="checkbox"> Two</label>' . "\n" .
+            '<label><input name="test[]" value="3" class="green" type="checkbox"> Three</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -253,9 +253,9 @@ public function testIndividualInputAttributesMerge(): void
     public function testIndividualInputAttributesReplace(): void
     {
         $this->assertSame(
-            '<label><input type="checkbox" class="yellow" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" class="red" name="test[]" value="2"> Two</label>' . "\n" .
-            '<label><input type="checkbox" class="red" name="test[]" value="3"> Three</label>',
+            '<label><input name="test[]" value="1" class="yellow" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" class="red" type="checkbox"> Two</label>' . "\n" .
+            '<label><input name="test[]" value="3" class="red" type="checkbox"> Three</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -278,8 +278,8 @@ public function testIndividualInputAttributesReplace(): void
     public function testItems(): void
     {
         $this->assertSame(
-            '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="2"> &lt;b&gt;Two&lt;/b&gt;</label>',
+            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" type="checkbox"> &lt;b&gt;Two&lt;/b&gt;</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -293,8 +293,8 @@ public function testItems(): void
     public function testItemsWithoutEncodeLabel(): void
     {
         $this->assertSame(
-            '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="2"> <b>Two</b></label>',
+            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" type="checkbox"> <b>Two</b></label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -309,18 +309,18 @@ public static function dataItemsFromValues(): array
     {
         return [
             [
-                '<label><input type="checkbox" name="test[]" value="1"> 1</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2"> 2</label>',
+                '<label><input name="test[]" value="1" type="checkbox"> 1</label>' . "\n" .
+                '<label><input name="test[]" value="2" type="checkbox"> 2</label>',
                 [1, 2],
             ],
             [
-                '<label><input type="checkbox" name="test[]" value="One"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="&lt;b&gt;Two&lt;/b&gt;"> &lt;b&gt;Two&lt;/b&gt;</label>',
+                '<label><input name="test[]" value="One" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="&lt;b&gt;Two&lt;/b&gt;" type="checkbox"> &lt;b&gt;Two&lt;/b&gt;</label>',
                 ['One', '<b>Two</b>'],
             ],
             [
-                '<label><input type="checkbox" name="test[]" value="1"> 1</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value></label>',
+                '<label><input name="test[]" value="1" type="checkbox"> 1</label>' . "\n" .
+                '<label><input name="test[]" value type="checkbox"></label>',
                 [true, false],
             ],
         ];
@@ -341,8 +341,8 @@ public function testItemsFromValues(string $expected, array $values): void
     public function testItemsFromValuesWithoutEncodeLabel(): void
     {
         $this->assertSame(
-            '<label><input type="checkbox" name="test[]" value="One"> One</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="&lt;b&gt;Two&lt;/b&gt;"> <b>Two</b></label>',
+            '<label><input name="test[]" value="One" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="&lt;b&gt;Two&lt;/b&gt;" type="checkbox"> <b>Two</b></label>',
             CheckboxList::create('test')
                 ->itemsFromValues([
                     'One',
@@ -360,41 +360,41 @@ public static function dataValue(): array
             ["<div>\n</div>", [], [42]],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 [1 => 'One', 2 => 'Two'],
                 [],
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 [1 => 'One', 2 => 'Two'],
                 [7],
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1" checked> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="1" checked type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 [1 => 'One', 2 => 'Two'],
                 [1],
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2" checked> Two</label>' . "\n" .
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 [1 => 'One', 2 => 'Two'],
                 [2],
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1" checked> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="3" checked> Three</label>' . "\n" .
+                '<label><input name="test[]" value="1" checked type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="3" checked type="checkbox"> Three</label>' . "\n" .
                 '</div>',
                 [1 => 'One', 2 => 'Two', 3 => 'Three'],
                 [1, 3],
@@ -402,25 +402,25 @@ public static function dataValue(): array
             ["<div>\n</div>", [], [StringEnum::A]],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="one"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="two"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="one" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="two" type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 [StringEnum::A->value => 'One', StringEnum::B->value => 'Two'],
                 [StringEnum::C],
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="one"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="two" checked> Two</label>' . "\n" .
+                '<label><input name="test[]" value="one" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="two" checked type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 [StringEnum::A->value => 'One', StringEnum::B->value => 'Two'],
                 [StringEnum::B],
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="one"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="two" checked> Two</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="three" checked> Three</label>' . "\n" .
+                '<label><input name="test[]" value="one" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="two" checked type="checkbox"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="three" checked type="checkbox"> Three</label>' . "\n" .
                 '</div>',
                 [StringEnum::A->value => 'One', StringEnum::B->value => 'Two', StringEnum::C->value => 'Three'],
                 [StringEnum::B, StringEnum::C],
@@ -428,25 +428,25 @@ public static function dataValue(): array
             ["<div>\n</div>", [], [IntegerEnum::A]],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 [IntegerEnum::A->value => 'One', IntegerEnum::B->value => 'Two'],
                 [IntegerEnum::C],
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2" checked> Two</label>' . "\n" .
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 [IntegerEnum::A->value => 'One', IntegerEnum::B->value => 'Two'],
                 [IntegerEnum::B],
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2" checked> Two</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="3" checked> Three</label>' . "\n" .
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="3" checked type="checkbox"> Three</label>' . "\n" .
                 '</div>',
                 [IntegerEnum::A->value => 'One', IntegerEnum::B->value => 'Two', IntegerEnum::C->value => 'Three'],
                 [IntegerEnum::B, IntegerEnum::C],
@@ -492,22 +492,22 @@ public static function dataForm(): array
         return [
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 null,
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1" form> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2" form> Two</label>' . "\n" .
+                '<label><input name="test[]" value="1" form type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" form type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 '',
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1" form="post"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2" form="post"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="1" form="post" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" form="post" type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 'post',
             ],
@@ -539,8 +539,8 @@ public function testReadonly(): void
 
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="1" readonly> One</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="2" readonly> Two</label>' . "\n" .
+            '<label><input name="test[]" value="1" readonly type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" readonly type="checkbox"> Two</label>' . "\n" .
             '</div>',
             $checkbox
                 ->readonly()
@@ -549,8 +549,8 @@ public function testReadonly(): void
 
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
             '</div>',
             $checkbox
                 ->readonly(false)
@@ -558,8 +558,8 @@ public function testReadonly(): void
         );
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
             '</div>',
             $checkbox
                 ->readonly(true)
@@ -578,8 +578,8 @@ public function testDisabled(): void
 
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="1" disabled> One</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="2" disabled> Two</label>' . "\n" .
+            '<label><input name="test[]" value="1" disabled type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" disabled type="checkbox"> Two</label>' . "\n" .
             '</div>',
             $checkbox
                 ->disabled()
@@ -588,8 +588,8 @@ public function testDisabled(): void
 
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
             '</div>',
             $checkbox
                 ->disabled(false)
@@ -597,8 +597,8 @@ public function testDisabled(): void
         );
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
             '</div>',
             $checkbox
                 ->disabled(true)
@@ -612,16 +612,16 @@ public static function dataUncheckValue(): array
         return [
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 'test',
                 null,
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 'test[]',
                 null,
@@ -629,8 +629,8 @@ public static function dataUncheckValue(): array
             [
                 '<input type="hidden" name="test" value="7">' . "\n" .
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 'test',
                 7,
@@ -638,8 +638,8 @@ public static function dataUncheckValue(): array
             [
                 '<input type="hidden" name="test" value="7">' . "\n" .
                 '<div>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-                '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
                 '</div>',
                 'test[]',
                 7,
@@ -666,8 +666,8 @@ public function testUncheckValueDisabled(): void
     {
         $this->assertSame(
             '<input type="hidden" name="test" value="7" disabled>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="1" disabled> One</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="2" disabled> Two</label>',
+            '<label><input name="test[]" value="1" disabled type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" disabled type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -684,8 +684,8 @@ public function testUncheckValueForm(): void
     {
         $this->assertSame(
             '<input type="hidden" name="test" value="7" form="post">' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="1" form="post"> One</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="2" form="post"> Two</label>',
+            '<label><input name="test[]" value="1" form="post" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" form="post" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -702,8 +702,8 @@ public function testSeparator(): void
     {
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="1"> One</label><br>' .
-            '<label><input type="checkbox" name="test[]" value="2"> Two</label>' . "\n" .
+            '<label><input name="test[]" value="1" type="checkbox"> One</label><br>' .
+            '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
             '</div>',
             CheckboxList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
@@ -716,8 +716,8 @@ public function testItemFormatter(): void
     {
         $this->assertSame(
             '<div>' . "\n" .
-            '<div>0) <label><input type="checkbox" name="test[]" value="1"> One</label></div>' .
-            '<div>1) <label><input type="checkbox" name="test[]" value="2"> Two</label></div>' . "\n" .
+            '<div>0) <label><input name="test[]" value="1" type="checkbox"> One</label></div>' .
+            '<div>1) <label><input name="test[]" value="2" type="checkbox"> Two</label></div>' . "\n" .
             '</div>',
             CheckboxList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
@@ -750,8 +750,8 @@ public function testDisableCheckboxLabelWrap(): void
         $this->assertSame(
             <<<HTML
             <div>
-            <input type="checkbox" id="id1" name="test[]" value="1"> <label for="id1">One</label>
-            <input type="checkbox" id="id2" name="test[]" value="2"> <label for="id2">Two</label>
+            <input name="test[]" value="1" id="id1" type="checkbox"> <label for="id1">One</label>
+            <input name="test[]" value="2" id="id2" type="checkbox"> <label for="id2">Two</label>
             </div>
             HTML,
             $html,
@@ -770,10 +770,10 @@ public function testCheckboxWrap(): void
             <<<HTML
             <div>
             <div class="form-check">
-            <label><input type="checkbox" name="test[]" value="1"> One</label>
+            <label><input name="test[]" value="1" type="checkbox"> One</label>
             </div>
             <div class="form-check">
-            <label><input type="checkbox" name="test[]" value="2"> Two</label>
+            <label><input name="test[]" value="2" type="checkbox"> Two</label>
             </div>
             </div>
             HTML,
@@ -807,10 +807,10 @@ public function testCheckboxWrapClass(string $expected, array $class): void
             <<<HTML
             <div>
             <div$expected>
-            <label><input type="checkbox" name="test[]" value="1"> One</label>
+            <label><input name="test[]" value="1" type="checkbox"> One</label>
             </div>
             <div$expected>
-            <label><input type="checkbox" name="test[]" value="2"> Two</label>
+            <label><input name="test[]" value="2" type="checkbox"> Two</label>
             </div>
             </div>
             HTML,
@@ -843,10 +843,10 @@ public function testAddCheckboxWrapClass(string $expected, array $class): void
             <<<HTML
             <div>
             <div$expected>
-            <label><input type="checkbox" name="test[]" value="1"> One</label>
+            <label><input name="test[]" value="1" type="checkbox"> One</label>
             </div>
             <div$expected>
-            <label><input type="checkbox" name="test[]" value="2"> Two</label>
+            <label><input name="test[]" value="2" type="checkbox"> Two</label>
             </div>
             </div>
             HTML,
diff --git a/tests/Widget/RadioListTest.php b/tests/Widget/RadioListTest.php
index d0ffbdac..cc1aa510 100644
--- a/tests/Widget/RadioListTest.php
+++ b/tests/Widget/RadioListTest.php
@@ -757,10 +757,10 @@ public function testRadioWrapClass(string $expected, array $class): void
             <<<HTML
             <div>
             <div$expected>
-            <label><input type="radio" name="test" value="1"> One</label>
+            <label><input name="test" value="1" type="radio"> One</label>
             </div>
             <div$expected>
-            <label><input type="radio" name="test" value="2"> Two</label>
+            <label><input name="test" value="2" type="radio"> Two</label>
             </div>
             </div>
             HTML,

From 2c077f31596ae41b830904a64fa14c2ad013df33 Mon Sep 17 00:00:00 2001
From: "i.lisitski" <dev05icontext@gmail.com>
Date: Wed, 15 Jan 2025 00:13:28 +0300
Subject: [PATCH 02/12] Fix #234 all test pass

---
 tests/HtmlTest.php             |  60 +++++-----
 tests/Tag/FormTest.php         |   2 +-
 tests/Tag/PictureTest.php      |   4 +-
 tests/Widget/RadioListTest.php | 198 ++++++++++++++++-----------------
 4 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/tests/HtmlTest.php b/tests/HtmlTest.php
index 1988dbf3..9dbe5264 100644
--- a/tests/HtmlTest.php
+++ b/tests/HtmlTest.php
@@ -135,7 +135,7 @@ public function testMeta(): void
     {
         $this->assertSame('<meta>', Html::meta()->render());
         $this->assertSame(
-            '<meta id="main" name="keywords" content="yii">',
+            '<meta name="keywords" content="yii" id="main">',
             Html::meta(['name' => 'keywords', 'content' => 'yii', 'id' => 'main'])->render()
         );
     }
@@ -154,15 +154,15 @@ public function testLink(): void
     public function testCssFile(): void
     {
         $this->assertSame(
-            '<link href="http://example.com" rel="stylesheet">',
+            '<link rel="stylesheet" href="http://example.com">',
             Html::cssFile('http://example.com')->render()
         );
         $this->assertSame(
-            '<link href rel="stylesheet">',
+            '<link rel="stylesheet" href>',
             Html::cssFile('')->render()
         );
         $this->assertSame(
-            '<link id="main" href="http://example.com" rel="stylesheet">',
+            '<link rel="stylesheet" href="http://example.com" id="main">',
             Html::cssFile('http://example.com', ['id' => 'main'])->render()
         );
     }
@@ -178,7 +178,7 @@ public function testJavaScriptFile(): void
             Html::javaScriptFile('')->render()
         );
         $this->assertSame(
-            '<script id="main" src="http://example.com"></script>',
+            '<script src="http://example.com" id="main"></script>',
             Html::javaScriptFile('http://example.com', ['id' => 'main'])->render()
         );
     }
@@ -393,7 +393,7 @@ public function testHiddenInput(): void
             Html::hiddenInput('test', '43')->render(),
         );
         $this->assertSame(
-            '<input type="hidden" id="ABC" name="test" value="43">',
+            '<input type="hidden" name="test" value="43" id="ABC">',
             Html::hiddenInput('test', '43', ['id' => 'ABC'])->render(),
         );
     }
@@ -417,15 +417,15 @@ public function testPasswordInput(): void
     public function testFile(): void
     {
         $this->assertSame('<input type="file">', Html::file()->render());
-        $this->assertSame('<input type="file" name>', Html::file('')->render());
-        $this->assertSame('<input type="file" value>', Html::file(null, '')->render());
-        $this->assertSame('<input type="file" name="test">', Html::file('test')->render());
+        $this->assertSame('<input name type="file">', Html::file('')->render());
+        $this->assertSame('<input value type="file">', Html::file(null, '')->render());
+        $this->assertSame('<input name="test" type="file">', Html::file('test')->render());
         $this->assertSame(
-            '<input type="file" name="test" value="43">',
+            '<input name="test" value="43" type="file">',
             Html::file('test', '43')->render(),
         );
         $this->assertSame(
-            '<input type="file" class="photo" name="test" value="43">',
+            '<input name="test" value="43" class="photo" type="file">',
             Html::file('test', '43', ['class' => 'photo'])->render(),
         );
     }
@@ -433,15 +433,15 @@ public function testFile(): void
     public function testRadio(): void
     {
         $this->assertSame('<input type="radio">', Html::radio()->render());
-        $this->assertSame('<input type="radio" name>', Html::radio('')->render());
-        $this->assertSame('<input type="radio" value>', Html::radio(null, '')->render());
-        $this->assertSame('<input type="radio" name="test">', Html::radio('test')->render());
+        $this->assertSame('<input name type="radio">', Html::radio('')->render());
+        $this->assertSame('<input value type="radio">', Html::radio(null, '')->render());
+        $this->assertSame('<input name="test" type="radio">', Html::radio('test')->render());
         $this->assertSame(
-            '<input type="radio" name="test" value="43">',
+            '<input name="test" value="43" type="radio">',
             Html::radio('test', '43')->render(),
         );
         $this->assertSame(
-            '<input type="radio" name="test" value="43" readonly>',
+            '<input name="test" value="43" readonly type="radio">',
             Html::radio('test', '43', ['readonly' => true])->render(),
         );
     }
@@ -449,15 +449,15 @@ public function testRadio(): void
     public function testCheckbox(): void
     {
         $this->assertSame('<input type="checkbox">', Html::checkbox()->render());
-        $this->assertSame('<input type="checkbox" name>', Html::checkbox('')->render());
-        $this->assertSame('<input type="checkbox" value>', Html::checkbox(null, '')->render());
-        $this->assertSame('<input type="checkbox" name="test">', Html::checkbox('test')->render());
+        $this->assertSame('<input name type="checkbox">', Html::checkbox('')->render());
+        $this->assertSame('<input value type="checkbox">', Html::checkbox(null, '')->render());
+        $this->assertSame('<input name="test" type="checkbox">', Html::checkbox('test')->render());
         $this->assertSame(
-            '<input type="checkbox" name="test" value="43">',
+            '<input name="test" value="43" type="checkbox">',
             Html::checkbox('test', '43')->render(),
         );
         $this->assertSame(
-            '<input type="checkbox" name="test" value="43" readonly>',
+            '<input name="test" value="43" readonly type="checkbox">',
             Html::checkbox('test', '43', ['readonly' => true])->render(),
         );
     }
@@ -465,15 +465,15 @@ public function testCheckbox(): void
     public function testRange(): void
     {
         $this->assertSame('<input type="range">', Html::range()->render());
-        $this->assertSame('<input type="range" name>', Html::range('')->render());
-        $this->assertSame('<input type="range" value>', Html::range(null, '')->render());
-        $this->assertSame('<input type="range" name="test">', Html::range('test')->render());
+        $this->assertSame('<input name type="range">', Html::range('')->render());
+        $this->assertSame('<input value type="range">', Html::range(null, '')->render());
+        $this->assertSame('<input name="test" type="range">', Html::range('test')->render());
         $this->assertSame(
-            '<input type="range" name="test" value="43">',
+            '<input name="test" value="43" type="range">',
             Html::range('test', '43')->render(),
         );
         $this->assertSame(
-            '<input type="range" name="test" value="43" readonly>',
+            '<input name="test" value="43" readonly type="range">',
             Html::range('test', '43', ['readonly' => true])->render(),
         );
     }
@@ -516,9 +516,9 @@ public function testCheckboxList(): void
         $this->assertSame(
             '<input type="hidden" name="test" value="0">' . "\n" .
             '<div id="main">' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="1"> One</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="2" checked> Two</label>' . "\n" .
-            '<label><input type="checkbox" name="test[]" value="5" checked> Five</label>' . "\n" .
+            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
+            '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n" .
+            '<label><input name="test[]" value="5" checked type="checkbox"> Five</label>' . "\n" .
             '</div>',
             Html::checkboxList('test')
                 ->items([1 => 'One', 2 => 'Two', 5 => 'Five'])
@@ -819,7 +819,7 @@ public static function dataRenderTagAttributes(): array
             [' class="first second"', ['class' => ['first', 'second']]],
             ['', ['class' => []]],
             [' style="width: 100px; height: 200px;"', ['style' => ['width' => '100px', 'height' => '200px']]],
-            [' name="position" value="42"', ['value' => 42, 'name' => 'position']],
+            [' value="42" name="position"', ['value' => 42, 'name' => 'position']],
             [
                 ' id="x" class="a b" data-a="1" data-b="2" style="width: 100px;" any=\'[1,2]\'',
                 [
diff --git a/tests/Tag/FormTest.php b/tests/Tag/FormTest.php
index 88d20dbc..8cf44fba 100644
--- a/tests/Tag/FormTest.php
+++ b/tests/Tag/FormTest.php
@@ -18,7 +18,7 @@ public function testBase(): void
         $tag = Form::tag();
 
         $this->assertSame(
-            '<form action="https://example.com/send" method="GET">' .
+            '<form method="GET" action="https://example.com/send">' .
             '<input type="text" name="query">' .
             '<button type="submit">go</button>' .
             '</form>',
diff --git a/tests/Tag/PictureTest.php b/tests/Tag/PictureTest.php
index e495c9f7..6c8ffb6e 100644
--- a/tests/Tag/PictureTest.php
+++ b/tests/Tag/PictureTest.php
@@ -31,8 +31,8 @@ public function testBase(): void
 
         $this->assertSame(
             '<picture>' . "\n" .
-            '<source type="image/jpeg" srcset="img_pink_flowers.jpg" media="(min-width:650px)">' . "\n" .
-            '<source type="image/jpeg" srcset="img_white_flower.jpg" media="(min-width:465px)">' . "\n" .
+            '<source media="(min-width:650px)" srcset="img_pink_flowers.jpg" type="image/jpeg">' . "\n" .
+            '<source media="(min-width:465px)" srcset="img_white_flower.jpg" type="image/jpeg">' . "\n" .
             '<img src="img_orange_flowers.jpg" alt="Flowers">' . "\n" .
             '</picture>',
             $picture->render()
diff --git a/tests/Widget/RadioListTest.php b/tests/Widget/RadioListTest.php
index cc1aa510..3d413d92 100644
--- a/tests/Widget/RadioListTest.php
+++ b/tests/Widget/RadioListTest.php
@@ -19,9 +19,9 @@ public function testBase(): void
         $this->assertSame(
             '<input type="hidden" name="test" value="0">' . "\n" .
             '<div id="main">' . "\n" .
-            '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" name="test" value="2" checked> Two</label>' . "\n" .
-            '<label><input type="radio" name="test" value="5"> Five</label>' . "\n" .
+            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" checked type="radio"> Two</label>' . "\n" .
+            '<label><input name="test" value="5" type="radio"> Five</label>' . "\n" .
             '</div>',
             RadioList::create('test')
                 ->items([1 => 'One', 2 => 'Two', 5 => 'Five'])
@@ -40,7 +40,7 @@ public function testName(): void
 
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="radio" name="b" value="1"> One</label>' . "\n" .
+            '<label><input name="b" value="1" type="radio"> One</label>' . "\n" .
             '</div>',
             $widget->render()
         );
@@ -49,7 +49,7 @@ public function testName(): void
     public function testWithoutContainer(): void
     {
         $this->assertSame(
-            '<label><input type="radio" name="test" value="1"> One</label>',
+            '<label><input name="test" value="1" type="radio"> One</label>',
             RadioList::create('test')
                 ->items([1 => 'One'])
                 ->withoutContainer()
@@ -61,16 +61,16 @@ public static function dataContainerTag(): array
     {
         return [
             [
-                '<label><input type="radio" name="test" value="1"> One</label>',
+                '<label><input name="test" value="1" type="radio"> One</label>',
                 null,
             ],
             [
-                '<label><input type="radio" name="test" value="1"> One</label>',
+                '<label><input name="test" value="1" type="radio"> One</label>',
                 '',
             ],
             [
                 '<section>' . "\n" .
-                '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
+                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
                 '</section>',
                 'section',
             ],
@@ -93,7 +93,7 @@ public function testContainerAttributes(): void
     {
         $this->assertSame(
             '<div id="main">' . "\n" .
-            '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
+            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
             '</div>',
             RadioList::create('test')
                 ->items([1 => 'One'])
@@ -105,8 +105,8 @@ public function testContainerAttributes(): void
     public function testRadioAttributes(): void
     {
         $this->assertSame(
-            '<label><input type="radio" class="red" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" class="red" name="test" value="2"> Two</label>',
+            '<label><input name="test" value="1" class="red" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" class="red" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -121,8 +121,8 @@ public function testRadioAttributes(): void
     public function testRadioAttributesMerge(): void
     {
         $this->assertSame(
-            '<label><input type="radio" class="red" name="test" value="1" readonly> One</label>' . "\n" .
-            '<label><input type="radio" class="red" name="test" value="2" readonly> Two</label>',
+            '<label><input name="test" value="1" readonly class="red" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" readonly class="red" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -138,8 +138,8 @@ public function testRadioAttributesMerge(): void
     public function testReplaceRadioAttributes(): void
     {
         $this->assertSame(
-            '<label><input type="radio" class="red" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" class="red" name="test" value="2"> Two</label>',
+            '<label><input name="test" value="1" class="red" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" class="red" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -155,8 +155,8 @@ public function testReplaceRadioAttributes(): void
     public function testRadioLabelAttributes(): void
     {
         $this->assertSame(
-            '<label class="red"><input type="radio" name="test" value="1"> One</label>' . "\n" .
-            '<label class="red"><input type="radio" name="test" value="2"> Two</label>',
+            '<label class="red"><input name="test" value="1" type="radio"> One</label>' . "\n" .
+            '<label class="red"><input name="test" value="2" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
                 ->radioLabelAttributes(['class' => 'red'])
@@ -168,8 +168,8 @@ public function testRadioLabelAttributes(): void
     public function testRadioLabelAttributesMerge(): void
     {
         $this->assertSame(
-            '<label class="red" data-type="label"><input type="radio" name="test" value="1"> One</label>' . "\n" .
-            '<label class="red" data-type="label"><input type="radio" name="test" value="2"> Two</label>',
+            '<label class="red" data-type="label"><input name="test" value="1" type="radio"> One</label>' . "\n" .
+            '<label class="red" data-type="label"><input name="test" value="2" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
                 ->radioLabelAttributes(['class' => 'red'])
@@ -182,9 +182,9 @@ public function testRadioLabelAttributesMerge(): void
     public function testIndividualInputAttributes(): void
     {
         $this->assertSame(
-            '<label><input type="radio" class="red" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" class="blue" name="test" value="2"> Two</label>' . "\n" .
-            '<label><input type="radio" class="green" name="test" value="3"> Three</label>',
+            '<label><input name="test" value="1" class="red" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" class="blue" type="radio"> Two</label>' . "\n" .
+            '<label><input name="test" value="3" class="green" type="radio"> Three</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -204,9 +204,9 @@ public function testIndividualInputAttributes(): void
     public function testIndividualUncheckInputAttributes(): void
     {
         $this->assertSame(
-            '<input type="hidden" class="blue" name="test" value="0">' . "\n" .
-            '<label><input type="radio" class="red" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" class="red" name="test" value="2"> Two</label>',
+            '<input type="hidden" name="test" value="0" class="blue">' . "\n" .
+            '<label><input name="test" value="1" class="red" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" class="red" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -225,9 +225,9 @@ public function testIndividualUncheckInputAttributes(): void
     public function testIndividualInputAttributesMerge(): void
     {
         $this->assertSame(
-            '<label><input type="radio" class="yellow" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" class="cyan" name="test" value="2"> Two</label>' . "\n" .
-            '<label><input type="radio" class="green" name="test" value="3"> Three</label>',
+            '<label><input name="test" value="1" class="yellow" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" class="cyan" type="radio"> Two</label>' . "\n" .
+            '<label><input name="test" value="3" class="green" type="radio"> Three</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -251,9 +251,9 @@ public function testIndividualInputAttributesMerge(): void
     public function testIndividualInputAttributesReplace(): void
     {
         $this->assertSame(
-            '<label><input type="radio" class="yellow" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" class="red" name="test" value="2"> Two</label>' . "\n" .
-            '<label><input type="radio" class="red" name="test" value="3"> Three</label>',
+            '<label><input name="test" value="1" class="yellow" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" class="red" type="radio"> Two</label>' . "\n" .
+            '<label><input name="test" value="3" class="red" type="radio"> Three</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -276,8 +276,8 @@ public function testIndividualInputAttributesReplace(): void
     public function testItems(): void
     {
         $this->assertSame(
-            '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" name="test" value="2"> &lt;b&gt;Two&lt;/b&gt;</label>',
+            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" type="radio"> &lt;b&gt;Two&lt;/b&gt;</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -291,8 +291,8 @@ public function testItems(): void
     public function testItemsWithoutEncodeLabel(): void
     {
         $this->assertSame(
-            '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" name="test" value="2"> <b>Two</b></label>',
+            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" type="radio"> <b>Two</b></label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -307,18 +307,18 @@ public static function dataItemsFromValues(): array
     {
         return [
             [
-                '<label><input type="radio" name="test" value="1"> 1</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2"> 2</label>',
+                '<label><input name="test" value="1" type="radio"> 1</label>' . "\n" .
+                '<label><input name="test" value="2" type="radio"> 2</label>',
                 [1, 2],
             ],
             [
-                '<label><input type="radio" name="test" value="One"> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="&lt;b&gt;Two&lt;/b&gt;"> &lt;b&gt;Two&lt;/b&gt;</label>',
+                '<label><input name="test" value="One" type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="&lt;b&gt;Two&lt;/b&gt;" type="radio"> &lt;b&gt;Two&lt;/b&gt;</label>',
                 ['One', '<b>Two</b>'],
             ],
             [
-                '<label><input type="radio" name="test" value="1"> 1</label>' . "\n" .
-                '<label><input type="radio" name="test" value></label>',
+                '<label><input name="test" value="1" type="radio"> 1</label>' . "\n" .
+                '<label><input name="test" value type="radio"></label>',
                 [true, false],
             ],
         ];
@@ -339,8 +339,8 @@ public function testItemsFromValues(string $expected, array $values): void
     public function testItemsFromValuesWithoutEncodeLabel(): void
     {
         $this->assertSame(
-            '<label><input type="radio" name="test" value="One"> One</label>' . "\n" .
-            '<label><input type="radio" name="test" value="&lt;b&gt;Two&lt;/b&gt;"> <b>Two</b></label>',
+            '<label><input name="test" value="One" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="&lt;b&gt;Two&lt;/b&gt;" type="radio"> <b>Two</b></label>',
             RadioList::create('test')
                 ->itemsFromValues([
                     'One',
@@ -358,32 +358,32 @@ public static function dataValue(): array
             ["<div>\n</div>", [], 42],
             [
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
                 '</div>',
                 [1 => 'One', 2 => 'Two'],
                 null,
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
                 '</div>',
                 [1 => 'One', 2 => 'Two'],
                 7,
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="1" checked> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+                '<label><input name="test" value="1" checked type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
                 '</div>',
                 [1 => 'One', 2 => 'Two'],
                 1,
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2" checked> Two</label>' . "\n" .
+                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="2" checked type="radio"> Two</label>' . "\n" .
                 '</div>',
                 [1 => 'One', 2 => 'Two'],
                 2,
@@ -391,16 +391,16 @@ public static function dataValue(): array
             ["<div>\n</div>", [], StringEnum::A],
             [
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="one"> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="two"> Two</label>' . "\n" .
+                '<label><input name="test" value="one" type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="two" type="radio"> Two</label>' . "\n" .
                 '</div>',
                 [StringEnum::A->value => 'One', StringEnum::B->value => 'Two'],
                 StringEnum::C,
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="one" checked> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="two"> Two</label>' . "\n" .
+                '<label><input name="test" value="one" checked type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="two" type="radio"> Two</label>' . "\n" .
                 '</div>',
                 [StringEnum::A->value => 'One', StringEnum::B->value => 'Two'],
                 StringEnum::A,
@@ -408,16 +408,16 @@ public static function dataValue(): array
             ["<div>\n</div>", [], IntegerEnum::A],
             [
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
                 '</div>',
                 [IntegerEnum::A->value => 'One', IntegerEnum::B->value => 'Two'],
                 IntegerEnum::C,
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="1" checked> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+                '<label><input name="test" value="1" checked type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
                 '</div>',
                 [IntegerEnum::A->value => 'One', IntegerEnum::B->value => 'Two'],
                 IntegerEnum::A,
@@ -442,22 +442,22 @@ public static function dataForm(): array
         return [
             [
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
                 '</div>',
                 null,
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="1" form> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2" form> Two</label>' . "\n" .
+                '<label><input name="test" value="1" form type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="2" form type="radio"> Two</label>' . "\n" .
                 '</div>',
                 '',
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="1" form="post"> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2" form="post"> Two</label>' . "\n" .
+                '<label><input name="test" value="1" form="post" type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="2" form="post" type="radio"> Two</label>' . "\n" .
                 '</div>',
                 'post',
             ],
@@ -489,8 +489,8 @@ public function testReadonly(): void
 
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="radio" name="test" value="1" readonly> One</label>' . "\n" .
-            '<label><input type="radio" name="test" value="2" readonly> Two</label>' . "\n" .
+            '<label><input name="test" value="1" readonly type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" readonly type="radio"> Two</label>' . "\n" .
             '</div>',
             $checkbox
                 ->readonly()
@@ -499,8 +499,8 @@ public function testReadonly(): void
 
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
             '</div>',
             $checkbox
                 ->readonly(false)
@@ -508,8 +508,8 @@ public function testReadonly(): void
         );
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
             '</div>',
             $checkbox
                 ->readonly(true)
@@ -528,8 +528,8 @@ public function testDisabled(): void
 
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="radio" name="test" value="1" disabled> One</label>' . "\n" .
-            '<label><input type="radio" name="test" value="2" disabled> Two</label>' . "\n" .
+            '<label><input name="test" value="1" disabled type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" disabled type="radio"> Two</label>' . "\n" .
             '</div>',
             $checkbox
                 ->disabled()
@@ -538,8 +538,8 @@ public function testDisabled(): void
 
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
             '</div>',
             $checkbox
                 ->disabled(false)
@@ -547,8 +547,8 @@ public function testDisabled(): void
         );
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-            '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
             '</div>',
             $checkbox
                 ->disabled(true)
@@ -562,16 +562,16 @@ public static function dataUncheckValue(): array
         return [
             [
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
                 '</div>',
                 'test',
                 null,
             ],
             [
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
                 '</div>',
                 'test',
                 null,
@@ -579,8 +579,8 @@ public static function dataUncheckValue(): array
             [
                 '<input type="hidden" name="test" value="7">' . "\n" .
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
                 '</div>',
                 'test',
                 7,
@@ -588,8 +588,8 @@ public static function dataUncheckValue(): array
             [
                 '<input type="hidden" name="test" value="7">' . "\n" .
                 '<div>' . "\n" .
-                '<label><input type="radio" name="test" value="1"> One</label>' . "\n" .
-                '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
+                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
                 '</div>',
                 'test',
                 7,
@@ -616,8 +616,8 @@ public function testUncheckValueDisabled(): void
     {
         $this->assertSame(
             '<input type="hidden" name="test" value="7" disabled>' . "\n" .
-            '<label><input type="radio" name="test" value="1" disabled> One</label>' . "\n" .
-            '<label><input type="radio" name="test" value="2" disabled> Two</label>',
+            '<label><input name="test" value="1" disabled type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" disabled type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -634,8 +634,8 @@ public function testUncheckValueForm(): void
     {
         $this->assertSame(
             '<input type="hidden" name="test" value="7" form="post">' . "\n" .
-            '<label><input type="radio" name="test" value="1" form="post"> One</label>' . "\n" .
-            '<label><input type="radio" name="test" value="2" form="post"> Two</label>',
+            '<label><input name="test" value="1" form="post" type="radio"> One</label>' . "\n" .
+            '<label><input name="test" value="2" form="post" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -652,8 +652,8 @@ public function testSeparator(): void
     {
         $this->assertSame(
             '<div>' . "\n" .
-            '<label><input type="radio" name="test" value="1"> One</label><br>' .
-            '<label><input type="radio" name="test" value="2"> Two</label>' . "\n" .
+            '<label><input name="test" value="1" type="radio"> One</label><br>' .
+            '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
             '</div>',
             RadioList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
@@ -666,8 +666,8 @@ public function testItemFormatter(): void
     {
         $this->assertSame(
             '<div>' . "\n" .
-            '<div>0) <label><input type="radio" name="test" value="1"> One</label></div>' .
-            '<div>1) <label><input type="radio" name="test" value="2"> Two</label></div>' . "\n" .
+            '<div>0) <label><input name="test" value="1" type="radio"> One</label></div>' .
+            '<div>1) <label><input name="test" value="2" type="radio"> Two</label></div>' . "\n" .
             '</div>',
             RadioList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
@@ -700,8 +700,8 @@ public function testDisableRadioLabelWrap(): void
         $this->assertSame(
             <<<HTML
             <div>
-            <input type="radio" id="id1" name="test" value="1"> <label for="id1">One</label>
-            <input type="radio" id="id2" name="test" value="2"> <label for="id2">Two</label>
+            <input name="test" value="1" id="id1" type="radio"> <label for="id1">One</label>
+            <input name="test" value="2" id="id2" type="radio"> <label for="id2">Two</label>
             </div>
             HTML,
             $html,
@@ -720,10 +720,10 @@ public function testRadioWrap(): void
             <<<HTML
             <div>
             <div class="form-check">
-            <label><input type="radio" name="test" value="1"> One</label>
+            <label><input name="test" value="1" type="radio"> One</label>
             </div>
             <div class="form-check">
-            <label><input type="radio" name="test" value="2"> Two</label>
+            <label><input name="test" value="2" type="radio"> Two</label>
             </div>
             </div>
             HTML,
@@ -793,10 +793,10 @@ public function testAddRadioWrapClass(string $expected, array $class): void
             <<<HTML
             <div>
             <div$expected>
-            <label><input type="radio" name="test" value="1"> One</label>
+            <label><input name="test" value="1" type="radio"> One</label>
             </div>
             <div$expected>
-            <label><input type="radio" name="test" value="2"> Two</label>
+            <label><input name="test" value="2" type="radio"> Two</label>
             </div>
             </div>
             HTML,

From 5dbeb8cf104cfe2a7805e43c9d3320875431a357 Mon Sep 17 00:00:00 2001
From: "i.lisitski" <dev05icontext@gmail.com>
Date: Wed, 15 Jan 2025 00:15:25 +0300
Subject: [PATCH 03/12] Fix #234 add changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f7f86b5..d766cb97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 3.9.1 under development
 
 - Bug #232: Render `loading` attribute before `src` (@samdark)
+- Chg #234: Remove tag attributes sorting
 
 ## 3.9.0 November 29, 2024
 

From 3cce6735f5687b9b67b2be83751ea64a1a86c8a6 Mon Sep 17 00:00:00 2001
From: Illia Lisitski <ilyuxa252@gmail.com>
Date: Wed, 15 Jan 2025 15:40:48 +0300
Subject: [PATCH 04/12] Update CHANGELOG.md

Co-authored-by: Alexander Makarov <sam@rmcreative.ru>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d766cb97..2597a2b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## 3.9.1 under development
 
 - Bug #232: Render `loading` attribute before `src` (@samdark)
-- Chg #234: Remove tag attributes sorting
+- Chg #234: Remove tag attributes sorting (@FrankiFixx)
 
 ## 3.9.0 November 29, 2024
 

From 7b99374a569ae5401c990dad2275929c90b5514e Mon Sep 17 00:00:00 2001
From: samdark <47294+samdark@users.noreply.github.com>
Date: Fri, 2 Jan 2026 12:46:09 +0000
Subject: [PATCH 05/12] Apply PHP CS Fixer and Rector changes (CI)

---
 tests/HtmlTest.php                     |  36 +--
 tests/Tag/Base/BooleanInputTagTest.php |  18 +-
 tests/Tag/Base/MediaTagTest.php        |  12 +-
 tests/Tag/ColgroupTest.php             |  10 +-
 tests/Tag/FormTest.php                 |   8 +-
 tests/Tag/Input/FileTest.php           |  20 +-
 tests/Tag/Input/RangeTest.php          |  26 +-
 tests/Tag/InputTest.php                |   8 +-
 tests/Tag/LinkTest.php                 |   4 +-
 tests/Tag/PictureTest.php              |  12 +-
 tests/Tag/SelectTest.php               |   8 +-
 tests/Widget/CheckboxListTest.php      | 330 ++++++++++++-------------
 tests/Widget/RadioListTest.php         | 300 +++++++++++-----------
 13 files changed, 396 insertions(+), 396 deletions(-)

diff --git a/tests/HtmlTest.php b/tests/HtmlTest.php
index a683c43f..7e17c838 100644
--- a/tests/HtmlTest.php
+++ b/tests/HtmlTest.php
@@ -136,7 +136,7 @@ public function testMeta(): void
         $this->assertSame('<meta>', Html::meta()->render());
         $this->assertSame(
             '<meta name="keywords" content="yii" id="main">',
-            Html::meta(['name' => 'keywords', 'content' => 'yii', 'id' => 'main'])->render()
+            Html::meta(['name' => 'keywords', 'content' => 'yii', 'id' => 'main'])->render(),
         );
     }
 
@@ -155,15 +155,15 @@ public function testCssFile(): void
     {
         $this->assertSame(
             '<link rel="stylesheet" href="http://example.com">',
-            Html::cssFile('http://example.com')->render()
+            Html::cssFile('http://example.com')->render(),
         );
         $this->assertSame(
             '<link rel="stylesheet" href>',
-            Html::cssFile('')->render()
+            Html::cssFile('')->render(),
         );
         $this->assertSame(
             '<link rel="stylesheet" href="http://example.com" id="main">',
-            Html::cssFile('http://example.com', ['id' => 'main'])->render()
+            Html::cssFile('http://example.com', ['id' => 'main'])->render(),
         );
     }
 
@@ -179,7 +179,7 @@ public function testJavaScriptFile(): void
         );
         $this->assertSame(
             '<script src="http://example.com" id="main"></script>',
-            Html::javaScriptFile('http://example.com', ['id' => 'main'])->render()
+            Html::javaScriptFile('http://example.com', ['id' => 'main'])->render(),
         );
     }
 
@@ -207,7 +207,7 @@ public function testMailto(): void
         );
         $this->assertSame(
             '<a href="mailto:info@example.com" id="contact">contact me</a>',
-            Html::mailto('contact me', 'info@example.com', ['id' => 'contact'])->render()
+            Html::mailto('contact me', 'info@example.com', ['id' => 'contact'])->render(),
         );
     }
 
@@ -530,12 +530,12 @@ public function testTextarea(): void
     public function testCheckboxList(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="test" value="0">' . "\n" .
-            '<div id="main">' . "\n" .
-            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n" .
-            '<label><input name="test[]" value="5" checked type="checkbox"> Five</label>' . "\n" .
-            '</div>',
+            '<input type="hidden" name="test" value="0">' . "\n"
+            . '<div id="main">' . "\n"
+            . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n"
+            . '<label><input name="test[]" value="5" checked type="checkbox"> Five</label>' . "\n"
+            . '</div>',
             Html::checkboxList('test')
                 ->items([1 => 'One', 2 => 'Two', 5 => 'Five'])
                 ->uncheckValue(0)
@@ -548,12 +548,12 @@ public function testCheckboxList(): void
     public function testRadioList(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="test" value="0">' . "\n" .
-            '<div id="main">' . "\n" .
-            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" checked type="radio"> Two</label>' . "\n" .
-            '<label><input name="test" value="5" type="radio"> Five</label>' . "\n" .
-            '</div>',
+            '<input type="hidden" name="test" value="0">' . "\n"
+            . '<div id="main">' . "\n"
+            . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" checked type="radio"> Two</label>' . "\n"
+            . '<label><input name="test" value="5" type="radio"> Five</label>' . "\n"
+            . '</div>',
             Html::radioList('test')
                 ->items([1 => 'One', 2 => 'Two', 5 => 'Five'])
                 ->uncheckValue(0)
diff --git a/tests/Tag/Base/BooleanInputTagTest.php b/tests/Tag/Base/BooleanInputTagTest.php
index 87b9a949..59bf58fa 100644
--- a/tests/Tag/Base/BooleanInputTagTest.php
+++ b/tests/Tag/Base/BooleanInputTagTest.php
@@ -12,9 +12,9 @@ final class BooleanInputTagTest extends TestCase
 {
     public function testChecked(): void
     {
-        $this->assertSame('<input checked type="test">', (string)TestBooleanInputTag::tag()->checked());
-        $this->assertSame('<input type="test">', (string)TestBooleanInputTag::tag()->checked(false));
-        $this->assertSame('<input type="test">', (string)TestBooleanInputTag::tag()
+        $this->assertSame('<input checked type="test">', (string) TestBooleanInputTag::tag()->checked());
+        $this->assertSame('<input type="test">', (string) TestBooleanInputTag::tag()->checked(false));
+        $this->assertSame('<input type="test">', (string) TestBooleanInputTag::tag()
             ->checked(true)
             ->checked(false));
     }
@@ -190,8 +190,8 @@ public function testUncheckValue(string $expected, ?string $name, $value): void
     public function testUncheckValueDisabled(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="color" value="7" disabled>' .
-            '<input name="color" disabled type="test">',
+            '<input type="hidden" name="color" value="7" disabled>'
+            . '<input name="color" disabled type="test">',
             TestBooleanInputTag::tag()
                 ->name('color')
                 ->uncheckValue(7)
@@ -203,8 +203,8 @@ public function testUncheckValueDisabled(): void
     public function testUncheckValueForm(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="color" value="7" form="post">' .
-            '<input name="color" form="post" type="test">',
+            '<input type="hidden" name="color" value="7" form="post">'
+            . '<input name="color" form="post" type="test">',
             TestBooleanInputTag::tag()
                 ->name('color')
                 ->uncheckValue(7)
@@ -216,8 +216,8 @@ public function testUncheckValueForm(): void
     public function testUncheckValueWithLabel(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="color" value="7">' .
-            '<label><input name="color" type="test"> Seven</label>',
+            '<input type="hidden" name="color" value="7">'
+            . '<label><input name="color" type="test"> Seven</label>',
             TestBooleanInputTag::tag()
                 ->name('color')
                 ->uncheckValue(7)
diff --git a/tests/Tag/Base/MediaTagTest.php b/tests/Tag/Base/MediaTagTest.php
index cfe1078b..f78a2a0a 100644
--- a/tests/Tag/Base/MediaTagTest.php
+++ b/tests/Tag/Base/MediaTagTest.php
@@ -168,12 +168,12 @@ public function testWrongTrackDefault(): void
         );
 
         $this->assertSame(
-            '<test>' . "\n" .
-            '<track kind="captions" src="sampleCaptions.vtt" srclang="en" default>' . "\n" .
-            '<track kind="descriptions" src="sampleDescriptions.vtt" srclang="de">' . "\n" .
-            '<track kind="chapters" src="sampleChapters.vtt" srclang="ja">' . "\n" .
-            '</test>',
-            $tag->render()
+            '<test>' . "\n"
+            . '<track kind="captions" src="sampleCaptions.vtt" srclang="en" default>' . "\n"
+            . '<track kind="descriptions" src="sampleDescriptions.vtt" srclang="de">' . "\n"
+            . '<track kind="chapters" src="sampleChapters.vtt" srclang="ja">' . "\n"
+            . '</test>',
+            $tag->render(),
         );
     }
 
diff --git a/tests/Tag/ColgroupTest.php b/tests/Tag/ColgroupTest.php
index 7756bf17..b843fe6f 100644
--- a/tests/Tag/ColgroupTest.php
+++ b/tests/Tag/ColgroupTest.php
@@ -14,11 +14,11 @@ final class ColgroupTest extends TestCase
     public function testBase(): void
     {
         $this->assertSame(
-            '<colgroup>' . "\n" .
-            '<col>' . "\n" .
-            '<col span="2" class="red">' . "\n" .
-            '<col span="2" class="blue">' . "\n" .
-            '</colgroup>',
+            '<colgroup>' . "\n"
+            . '<col>' . "\n"
+            . '<col span="2" class="red">' . "\n"
+            . '<col span="2" class="blue">' . "\n"
+            . '</colgroup>',
             Colgroup::tag()
                 ->columns(
                     Col::tag(),
diff --git a/tests/Tag/FormTest.php b/tests/Tag/FormTest.php
index d617c8a2..d1e2adde 100644
--- a/tests/Tag/FormTest.php
+++ b/tests/Tag/FormTest.php
@@ -18,10 +18,10 @@ public function testBase(): void
         $tag = Form::tag();
 
         $this->assertSame(
-            '<form method="GET" action="https://example.com/send">' .
-            '<input type="text" name="query">' .
-            '<button type="submit">go</button>' .
-            '</form>',
+            '<form method="GET" action="https://example.com/send">'
+            . '<input type="text" name="query">'
+            . '<button type="submit">go</button>'
+            . '</form>',
             $tag
                 ->method('GET')
                 ->action('https://example.com/send')
diff --git a/tests/Tag/Input/FileTest.php b/tests/Tag/Input/FileTest.php
index cabc3f6a..068205a6 100644
--- a/tests/Tag/Input/FileTest.php
+++ b/tests/Tag/Input/FileTest.php
@@ -55,8 +55,8 @@ public function testUncheckValue(string $expected, ?string $name, $value): void
     public function testUncheckValueDisabled(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="avatar" value="7" disabled>' .
-            '<input name="avatar" disabled type="file">',
+            '<input type="hidden" name="avatar" value="7" disabled>'
+            . '<input name="avatar" disabled type="file">',
             File::tag()
                 ->name('avatar')
                 ->uncheckValue(7)
@@ -68,8 +68,8 @@ public function testUncheckValueDisabled(): void
     public function testUncheckValueForm(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="avatar" value="7" form="post">' .
-            '<input name="avatar" form="post" type="file">',
+            '<input type="hidden" name="avatar" value="7" form="post">'
+            . '<input name="avatar" form="post" type="file">',
             File::tag()
                 ->name('avatar')
                 ->uncheckValue(7)
@@ -89,9 +89,9 @@ public function testUncheckInputAttributes(): void
             ->render();
 
         $this->assertSame(
-            '<input type="hidden" name="avatar" value="7" id="FileHidden" data-key="100" form="post">' .
-            '<input name="avatar" form="post" type="file">',
-            $result
+            '<input type="hidden" name="avatar" value="7" id="FileHidden" data-key="100" form="post">'
+            . '<input name="avatar" form="post" type="file">',
+            $result,
         );
     }
 
@@ -106,9 +106,9 @@ public function testReplaceUncheckInputAttributes(): void
             ->render();
 
         $this->assertSame(
-            '<input type="hidden" name="avatar" value="7" data-key="100" form="post">' .
-            '<input name="avatar" form="post" type="file">',
-            $result
+            '<input type="hidden" name="avatar" value="7" data-key="100" form="post">'
+            . '<input name="avatar" form="post" type="file">',
+            $result,
         );
     }
 
diff --git a/tests/Tag/Input/RangeTest.php b/tests/Tag/Input/RangeTest.php
index 92407401..249fbcc6 100644
--- a/tests/Tag/Input/RangeTest.php
+++ b/tests/Tag/Input/RangeTest.php
@@ -22,7 +22,7 @@ public function testBase(): void
 
         $this->assertSame(
             '<input name="opacity" min="0" max="100" step="10" type="range">',
-            $tag->render()
+            $tag->render(),
         );
     }
 
@@ -122,10 +122,10 @@ public function testAddOutputAttributes(): void
             ->addOutputAttributes(['id' => 'UID']);
 
         $this->assertSame(
-            '<input type="range" ' .
-            'oninput="document.getElementById(&quot;UID&quot;).innerHTML=this.value">' .
-            "\n" . '<span class="red" id="UID">-</span>',
-            $tag->render()
+            '<input type="range" '
+            . 'oninput="document.getElementById(&quot;UID&quot;).innerHTML=this.value">'
+            . "\n" . '<span class="red" id="UID">-</span>',
+            $tag->render(),
         );
     }
 
@@ -179,10 +179,10 @@ public function testOutputWithCustomAttributes(): void
             ->outputAttributes(['class' => 'red']);
 
         $this->assertMatchesRegularExpression(
-            '~<input type="range" ' .
-            'oninput="document\.getElementById\(\&quot;(?<id>rangeOutput\d*)\&quot;\)\.innerHTML=this\.value">' .
-            "\n" . '<span class="red" id="(?P=id)">-</span>~',
-            $tag->render()
+            '~<input type="range" '
+            . 'oninput="document\.getElementById\(\&quot;(?<id>rangeOutput\d*)\&quot;\)\.innerHTML=this\.value">'
+            . "\n" . '<span class="red" id="(?P=id)">-</span>~',
+            $tag->render(),
         );
     }
 
@@ -193,10 +193,10 @@ public function testOutputWithValue(): void
             ->value(10);
 
         $this->assertMatchesRegularExpression(
-            '~<input value="10" type="range" ' .
-            'oninput="document\.getElementById\(\&quot;(?<id>rangeOutput\d*)\&quot;\)\.innerHTML=this\.value">' .
-            "\n" . '<span id="(?P=id)">10</span>~',
-            $tag->render()
+            '~<input value="10" type="range" '
+            . 'oninput="document\.getElementById\(\&quot;(?<id>rangeOutput\d*)\&quot;\)\.innerHTML=this\.value">'
+            . "\n" . '<span id="(?P=id)">10</span>~',
+            $tag->render(),
         );
     }
 
diff --git a/tests/Tag/InputTest.php b/tests/Tag/InputTest.php
index 16a37d68..a559617f 100644
--- a/tests/Tag/InputTest.php
+++ b/tests/Tag/InputTest.php
@@ -49,7 +49,7 @@ public function testFile(): void
     {
         $this->assertSame(
             '<input name="photo" value="c:\path\" type="file">',
-            (string)Input::file('photo', 'c:\\path\\')
+            (string) Input::file('photo', 'c:\\path\\'),
         );
     }
 
@@ -57,7 +57,7 @@ public function testCheckbox(): void
     {
         $this->assertSame(
             '<input name="subscribe" checked type="checkbox">',
-            (string)Input::checkbox('subscribe')->checked()
+            (string) Input::checkbox('subscribe')->checked(),
         );
     }
 
@@ -65,7 +65,7 @@ public function testRadio(): void
     {
         $this->assertSame(
             '<input name="count" value="one" type="radio">',
-            (string)Input::radio('count', 'one')
+            (string) Input::radio('count', 'one'),
         );
     }
 
@@ -73,7 +73,7 @@ public function testRange(): void
     {
         $this->assertSame(
             '<input name="count" value="10" type="range">',
-            (string) Input::range('count', 10)
+            (string) Input::range('count', 10),
         );
     }
 
diff --git a/tests/Tag/LinkTest.php b/tests/Tag/LinkTest.php
index d9a217c2..edd45638 100644
--- a/tests/Tag/LinkTest.php
+++ b/tests/Tag/LinkTest.php
@@ -14,7 +14,7 @@ public function testBase(): void
     {
         $this->assertSame(
             '<link href="/rss" type="application/rss+xml" rel="alternate" title="Новости компании">',
-            (string)Link::tag()
+            (string) Link::tag()
                 ->url('/rss')
                 ->type('application/rss+xml')
                 ->rel('alternate')
@@ -26,7 +26,7 @@ public function testToCssFile(): void
     {
         $this->assertSame(
             '<link rel="stylesheet" href="main.css">',
-            (string)Link::toCssFile('main.css')
+            (string) Link::toCssFile('main.css'),
         );
     }
 
diff --git a/tests/Tag/PictureTest.php b/tests/Tag/PictureTest.php
index fc727ff8..f0019941 100644
--- a/tests/Tag/PictureTest.php
+++ b/tests/Tag/PictureTest.php
@@ -30,12 +30,12 @@ public function testBase(): void
             );
 
         $this->assertSame(
-            '<picture>' . "\n" .
-            '<source media="(min-width:650px)" srcset="img_pink_flowers.jpg" type="image/jpeg">' . "\n" .
-            '<source media="(min-width:465px)" srcset="img_white_flower.jpg" type="image/jpeg">' . "\n" .
-            '<img src="img_orange_flowers.jpg" alt="Flowers">' . "\n" .
-            '</picture>',
-            $picture->render()
+            '<picture>' . "\n"
+            . '<source media="(min-width:650px)" srcset="img_pink_flowers.jpg" type="image/jpeg">' . "\n"
+            . '<source media="(min-width:465px)" srcset="img_white_flower.jpg" type="image/jpeg">' . "\n"
+            . '<img src="img_orange_flowers.jpg" alt="Flowers">' . "\n"
+            . '</picture>',
+            $picture->render(),
         );
     }
 
diff --git a/tests/Tag/SelectTest.php b/tests/Tag/SelectTest.php
index dc410638..eb30355c 100644
--- a/tests/Tag/SelectTest.php
+++ b/tests/Tag/SelectTest.php
@@ -37,13 +37,13 @@ public static function dataNameForMultiple(): array
             ['<select multiple></select>', null],
             ['<select multiple name></select>', ''],
             [
-                '<input type="hidden" name="age" value>' . "\n" .
-                '<select multiple name="age[]"></select>',
+                '<input type="hidden" name="age" value>' . "\n"
+                . '<select multiple name="age[]"></select>',
                 'age',
             ],
             [
-                '<input type="hidden" name="place" value>' . "\n" .
-                '<select multiple name="place[]"></select>',
+                '<input type="hidden" name="place" value>' . "\n"
+                . '<select multiple name="place[]"></select>',
                 'place[]',
             ],
         ];
diff --git a/tests/Widget/CheckboxListTest.php b/tests/Widget/CheckboxListTest.php
index 2df4810e..edd2d2ff 100644
--- a/tests/Widget/CheckboxListTest.php
+++ b/tests/Widget/CheckboxListTest.php
@@ -19,12 +19,12 @@ final class CheckboxListTest extends TestCase
     public function testBase(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="test" value="0">' . "\n" .
-            '<div id="main">' . "\n" .
-            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n" .
-            '<label><input name="test[]" value="5" checked type="checkbox"> Five</label>' . "\n" .
-            '</div>',
+            '<input type="hidden" name="test" value="0">' . "\n"
+            . '<div id="main">' . "\n"
+            . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n"
+            . '<label><input name="test[]" value="5" checked type="checkbox"> Five</label>' . "\n"
+            . '</div>',
             CheckboxList::create('test')
                 ->items([1 => 'One', 2 => 'Two', 5 => 'Five'])
                 ->uncheckValue(0)
@@ -41,10 +41,10 @@ public function testName(): void
             ->name('b');
 
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="b[]" value="1" type="checkbox"> One</label>' . "\n" .
-            '</div>',
-            $widget->render()
+            '<div>' . "\n"
+            . '<label><input name="b[]" value="1" type="checkbox"> One</label>' . "\n"
+            . '</div>',
+            $widget->render(),
         );
     }
 
@@ -71,9 +71,9 @@ public static function dataContainerTag(): array
                 '',
             ],
             [
-                '<section>' . "\n" .
-                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-                '</section>',
+                '<section>' . "\n"
+                . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+                . '</section>',
                 'section',
             ],
         ];
@@ -94,9 +94,9 @@ public function testContainerTag(string $expected, ?string $name): void
     public function testContainerAttributes(): void
     {
         $this->assertSame(
-            '<div id="main">' . "\n" .
-            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-            '</div>',
+            '<div id="main">' . "\n"
+            . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+            . '</div>',
             CheckboxList::create('test')
                 ->items([1 => 'One'])
                 ->containerAttributes(['id' => 'main'])
@@ -107,8 +107,8 @@ public function testContainerAttributes(): void
     public function testCheckboxAttributes(): void
     {
         $this->assertSame(
-            '<label><input name="test[]" value="1" class="red" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" class="red" type="checkbox"> Two</label>',
+            '<label><input name="test[]" value="1" class="red" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" class="red" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -123,8 +123,8 @@ public function testCheckboxAttributes(): void
     public function testCheckboxAttributesMerge(): void
     {
         $this->assertSame(
-            '<label><input name="test[]" value="1" readonly class="red" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" readonly class="red" type="checkbox"> Two</label>',
+            '<label><input name="test[]" value="1" readonly class="red" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" readonly class="red" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -140,8 +140,8 @@ public function testCheckboxAttributesMerge(): void
     public function testReplaceCheckboxAttributes(): void
     {
         $this->assertSame(
-            '<label><input name="test[]" value="1" class="red" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" class="red" type="checkbox"> Two</label>',
+            '<label><input name="test[]" value="1" class="red" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" class="red" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -157,8 +157,8 @@ public function testReplaceCheckboxAttributes(): void
     public function testCheckboxLabelAttributes(): void
     {
         $this->assertSame(
-            '<label class="red"><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-            '<label class="red"><input name="test[]" value="2" type="checkbox"> Two</label>',
+            '<label class="red"><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+            . '<label class="red"><input name="test[]" value="2" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
                 ->checkboxLabelAttributes(['class' => 'red'])
@@ -170,8 +170,8 @@ public function testCheckboxLabelAttributes(): void
     public function testCheckboxLabelAttributesMerge(): void
     {
         $this->assertSame(
-            '<label class="red" data-type="label"><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-            '<label class="red" data-type="label"><input name="test[]" value="2" type="checkbox"> Two</label>',
+            '<label class="red" data-type="label"><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+            . '<label class="red" data-type="label"><input name="test[]" value="2" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
                 ->checkboxLabelAttributes(['class' => 'red'])
@@ -184,9 +184,9 @@ public function testCheckboxLabelAttributesMerge(): void
     public function testAddIndividualInputAttributes(): void
     {
         $this->assertSame(
-            '<label><input name="test[]" value="1" class="red" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" class="blue" type="checkbox"> Two</label>' . "\n" .
-            '<label><input name="test[]" value="3" class="green" type="checkbox"> Three</label>',
+            '<label><input name="test[]" value="1" class="red" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" class="blue" type="checkbox"> Two</label>' . "\n"
+            . '<label><input name="test[]" value="3" class="green" type="checkbox"> Three</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -206,9 +206,9 @@ public function testAddIndividualInputAttributes(): void
     public function testIndividualUncheckInputAttributes(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="test" value="0" class="blue">' . "\n" .
-            '<label><input name="test[]" value="1" class="red" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" class="red" type="checkbox"> Two</label>',
+            '<input type="hidden" name="test" value="0" class="blue">' . "\n"
+            . '<label><input name="test[]" value="1" class="red" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" class="red" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -227,9 +227,9 @@ public function testIndividualUncheckInputAttributes(): void
     public function testIndividualInputAttributesMerge(): void
     {
         $this->assertSame(
-            '<label><input name="test[]" value="1" class="yellow" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" class="cyan" type="checkbox"> Two</label>' . "\n" .
-            '<label><input name="test[]" value="3" class="green" type="checkbox"> Three</label>',
+            '<label><input name="test[]" value="1" class="yellow" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" class="cyan" type="checkbox"> Two</label>' . "\n"
+            . '<label><input name="test[]" value="3" class="green" type="checkbox"> Three</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -253,9 +253,9 @@ public function testIndividualInputAttributesMerge(): void
     public function testIndividualInputAttributesReplace(): void
     {
         $this->assertSame(
-            '<label><input name="test[]" value="1" class="yellow" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" class="red" type="checkbox"> Two</label>' . "\n" .
-            '<label><input name="test[]" value="3" class="red" type="checkbox"> Three</label>',
+            '<label><input name="test[]" value="1" class="yellow" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" class="red" type="checkbox"> Two</label>' . "\n"
+            . '<label><input name="test[]" value="3" class="red" type="checkbox"> Three</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -278,8 +278,8 @@ public function testIndividualInputAttributesReplace(): void
     public function testItems(): void
     {
         $this->assertSame(
-            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" type="checkbox"> &lt;b&gt;Two&lt;/b&gt;</label>',
+            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" type="checkbox"> &lt;b&gt;Two&lt;/b&gt;</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -293,8 +293,8 @@ public function testItems(): void
     public function testItemsWithoutEncodeLabel(): void
     {
         $this->assertSame(
-            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" type="checkbox"> <b>Two</b></label>',
+            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" type="checkbox"> <b>Two</b></label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -309,18 +309,18 @@ public static function dataItemsFromValues(): array
     {
         return [
             [
-                '<label><input name="test[]" value="1" type="checkbox"> 1</label>' . "\n" .
-                '<label><input name="test[]" value="2" type="checkbox"> 2</label>',
+                '<label><input name="test[]" value="1" type="checkbox"> 1</label>' . "\n"
+                . '<label><input name="test[]" value="2" type="checkbox"> 2</label>',
                 [1, 2],
             ],
             [
-                '<label><input name="test[]" value="One" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="&lt;b&gt;Two&lt;/b&gt;" type="checkbox"> &lt;b&gt;Two&lt;/b&gt;</label>',
+                '<label><input name="test[]" value="One" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="&lt;b&gt;Two&lt;/b&gt;" type="checkbox"> &lt;b&gt;Two&lt;/b&gt;</label>',
                 ['One', '<b>Two</b>'],
             ],
             [
-                '<label><input name="test[]" value="1" type="checkbox"> 1</label>' . "\n" .
-                '<label><input name="test[]" value type="checkbox"></label>',
+                '<label><input name="test[]" value="1" type="checkbox"> 1</label>' . "\n"
+                . '<label><input name="test[]" value type="checkbox"></label>',
                 [true, false],
             ],
         ];
@@ -341,8 +341,8 @@ public function testItemsFromValues(string $expected, array $values): void
     public function testItemsFromValuesWithoutEncodeLabel(): void
     {
         $this->assertSame(
-            '<label><input name="test[]" value="One" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="&lt;b&gt;Two&lt;/b&gt;" type="checkbox"> <b>Two</b></label>',
+            '<label><input name="test[]" value="One" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="&lt;b&gt;Two&lt;/b&gt;" type="checkbox"> <b>Two</b></label>',
             CheckboxList::create('test')
                 ->itemsFromValues([
                     'One',
@@ -359,95 +359,95 @@ public static function dataValue(): array
             ["<div>\n</div>", [], []],
             ["<div>\n</div>", [], [42]],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 [1 => 'One', 2 => 'Two'],
                 [],
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 [1 => 'One', 2 => 'Two'],
                 [7],
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" checked type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="1" checked type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 [1 => 'One', 2 => 'Two'],
                 [1],
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 [1 => 'One', 2 => 'Two'],
                 [2],
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" checked type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-                '<label><input name="test[]" value="3" checked type="checkbox"> Three</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="1" checked type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+                . '<label><input name="test[]" value="3" checked type="checkbox"> Three</label>' . "\n"
+                . '</div>',
                 [1 => 'One', 2 => 'Two', 3 => 'Three'],
                 [1, 3],
             ],
             ["<div>\n</div>", [], [StringEnum::A]],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="one" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="two" type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="one" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="two" type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 [StringEnum::A->value => 'One', StringEnum::B->value => 'Two'],
                 [StringEnum::C],
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="one" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="two" checked type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="one" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="two" checked type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 [StringEnum::A->value => 'One', StringEnum::B->value => 'Two'],
                 [StringEnum::B],
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="one" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="two" checked type="checkbox"> Two</label>' . "\n" .
-                '<label><input name="test[]" value="three" checked type="checkbox"> Three</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="one" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="two" checked type="checkbox"> Two</label>' . "\n"
+                . '<label><input name="test[]" value="three" checked type="checkbox"> Three</label>' . "\n"
+                . '</div>',
                 [StringEnum::A->value => 'One', StringEnum::B->value => 'Two', StringEnum::C->value => 'Three'],
                 [StringEnum::B, StringEnum::C],
             ],
             ["<div>\n</div>", [], [IntegerEnum::A]],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 [IntegerEnum::A->value => 'One', IntegerEnum::B->value => 'Two'],
                 [IntegerEnum::C],
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 [IntegerEnum::A->value => 'One', IntegerEnum::B->value => 'Two'],
                 [IntegerEnum::B],
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n" .
-                '<label><input name="test[]" value="3" checked type="checkbox"> Three</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" checked type="checkbox"> Two</label>' . "\n"
+                . '<label><input name="test[]" value="3" checked type="checkbox"> Three</label>' . "\n"
+                . '</div>',
                 [IntegerEnum::A->value => 'One', IntegerEnum::B->value => 'Two', IntegerEnum::C->value => 'Three'],
                 [IntegerEnum::B, IntegerEnum::C],
             ],
@@ -491,24 +491,24 @@ public static function dataForm(): array
     {
         return [
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 null,
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" form type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" form type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="1" form type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" form type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 '',
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" form="post" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" form="post" type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="1" form="post" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" form="post" type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 'post',
             ],
         ];
@@ -538,29 +538,29 @@ public function testReadonly(): void
             ]);
 
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test[]" value="1" readonly type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" readonly type="checkbox"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test[]" value="1" readonly type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" readonly type="checkbox"> Two</label>' . "\n"
+            . '</div>',
             $checkbox
                 ->readonly()
                 ->render(),
         );
 
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+            . '</div>',
             $checkbox
                 ->readonly(false)
                 ->render(),
         );
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+            . '</div>',
             $checkbox
                 ->readonly(true)
                 ->readonly(false)
@@ -577,29 +577,29 @@ public function testDisabled(): void
             ]);
 
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test[]" value="1" disabled type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" disabled type="checkbox"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test[]" value="1" disabled type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" disabled type="checkbox"> Two</label>' . "\n"
+            . '</div>',
             $checkbox
                 ->disabled()
                 ->render(),
         );
 
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+            . '</div>',
             $checkbox
                 ->disabled(false)
                 ->render(),
         );
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+            . '</div>',
             $checkbox
                 ->disabled(true)
                 ->disabled(false)
@@ -611,36 +611,36 @@ public static function dataUncheckValue(): array
     {
         return [
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 'test',
                 null,
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 'test[]',
                 null,
             ],
             [
-                '<input type="hidden" name="test" value="7">' . "\n" .
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<input type="hidden" name="test" value="7">' . "\n"
+                . '<div>' . "\n"
+                . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 'test',
                 7,
             ],
             [
-                '<input type="hidden" name="test" value="7">' . "\n" .
-                '<div>' . "\n" .
-                '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n" .
-                '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-                '</div>',
+                '<input type="hidden" name="test" value="7">' . "\n"
+                . '<div>' . "\n"
+                . '<label><input name="test[]" value="1" type="checkbox"> One</label>' . "\n"
+                . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+                . '</div>',
                 'test[]',
                 7,
             ],
@@ -665,9 +665,9 @@ public function testUncheckValue(string $expected, string $name, $value): void
     public function testUncheckValueDisabled(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="test" value="7" disabled>' . "\n" .
-            '<label><input name="test[]" value="1" disabled type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" disabled type="checkbox"> Two</label>',
+            '<input type="hidden" name="test" value="7" disabled>' . "\n"
+            . '<label><input name="test[]" value="1" disabled type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" disabled type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -683,9 +683,9 @@ public function testUncheckValueDisabled(): void
     public function testUncheckValueForm(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="test" value="7" form="post">' . "\n" .
-            '<label><input name="test[]" value="1" form="post" type="checkbox"> One</label>' . "\n" .
-            '<label><input name="test[]" value="2" form="post" type="checkbox"> Two</label>',
+            '<input type="hidden" name="test" value="7" form="post">' . "\n"
+            . '<label><input name="test[]" value="1" form="post" type="checkbox"> One</label>' . "\n"
+            . '<label><input name="test[]" value="2" form="post" type="checkbox"> Two</label>',
             CheckboxList::create('test')
                 ->items([
                     1 => 'One',
@@ -701,10 +701,10 @@ public function testUncheckValueForm(): void
     public function testSeparator(): void
     {
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test[]" value="1" type="checkbox"> One</label><br>' .
-            '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test[]" value="1" type="checkbox"> One</label><br>'
+            . '<label><input name="test[]" value="2" type="checkbox"> Two</label>' . "\n"
+            . '</div>',
             CheckboxList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
                 ->separator('<br>')
@@ -715,10 +715,10 @@ public function testSeparator(): void
     public function testItemFormatter(): void
     {
         $this->assertSame(
-            '<div>' . "\n" .
-            '<div>0) <label><input name="test[]" value="1" type="checkbox"> One</label></div>' .
-            '<div>1) <label><input name="test[]" value="2" type="checkbox"> Two</label></div>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<div>0) <label><input name="test[]" value="1" type="checkbox"> One</label></div>'
+            . '<div>1) <label><input name="test[]" value="2" type="checkbox"> Two</label></div>' . "\n"
+            . '</div>',
             CheckboxList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
                 ->itemFormatter(fn(CheckboxItem $item): string => '<div>'
diff --git a/tests/Widget/RadioListTest.php b/tests/Widget/RadioListTest.php
index e255d098..8c9333e6 100644
--- a/tests/Widget/RadioListTest.php
+++ b/tests/Widget/RadioListTest.php
@@ -17,12 +17,12 @@ final class RadioListTest extends TestCase
     public function testBase(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="test" value="0">' . "\n" .
-            '<div id="main">' . "\n" .
-            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" checked type="radio"> Two</label>' . "\n" .
-            '<label><input name="test" value="5" type="radio"> Five</label>' . "\n" .
-            '</div>',
+            '<input type="hidden" name="test" value="0">' . "\n"
+            . '<div id="main">' . "\n"
+            . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" checked type="radio"> Two</label>' . "\n"
+            . '<label><input name="test" value="5" type="radio"> Five</label>' . "\n"
+            . '</div>',
             RadioList::create('test')
                 ->items([1 => 'One', 2 => 'Two', 5 => 'Five'])
                 ->uncheckValue(0)
@@ -39,10 +39,10 @@ public function testName(): void
             ->name('b');
 
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="b" value="1" type="radio"> One</label>' . "\n" .
-            '</div>',
-            $widget->render()
+            '<div>' . "\n"
+            . '<label><input name="b" value="1" type="radio"> One</label>' . "\n"
+            . '</div>',
+            $widget->render(),
         );
     }
 
@@ -69,9 +69,9 @@ public static function dataContainerTag(): array
                 '',
             ],
             [
-                '<section>' . "\n" .
-                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-                '</section>',
+                '<section>' . "\n"
+                . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+                . '</section>',
                 'section',
             ],
         ];
@@ -92,9 +92,9 @@ public function testContainerTag(string $expected, ?string $name): void
     public function testContainerAttributes(): void
     {
         $this->assertSame(
-            '<div id="main">' . "\n" .
-            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-            '</div>',
+            '<div id="main">' . "\n"
+            . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+            . '</div>',
             RadioList::create('test')
                 ->items([1 => 'One'])
                 ->containerAttributes(['id' => 'main'])
@@ -105,8 +105,8 @@ public function testContainerAttributes(): void
     public function testRadioAttributes(): void
     {
         $this->assertSame(
-            '<label><input name="test" value="1" class="red" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" class="red" type="radio"> Two</label>',
+            '<label><input name="test" value="1" class="red" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" class="red" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -121,8 +121,8 @@ public function testRadioAttributes(): void
     public function testRadioAttributesMerge(): void
     {
         $this->assertSame(
-            '<label><input name="test" value="1" readonly class="red" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" readonly class="red" type="radio"> Two</label>',
+            '<label><input name="test" value="1" readonly class="red" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" readonly class="red" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -138,8 +138,8 @@ public function testRadioAttributesMerge(): void
     public function testReplaceRadioAttributes(): void
     {
         $this->assertSame(
-            '<label><input name="test" value="1" class="red" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" class="red" type="radio"> Two</label>',
+            '<label><input name="test" value="1" class="red" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" class="red" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -155,8 +155,8 @@ public function testReplaceRadioAttributes(): void
     public function testRadioLabelAttributes(): void
     {
         $this->assertSame(
-            '<label class="red"><input name="test" value="1" type="radio"> One</label>' . "\n" .
-            '<label class="red"><input name="test" value="2" type="radio"> Two</label>',
+            '<label class="red"><input name="test" value="1" type="radio"> One</label>' . "\n"
+            . '<label class="red"><input name="test" value="2" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
                 ->radioLabelAttributes(['class' => 'red'])
@@ -168,8 +168,8 @@ public function testRadioLabelAttributes(): void
     public function testRadioLabelAttributesMerge(): void
     {
         $this->assertSame(
-            '<label class="red" data-type="label"><input name="test" value="1" type="radio"> One</label>' . "\n" .
-            '<label class="red" data-type="label"><input name="test" value="2" type="radio"> Two</label>',
+            '<label class="red" data-type="label"><input name="test" value="1" type="radio"> One</label>' . "\n"
+            . '<label class="red" data-type="label"><input name="test" value="2" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
                 ->radioLabelAttributes(['class' => 'red'])
@@ -182,9 +182,9 @@ public function testRadioLabelAttributesMerge(): void
     public function testIndividualInputAttributes(): void
     {
         $this->assertSame(
-            '<label><input name="test" value="1" class="red" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" class="blue" type="radio"> Two</label>' . "\n" .
-            '<label><input name="test" value="3" class="green" type="radio"> Three</label>',
+            '<label><input name="test" value="1" class="red" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" class="blue" type="radio"> Two</label>' . "\n"
+            . '<label><input name="test" value="3" class="green" type="radio"> Three</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -204,9 +204,9 @@ public function testIndividualInputAttributes(): void
     public function testIndividualUncheckInputAttributes(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="test" value="0" class="blue">' . "\n" .
-            '<label><input name="test" value="1" class="red" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" class="red" type="radio"> Two</label>',
+            '<input type="hidden" name="test" value="0" class="blue">' . "\n"
+            . '<label><input name="test" value="1" class="red" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" class="red" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -225,9 +225,9 @@ public function testIndividualUncheckInputAttributes(): void
     public function testIndividualInputAttributesMerge(): void
     {
         $this->assertSame(
-            '<label><input name="test" value="1" class="yellow" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" class="cyan" type="radio"> Two</label>' . "\n" .
-            '<label><input name="test" value="3" class="green" type="radio"> Three</label>',
+            '<label><input name="test" value="1" class="yellow" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" class="cyan" type="radio"> Two</label>' . "\n"
+            . '<label><input name="test" value="3" class="green" type="radio"> Three</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -251,9 +251,9 @@ public function testIndividualInputAttributesMerge(): void
     public function testIndividualInputAttributesReplace(): void
     {
         $this->assertSame(
-            '<label><input name="test" value="1" class="yellow" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" class="red" type="radio"> Two</label>' . "\n" .
-            '<label><input name="test" value="3" class="red" type="radio"> Three</label>',
+            '<label><input name="test" value="1" class="yellow" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" class="red" type="radio"> Two</label>' . "\n"
+            . '<label><input name="test" value="3" class="red" type="radio"> Three</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -276,8 +276,8 @@ public function testIndividualInputAttributesReplace(): void
     public function testItems(): void
     {
         $this->assertSame(
-            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" type="radio"> &lt;b&gt;Two&lt;/b&gt;</label>',
+            '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" type="radio"> &lt;b&gt;Two&lt;/b&gt;</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -291,8 +291,8 @@ public function testItems(): void
     public function testItemsWithoutEncodeLabel(): void
     {
         $this->assertSame(
-            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" type="radio"> <b>Two</b></label>',
+            '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" type="radio"> <b>Two</b></label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -307,18 +307,18 @@ public static function dataItemsFromValues(): array
     {
         return [
             [
-                '<label><input name="test" value="1" type="radio"> 1</label>' . "\n" .
-                '<label><input name="test" value="2" type="radio"> 2</label>',
+                '<label><input name="test" value="1" type="radio"> 1</label>' . "\n"
+                . '<label><input name="test" value="2" type="radio"> 2</label>',
                 [1, 2],
             ],
             [
-                '<label><input name="test" value="One" type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="&lt;b&gt;Two&lt;/b&gt;" type="radio"> &lt;b&gt;Two&lt;/b&gt;</label>',
+                '<label><input name="test" value="One" type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="&lt;b&gt;Two&lt;/b&gt;" type="radio"> &lt;b&gt;Two&lt;/b&gt;</label>',
                 ['One', '<b>Two</b>'],
             ],
             [
-                '<label><input name="test" value="1" type="radio"> 1</label>' . "\n" .
-                '<label><input name="test" value type="radio"></label>',
+                '<label><input name="test" value="1" type="radio"> 1</label>' . "\n"
+                . '<label><input name="test" value type="radio"></label>',
                 [true, false],
             ],
         ];
@@ -339,8 +339,8 @@ public function testItemsFromValues(string $expected, array $values): void
     public function testItemsFromValuesWithoutEncodeLabel(): void
     {
         $this->assertSame(
-            '<label><input name="test" value="One" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="&lt;b&gt;Two&lt;/b&gt;" type="radio"> <b>Two</b></label>',
+            '<label><input name="test" value="One" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="&lt;b&gt;Two&lt;/b&gt;" type="radio"> <b>Two</b></label>',
             RadioList::create('test')
                 ->itemsFromValues([
                     'One',
@@ -357,68 +357,68 @@ public static function dataValue(): array
             ["<div>\n</div>", [], null],
             ["<div>\n</div>", [], 42],
             [
-                '<div>' . "\n" .
-                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+                . '</div>',
                 [1 => 'One', 2 => 'Two'],
                 null,
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+                . '</div>',
                 [1 => 'One', 2 => 'Two'],
                 7,
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test" value="1" checked type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test" value="1" checked type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+                . '</div>',
                 [1 => 'One', 2 => 'Two'],
                 1,
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="2" checked type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="2" checked type="radio"> Two</label>' . "\n"
+                . '</div>',
                 [1 => 'One', 2 => 'Two'],
                 2,
             ],
             ["<div>\n</div>", [], StringEnum::A],
             [
-                '<div>' . "\n" .
-                '<label><input name="test" value="one" type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="two" type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test" value="one" type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="two" type="radio"> Two</label>' . "\n"
+                . '</div>',
                 [StringEnum::A->value => 'One', StringEnum::B->value => 'Two'],
                 StringEnum::C,
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test" value="one" checked type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="two" type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test" value="one" checked type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="two" type="radio"> Two</label>' . "\n"
+                . '</div>',
                 [StringEnum::A->value => 'One', StringEnum::B->value => 'Two'],
                 StringEnum::A,
             ],
             ["<div>\n</div>", [], IntegerEnum::A],
             [
-                '<div>' . "\n" .
-                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+                . '</div>',
                 [IntegerEnum::A->value => 'One', IntegerEnum::B->value => 'Two'],
                 IntegerEnum::C,
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test" value="1" checked type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test" value="1" checked type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+                . '</div>',
                 [IntegerEnum::A->value => 'One', IntegerEnum::B->value => 'Two'],
                 IntegerEnum::A,
             ],
@@ -441,24 +441,24 @@ public static function dataForm(): array
     {
         return [
             [
-                '<div>' . "\n" .
-                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+                . '</div>',
                 null,
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test" value="1" form type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="2" form type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test" value="1" form type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="2" form type="radio"> Two</label>' . "\n"
+                . '</div>',
                 '',
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test" value="1" form="post" type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="2" form="post" type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test" value="1" form="post" type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="2" form="post" type="radio"> Two</label>' . "\n"
+                . '</div>',
                 'post',
             ],
         ];
@@ -488,29 +488,29 @@ public function testReadonly(): void
             ]);
 
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test" value="1" readonly type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" readonly type="radio"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test" value="1" readonly type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" readonly type="radio"> Two</label>' . "\n"
+            . '</div>',
             $checkbox
                 ->readonly()
                 ->render(),
         );
 
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+            . '</div>',
             $checkbox
                 ->readonly(false)
                 ->render(),
         );
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+            . '</div>',
             $checkbox
                 ->readonly(true)
                 ->readonly(false)
@@ -527,29 +527,29 @@ public function testDisabled(): void
             ]);
 
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test" value="1" disabled type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" disabled type="radio"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test" value="1" disabled type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" disabled type="radio"> Two</label>' . "\n"
+            . '</div>',
             $checkbox
                 ->disabled()
                 ->render(),
         );
 
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+            . '</div>',
             $checkbox
                 ->disabled(false)
                 ->render(),
         );
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+            . '</div>',
             $checkbox
                 ->disabled(true)
                 ->disabled(false)
@@ -561,36 +561,36 @@ public static function dataUncheckValue(): array
     {
         return [
             [
-                '<div>' . "\n" .
-                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+                . '</div>',
                 'test',
                 null,
             ],
             [
-                '<div>' . "\n" .
-                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<div>' . "\n"
+                . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+                . '</div>',
                 'test',
                 null,
             ],
             [
-                '<input type="hidden" name="test" value="7">' . "\n" .
-                '<div>' . "\n" .
-                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<input type="hidden" name="test" value="7">' . "\n"
+                . '<div>' . "\n"
+                . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+                . '</div>',
                 'test',
                 7,
             ],
             [
-                '<input type="hidden" name="test" value="7">' . "\n" .
-                '<div>' . "\n" .
-                '<label><input name="test" value="1" type="radio"> One</label>' . "\n" .
-                '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-                '</div>',
+                '<input type="hidden" name="test" value="7">' . "\n"
+                . '<div>' . "\n"
+                . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+                . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+                . '</div>',
                 'test',
                 7,
             ],
@@ -615,9 +615,9 @@ public function testUncheckValue(string $expected, string $name, $value): void
     public function testUncheckValueDisabled(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="test" value="7" disabled>' . "\n" .
-            '<label><input name="test" value="1" disabled type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" disabled type="radio"> Two</label>',
+            '<input type="hidden" name="test" value="7" disabled>' . "\n"
+            . '<label><input name="test" value="1" disabled type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" disabled type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -633,9 +633,9 @@ public function testUncheckValueDisabled(): void
     public function testUncheckValueForm(): void
     {
         $this->assertSame(
-            '<input type="hidden" name="test" value="7" form="post">' . "\n" .
-            '<label><input name="test" value="1" form="post" type="radio"> One</label>' . "\n" .
-            '<label><input name="test" value="2" form="post" type="radio"> Two</label>',
+            '<input type="hidden" name="test" value="7" form="post">' . "\n"
+            . '<label><input name="test" value="1" form="post" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" form="post" type="radio"> Two</label>',
             RadioList::create('test')
                 ->items([
                     1 => 'One',
@@ -651,10 +651,10 @@ public function testUncheckValueForm(): void
     public function testSeparator(): void
     {
         $this->assertSame(
-            '<div>' . "\n" .
-            '<label><input name="test" value="1" type="radio"> One</label><br>' .
-            '<label><input name="test" value="2" type="radio"> Two</label>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<label><input name="test" value="1" type="radio"> One</label><br>'
+            . '<label><input name="test" value="2" type="radio"> Two</label>' . "\n"
+            . '</div>',
             RadioList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
                 ->separator('<br>')
@@ -665,10 +665,10 @@ public function testSeparator(): void
     public function testItemFormatter(): void
     {
         $this->assertSame(
-            '<div>' . "\n" .
-            '<div>0) <label><input name="test" value="1" type="radio"> One</label></div>' .
-            '<div>1) <label><input name="test" value="2" type="radio"> Two</label></div>' . "\n" .
-            '</div>',
+            '<div>' . "\n"
+            . '<div>0) <label><input name="test" value="1" type="radio"> One</label></div>'
+            . '<div>1) <label><input name="test" value="2" type="radio"> Two</label></div>' . "\n"
+            . '</div>',
             RadioList::create('test')
                 ->items([1 => 'One', 2 => 'Two'])
                 ->itemFormatter(fn(RadioItem $item): string => '<div>'

From 149ad617fda3e4a5bb3a3b5840dc2b4ecca96b66 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 2 Jan 2026 16:29:50 +0300
Subject: [PATCH 06/12] Fix test

---
 tests/HtmlTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/HtmlTest.php b/tests/HtmlTest.php
index 7e17c838..2ba682cc 100644
--- a/tests/HtmlTest.php
+++ b/tests/HtmlTest.php
@@ -706,7 +706,7 @@ public function testLi(): void
         $this->assertSame('<li><span>Hello</span></li>', Html::li(Html::span('Hello'))->render());
 
         $this->assertSame(
-            '<li id="item-1" class="item">Content</li>',
+            '<li class="item" id="item-1">Content</li>',
             Html::li('Content', ['class' => 'item', 'id' => 'item-1'])->render(),
         );
         $this->assertSame('<li class="empty"></li>', Html::li(attributes: ['class' => 'empty'])->render());

From cca3a4ef832ef4cc0f400c1b51baee421be23051 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 2 Jan 2026 16:30:48 +0300
Subject: [PATCH 07/12] Fix assertion in ColorTest for input rendering

---
 tests/Tag/Input/ColorTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Tag/Input/ColorTest.php b/tests/Tag/Input/ColorTest.php
index 576299ff..b30d761d 100644
--- a/tests/Tag/Input/ColorTest.php
+++ b/tests/Tag/Input/ColorTest.php
@@ -12,7 +12,7 @@ final class ColorTest extends TestCase
     public function testBase(): void
     {
         $this->assertSame(
-            '<input type="color" name="color" value="#ff0000">',
+            '<input name="color" value="#ff0000" type="color">',
             Color::tag()
                 ->name('color')
                 ->value('#ff0000')

From 31b014ecc02ce086c56cd82e7f7b536c5b1515f5 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 2 Jan 2026 16:31:34 +0300
Subject: [PATCH 08/12] Fix color input test assertion for name attribute

---
 tests/HtmlTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/HtmlTest.php b/tests/HtmlTest.php
index 2ba682cc..2d1b0337 100644
--- a/tests/HtmlTest.php
+++ b/tests/HtmlTest.php
@@ -385,7 +385,7 @@ public function testTextInput(): void
     public function testColorInput(): void
     {
         $this->assertSame('<input type="color">', Html::color()->render());
-        $this->assertSame('<input type="color" name>', Html::color('')->render());
+        $this->assertSame('<input name type="color">', Html::color('')->render());
         $this->assertSame('<input type="color" value>', Html::color(null, '')->render());
         $this->assertSame('<input type="color" name="test">', Html::color('test')->render());
         $this->assertSame(

From 12d05883ee9fb2eeb242d22e29d20aba72fc0ef4 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 2 Jan 2026 16:33:27 +0300
Subject: [PATCH 09/12] Fix order of attributes in color input tests

---
 tests/HtmlTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/HtmlTest.php b/tests/HtmlTest.php
index 2d1b0337..1da7e8f8 100644
--- a/tests/HtmlTest.php
+++ b/tests/HtmlTest.php
@@ -386,14 +386,14 @@ public function testColorInput(): void
     {
         $this->assertSame('<input type="color">', Html::color()->render());
         $this->assertSame('<input name type="color">', Html::color('')->render());
-        $this->assertSame('<input type="color" value>', Html::color(null, '')->render());
-        $this->assertSame('<input type="color" name="test">', Html::color('test')->render());
+        $this->assertSame('<input value type="color">', Html::color(null, '')->render());
+        $this->assertSame('<input name="test" type="color">', Html::color('test')->render());
         $this->assertSame(
-            '<input type="color" name="test" value="#ff0000">',
+            '<input name="test" value="#ff0000" type="color">',
             Html::color('test', '#ff0000')->render(),
         );
         $this->assertSame(
-            '<input type="color" name="test" value="#ff0000" required>',
+            '<input name="test" value="#ff0000" required type="color">',
             Html::color('test', '#ff0000', ['required' => true])->render(),
         );
     }

From 7c949b09ba8a62bf89031ae963b504635ad92584 Mon Sep 17 00:00:00 2001
From: Sergei Predvoditelev <sergey.predvoditelev@gmail.com>
Date: Mon, 5 Jan 2026 11:56:57 +0300
Subject: [PATCH 10/12] Update InputTest.php

---
 tests/Tag/InputTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/Tag/InputTest.php b/tests/Tag/InputTest.php
index a559617f..af283308 100644
--- a/tests/Tag/InputTest.php
+++ b/tests/Tag/InputTest.php
@@ -77,6 +77,14 @@ public function testRange(): void
         );
     }
 
+    public function testColor(): void
+    {
+        $this->assertSame(
+            '<input name="color" value="#ff0000" type="color">',
+            (string) Input::color('color', '#ff0000'),
+        );
+    }
+
     public function testButton(): void
     {
         $this->assertSame(

From b4018bab5d92671f51a250fc7ed198422473b86e Mon Sep 17 00:00:00 2001
From: Sergei Predvoditelev <sergei@predvoditelev.ru>
Date: Sat, 14 Mar 2026 08:37:09 +0300
Subject: [PATCH 11/12] fix

---
 CHANGELOG.md                      | 2 +-
 tests/Widget/CheckboxListTest.php | 2 +-
 tests/Widget/RadioListTest.php    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 720bb92d..c78ea560 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,11 @@
 ## 4.0.0 under development
 
 - Chg #221: Throw `LogicException` in `Tag::id()` when id is empty string (@razvbir)
+- Chg #234: Remove tag attributes sorting (@FrankiFixx)
 
 ## 3.13.0 March 13, 2026
 
 - New #260: Add `$attributes` parameter to `Html::li()` method (@gauravkumar2525)
-- Chg #234: Remove tag attributes sorting (@FrankiFixx)
 - Chg #243: Deprecate static constructors such as `TagName::tag()` in favor of `new TagName()` (@razvbir)
 - Enh #261: Enhance `RadioList::addRadioWrapClass()` method for cleaner class addition (@vjik)
 - Enh #263: Explicitly import classes and constants in "use" section (@mspirkov)
diff --git a/tests/Widget/CheckboxListTest.php b/tests/Widget/CheckboxListTest.php
index a3277334..63130f47 100644
--- a/tests/Widget/CheckboxListTest.php
+++ b/tests/Widget/CheckboxListTest.php
@@ -55,7 +55,7 @@ public function testCreate(): void
 
         $this->assertSame(
             '<div>' . "\n"
-            . '<label><input type="checkbox" name="b[]" value="1"> One</label>' . "\n"
+            . '<label><input name="b[]" value="1" type="checkbox"> One</label>' . "\n"
             . '</div>',
             $widget->render(),
         );
diff --git a/tests/Widget/RadioListTest.php b/tests/Widget/RadioListTest.php
index b73d8ffd..2ddfa938 100644
--- a/tests/Widget/RadioListTest.php
+++ b/tests/Widget/RadioListTest.php
@@ -19,9 +19,9 @@ public function testBase(): void
         $this->assertSame(
             '<input type="hidden" name="test" value="0">' . "\n"
             . '<div id="main">' . "\n"
-            . '<label><input type="radio" name="test" value="1"> One</label>' . "\n"
-            . '<label><input type="radio" name="test" value="2" checked> Two</label>' . "\n"
-            . '<label><input type="radio" name="test" value="5"> Five</label>' . "\n"
+            . '<label><input name="test" value="1" type="radio"> One</label>' . "\n"
+            . '<label><input name="test" value="2" checked type="radio"> Two</label>' . "\n"
+            . '<label><input name="test" value="5" type="radio"> Five</label>' . "\n"
             . '</div>',
             (new RadioList('test'))
                 ->items([1 => 'One', 2 => 'Two', 5 => 'Five'])

From e569969fc97dd808cd4ede235fc21bdbc7d09eae Mon Sep 17 00:00:00 2001
From: Sergei Predvoditelev <sergei@predvoditelev.ru>
Date: Sat, 14 Mar 2026 08:40:04 +0300
Subject: [PATCH 12/12] upgrade

---
 UPGRADE.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 37b8a9f6..c9d749e0 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -9,5 +9,9 @@ application when you upgrade the package from one version to another.
 
 ## Upgrade from 3.x
 
-- `Tag::id()` now throws `LogicException` when an empty string is passed. Check your code for places where you call 
+- `Tag::id()` now throws `LogicException` when an empty string is passed. Check your code for places where you call
   `Tag::id()` and make sure you are not passing an empty string.
+- HTML tag attributes are no longer sorted by `Html::renderTagAttributes()`. Previously, attributes were reordered
+  according to a predefined priority list (`type`, `id`, `class`, `name`, `value`, etc.). Now attributes are rendered
+  in the order they are set. If your code or tests depend on a specific attribute order in the rendered HTML, you need
+  to update them.