Merge pull request #103 from glensc/zf1-future-107

[zend-view] Updated HeadScript to allow for proper html5 syntax creation
zf1s · Feb 25, 2024 · 8a47fd8 · 8a47fd8
2 parents c87deae + 53516cf
commit 8a47fd8
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 3 deletions.
diff --git a/packages/zend-view/library/Zend/View/Helper/HeadScript.php b/packages/zend-view/library/Zend/View/Helper/HeadScript.php
@@ -416,6 +416,7 @@ public function arbitraryAttributesAllowed()
      */
     public function itemToString($item, $indent, $escapeStart, $escapeEnd)
     {
+        $isHTML5 = $this->view instanceof Zend_View_Abstract && $this->view->doctype()->isHtml5();
         $attrString = '';
         if (!empty($item->attributes)) {
             foreach ($item->attributes as $key => $value) {
@@ -424,17 +425,31 @@ public function itemToString($item, $indent, $escapeStart, $escapeEnd)
                 {
                     continue;
                 }
-                if ('defer' == $key) {
+                if ('defer' === $key && $value !== false) {
                     $value = 'defer';
                 }
-                $attrString .= sprintf(' %s="%s"', $key, ($this->_autoEscape) ? $this->_escape($value) : $value);
+
+                if ($value === false) {
+                    continue;
+                }
+
+                if ($isHTML5 && ($value === true || $value === '' || $value === $key)) {
+                    $attrString .= ' ' . $key;
+                } else {
+                    $attrString .= sprintf(' %s="%s"', $key, ($this->_autoEscape) ? $this->_escape($value) : $value);
+                }
             }
         }
 
         $addScriptEscape = !(isset($item->attributes['noescape']) && filter_var($item->attributes['noescape'], FILTER_VALIDATE_BOOLEAN));
 
         $type = ($this->_autoEscape) ? $this->_escape($item->type) : $item->type;
-        $html  = '<script type="' . $type . '"' . $attrString . '>';
+        if ($isHTML5 && $type === 'text/javascript') {
+            $html  = '<script' . $attrString . '>';
+        } else {
+            $html  = '<script type="' . $type . '"' . $attrString . '>';
+        }
+
         if (!empty($item->source)) {
             $html .= PHP_EOL ;
 

diff --git a/tests/Zend/View/Helper/HeadScriptTest.php b/tests/Zend/View/Helper/HeadScriptTest.php
@@ -534,6 +534,44 @@ public function testConditionalScriptNoIE()
         $this->assertContains('<!--[if !IE]><!--><', $test);
         $this->assertContains('<!--<![endif]-->', $test);
     }
+
+    public function testRenderWithHtml5Doctype()
+    {
+        $view = new Zend_View();
+        $view->doctype('HTML5');
+        $this->helper->setView($view);
+
+        // case: defer attribute is true - renders minimized form, charset attribute is non-empty string - renders full form
+        $this->helper->setFile(
+            'example.js', 'text/javascript', array('defer' => true, 'charset' => 'utf-8')
+        );
+
+        $result = $this->helper->toString();
+
+        $this->assertNotContains('type="text/javascript"', $result);
+        $this->assertNotContains('defer="', $result);
+        $this->assertContains(' defer', $result);
+        $this->assertContains(' charset="utf-8"', $result);
+
+        // case: defer attribute is empty string, renders minimized form
+        $this->helper->setFile(
+            'example.js', 'text/javascript', array('defer' => '')
+        );
+
+        $result = $this->helper->toString();
+
+        $this->assertNotContains('defer="', $result);
+        $this->assertContains(' defer', $result);
+
+        // case: defer attribute is false, skips the attribute
+        $this->helper->setFile(
+            'example.js', 'text/javascript', array('defer' => false)
+        );
+
+        $result = $this->helper->toString();
+
+        $this->assertNotContains('defer', $result);
+    }
 }
 
 // Call Zend_View_Helper_HeadScriptTest::main() if this source file is executed directly.