Merge branch 'hotfix/21' into develop

Forward port #21

Author: weierophinney

CHANGELOG.md

@@ -36,7 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#21](https://github.com/zendframework/zend-view/pull/21) updates the
+  `headScript` helper to allow empty attribute types to render as keys only when
+  using an HTML5 doctype.
 
 ## 2.6.7 - 2016-04-18
 

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

@@ -382,7 +382,9 @@ public function testConditionalScriptNoIE()
     {
         $this->helper->setAllowArbitraryAttributes(true);
         $this->helper->appendFile(
-            '/js/foo.js', 'text/javascript', ['conditional' => '!IE']
+            '/js/foo.js',
+            'text/javascript',
+            ['conditional' => '!IE']
         );
         $test = $this->helper->toString();
 
@@ -394,7 +396,9 @@ public function testConditionalScriptNoIEWidthSpace()
     {
         $this->helper->setAllowArbitraryAttributes(true);
         $this->helper->appendFile(
-            '/js/foo.js', 'text/javascript', ['conditional' => '! IE']
+            '/js/foo.js',
+            'text/javascript',
+            ['conditional' => '! IE']
         );
         $test = $this->helper->toString();
 
@@ -465,10 +469,26 @@ public function testNoEscapeTrue()
     public function testSupportsCrossOriginAttribute()
     {
         $this->helper->__invoke()->appendScript(
-            '// some script' . PHP_EOL, 'text/javascript', ['crossorigin' => true]
+            '// some script' . PHP_EOL,
+            'text/javascript',
+            ['crossorigin' => true]
         );
         $test = $this->helper->__invoke()->toString();
 
         $this->assertContains('crossorigin="', $test);
     }
+
+    /**
+     * @group 21
+     */
+    public function testOmitsTypeAttributeIfEmptyValueAndHtml5Doctype()
+    {
+        $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);
+    }
 }