Merge pull request #21 from matbech/patch-1

HeadScript: Handle empty type for HTML5

Author: weierophinney

src/Helper/HeadScript.php

@@ -400,8 +400,12 @@ public function itemToString($item, $indent, $escapeStart, $escapeEnd)
         $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 (empty($item->type) && $this->view && $this->view->plugin('doctype')->isHtml5()) {
+            $html = '<script ' . $attrString . '>';
+        } else {
+            $type = ($this->autoEscape) ? $this->escape($item->type) : $item->type;
+            $html = '<script type="' . $type . '"' . $attrString . '>';
+        }
         if (!empty($item->source)) {
             $html .= PHP_EOL;
 

test/Helper/HeadScriptTest.php

@@ -471,4 +471,15 @@ public function testSupportsCrossOriginAttribute()
 
         $this->assertContains('crossorigin="', $test);
     }
+
+    public function testOmitsTypeAttributeIfEmptyValue()
+    {
+        $view = new \Zend\View\Renderer\PhpRenderer();
+        $view->plugin('doctype')->setDoctype(\Zend\View\Helper\Doctype::HTML5);
+        $this->helper->setView($view);
+
+        $this->helper->__invoke()->appendScript('// some script' . PHP_EOL, '');
+        $test = $this->helper->__invoke()->toString();
+        $this->assertNotContains('type', $test);
+    }
 }