Use yiisoft/html ^2.0

yiisoft · Aug 24, 2021 · b75bbda · b75bbda
1 parent cbc8cca
commit b75bbda
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "oomphinc/composer-installers-extender": "^2.0.0",
         "yiisoft/arrays": "^1.0",
         "yiisoft/assets": "^1.0",
-        "yiisoft/html": "^1.2",
+        "yiisoft/html": "^2.0",
         "yiisoft/widget": "@dev"
     },
     "require-dev": {

diff --git a/tests/NavBarTest.php b/tests/NavBarTest.php
@@ -54,7 +54,7 @@ public function testNavBarBrandImage(): void
         $html .= NavBar::end();
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar">
-        <div class="navbar-brand"><a class="navbar-item" href="/"><img src="yii-logo.jpg" alt=""></a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <div class="navbar-brand"><a class="navbar-item" href="/"><img src="yii-logo.jpg" alt></a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start"></div>
         </div>
         </nav>
@@ -70,7 +70,7 @@ public function testNavBarBrandImage(): void
         $html .= NavBar::end();
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start"></div>
         </div>
         </nav>
@@ -90,7 +90,7 @@ public function testNavBarBrandUrl(): void
         $html .= NavBar::end();
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start"></div>
         </div>
         </nav>
@@ -110,8 +110,8 @@ public function testNavBarOptions(): void
             ->begin();
         $html .= NavBar::end();
         $expected = <<<'HTML'
-        <nav id="w1-navbar" class="navbar is-black" data-sticky="" data-sticky-shadow="">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <nav id="w1-navbar" class="navbar is-black" data-sticky data-sticky-shadow>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start"></div>
         </div>
         </nav>
@@ -128,8 +128,8 @@ public function testNavBarOptions(): void
             ->begin();
         $html .= NavBar::end();
         $expected = <<<'HTML'
-        <nav id="w1-navbar" class="navbar is-black" data-sticky="" data-sticky-shadow="">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <nav id="w1-navbar" class="navbar is-black" data-sticky data-sticky-shadow>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start"></div>
         </div>
         </nav>
@@ -151,7 +151,7 @@ public function testNavBarOptionsBrand(): void
 
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar">
-        <div class="navbar-brand is-black"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <div class="navbar-brand is-black"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start"></div>
         </div>
         </nav>
@@ -172,7 +172,7 @@ public function testNavBarOptionsBrandImage(): void
         $html .= NavBar::end();
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar">
-        <div class="navbar-brand"><span class="navbar-item" alt="yii logo"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <div class="navbar-brand"><span class="navbar-item" alt="yii logo"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start"></div>
         </div>
         </nav>
@@ -193,7 +193,7 @@ public function testNavBarOptionsBrandLabel(): void
         $html .= NavBar::end();
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item is-italic" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item is-italic" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start"></div>
         </div>
         </nav>
@@ -214,7 +214,7 @@ public function testNavBarOptionsItems(): void
         $html .= NavBar::end();
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-end"></div>
         </div>
         </nav>
@@ -232,7 +232,7 @@ public function testNavBarOptionsItems(): void
         $html .= NavBar::end();
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start is-primary"></div>
         </div>
         </nav>
@@ -250,7 +250,7 @@ public function testNavBarOptionsItems(): void
         $html .= NavBar::end();
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start" aria-label="true"></div>
         </div>
         </nav>
@@ -271,7 +271,7 @@ public function testNavBarOptionsMenu(): void
         $html .= NavBar::end();
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu is-black"><div class="navbar-start"></div>
         </div>
         </nav>
@@ -292,7 +292,7 @@ public function testNavBarToggleOptions(): void
         $html .= NavBar::end();
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start"></div>
         </div>
         </nav>
@@ -334,7 +334,7 @@ public function testNavBarIconToggle(): void
         $html .= NavBar::end();
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span class="icon"><i class="mdi mdi-menu mdi-24px"></i></span></a></div>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span class="icon"><i class="mdi mdi-menu mdi-24px"></i></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start"></div>
         </div>
         </nav>
@@ -387,7 +387,7 @@ public function testNavBarOptionsClassArray(): void
         $html .= NavBar::end();
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar nav dark">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start"></div>
         </div>
         </nav>
@@ -411,7 +411,7 @@ public function testNavBarItemsOptionsClassArray(): void
         $html .= NavBar::end();
         $expected = <<<'HTML'
         <nav id="w1-navbar" class="navbar">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-start nav dark"></div>
         </div>
         </nav>

diff --git a/tests/NavTest.php b/tests/NavTest.php
@@ -501,12 +501,12 @@ public function testNavIcon(): void
             ->render();
         $html .= NavBar::end();
         $expected = <<<'HTML'
-        <nav id="w1-navbar" class="navbar is-black" data-sticky="" data-sticky-shadow="">
-        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt=""></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
+        <nav id="w1-navbar" class="navbar is-black" data-sticky data-sticky-shadow>
+        <div class="navbar-brand"><span class="navbar-item"><img src="yii-logo.jpg" alt></span><a class="navbar-item" href="/">My Project</a><a class="navbar-burger" aria-expanded="false" aria-label="menu" role="button"><span aria-hidden="true"></span><span aria-hidden="true"></span><span aria-hidden="true"></span></a></div>
         <div id="w1-navbar-Menu" class="navbar-menu"><div class="navbar-end"><a class="navbar-item" href="/setting/account"><span class="icon"><i class="fas fa-user-cog"></i></span><span>Setting Account</span></a>
         <a class="navbar-item" href="/profile"><span class="icon"><i class="fas fa-users"></i></span><span>Profile</span></a>
         <div class="navbar-item has-dropdown is-hoverable">
-        <a class="navbar-link" href="#">Admin<img class="img-rounded" src="../../docs/images/icon-avatar.png" alt="" aria-expanded="false"></a>
+        <a class="navbar-link" href="#">Admin<img class="img-rounded" src="../../docs/images/icon-avatar.png" alt aria-expanded="false"></a>
         <div id="w2-dropdown" class="navbar-dropdown">
         <a class="navbar-item" href="/auth/logout">Logout</a>
         </div>