Add support for yiisoft/html version ^4.0 (#305)

vjik · web-flow · commit 68a2299b1950 · 2026-03-18T13:29:17.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 12.2.4 under development
 
-- no changes in this release.
+- Enh #305: Add support for `yiisoft/html` version `^4.0` (@vjik)
 
 ## 12.2.3 January 26, 2026
 
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "yiisoft/arrays": "^2.0 || ^3.0",
         "yiisoft/cache": "^1.0 || ^2.0 || ^3.0",
         "yiisoft/files": "^1.0 || ^2.0",
-        "yiisoft/html": "^2.5 || ^3.0",
+        "yiisoft/html": "^2.5 || ^3.0 || ^4.0",
         "yiisoft/json": "^1.0"
     },
     "require-dev": {
diff --git a/tests/WebViewTest.php b/tests/WebViewTest.php
@@ -206,7 +206,7 @@ public function testRegisterCssFile(string $url): void
         $webView->registerCssFile($url);
 
         $html = $webView->render('positions.php');
-        $this->assertStringContainsString('[HEAD]<link href="' . $url . '" rel="stylesheet">[/HEAD]', $html);
+        $this->assertStringContainsString('[HEAD]<link rel="stylesheet" href="' . $url . '">[/HEAD]', $html);
     }
 
     public function testRegisterCssFileEdgeCase(): void
@@ -220,9 +220,9 @@ public function testRegisterCssFileEdgeCase(): void
 
         $this->assertStringContainsString(
             <<<HTML
-            [HEAD]<link href="main.css" rel="stylesheet">
-            <link href="main.css" rel="stylesheet" data-x="1">
-            <link href="main.css" rel="stylesheet" data-x="2">[/HEAD]
+            [HEAD]<link rel="stylesheet" href="main.css">
+            <link rel="stylesheet" href="main.css" data-x="1">
+            <link rel="stylesheet" href="main.css" data-x="2">[/HEAD]
             HTML,
             $html,
         );
@@ -241,15 +241,15 @@ public static function dataRegisterCssFileWithPosition(): array
     {
         return [
             [
-                '[HEAD]<link href="/somefile.css" rel="stylesheet">[/HEAD]',
+                '[HEAD]<link rel="stylesheet" href="/somefile.css">[/HEAD]',
                 WebView::POSITION_HEAD,
             ],
             [
-                '[BEGINBODY]<link href="/somefile.css" rel="stylesheet">[/BEGINBODY]',
+                '[BEGINBODY]<link rel="stylesheet" href="/somefile.css">[/BEGINBODY]',
                 WebView::POSITION_BEGIN,
             ],
             [
-                '[ENDBODY]<link href="/somefile.css" rel="stylesheet">[/ENDBODY]',
+                '[ENDBODY]<link rel="stylesheet" href="/somefile.css">[/ENDBODY]',
                 WebView::POSITION_END,
             ],
         ];
@@ -732,8 +732,8 @@ public function testAddCssFiles(): void
         $html = $webView->render('positions.php');
 
         $expected = '[BEGINPAGE][/BEGINPAGE]' . "\n"
-            . '[HEAD]<link href="file-1.css" rel="stylesheet">[/HEAD]' . "\n"
-            . '[BEGINBODY]<link href="file-2.css" rel="stylesheet" crossorigin="anonymous">[/BEGINBODY]' . "\n"
+            . '[HEAD]<link rel="stylesheet" href="file-1.css">[/HEAD]' . "\n"
+            . '[BEGINBODY]<link rel="stylesheet" href="file-2.css" crossorigin="anonymous">[/BEGINBODY]' . "\n"
             . '[ENDBODY][/ENDBODY]' . "\n"
             . '[ENDPAGE][/ENDPAGE]';
 
