Merge pull request #53 from DennisDobslaf/omit-type-for-script-tag

Omitting Script attribute if none or default
laminas · Oct 25, 2020 · 81103d2 · 81103d2
2 parents 4223f5f + 5d6ebb0
commit 81103d2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/src/Helper/HeadScript.php b/src/Helper/HeadScript.php
@@ -34,6 +34,11 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
     const FILE   = 'FILE';
     const SCRIPT = 'SCRIPT';
 
+    /**
+     * @internal
+     */
+    const DEFAULT_SCRIPT_TYPE = 'text/javascript';
+
     /**
      * Are arbitrary attributes allowed?
      *
@@ -130,7 +135,7 @@ public function __invoke(
         $spec = null,
         $placement = 'APPEND',
         array $attrs = [],
-        $type = 'text/javascript'
+        $type = self::DEFAULT_SCRIPT_TYPE
     ) {
         if ((null !== $spec) && is_string($spec)) {
             $action    = ucfirst(strtolower($mode));
@@ -171,7 +176,7 @@ public function __call($method, $args)
 
             $action  = $matches['action'];
             $mode    = strtolower($matches['mode']);
-            $type    = 'text/javascript';
+            $type    = self::DEFAULT_SCRIPT_TYPE;
             $attrs   = [];
 
             if ('offsetSet' == $action) {
@@ -267,7 +272,7 @@ public function toString($indent = null)
      */
     public function captureStart(
         $captureType = Placeholder\Container\AbstractContainer::APPEND,
-        $type = 'text/javascript',
+        $type = self::DEFAULT_SCRIPT_TYPE,
         $attrs = []
     ) {
         if ($this->captureLock) {
@@ -401,7 +406,10 @@ public function itemToString($item, $indent, $escapeStart, $escapeEnd)
         $addScriptEscape = ! (isset($item->attributes['noescape'])
             && filter_var($item->attributes['noescape'], FILTER_VALIDATE_BOOLEAN));
 
-        if (empty($item->type) && $this->view && $this->view->plugin('doctype')->isHtml5()) {
+        if ((empty($item->type) || strtolower($item->type) === self::DEFAULT_SCRIPT_TYPE)
+            && $this->view
+            && $this->view->plugin('doctype')->isHtml5()
+        ) {
             $html = '<script ' . $attrString . '>';
         } else {
             $type = ($this->autoEscape) ? $this->escapeAttribute($item->type) : $item->type;

diff --git a/src/Helper/InlineScript.php b/src/Helper/InlineScript.php
@@ -32,7 +32,7 @@ public function __invoke(
         $spec = null,
         $placement = 'APPEND',
         array $attrs = [],
-        $type = 'text/javascript'
+        $type = self::DEFAULT_SCRIPT_TYPE
     ) {
         return parent::__invoke($mode, $spec, $placement, $attrs, $type);
     }

diff --git a/test/Helper/HeadScriptTest.php b/test/Helper/HeadScriptTest.php
@@ -534,4 +534,18 @@ public function testSupportsAsyncAttribute()
         $test = $this->helper->__invoke()->toString();
         $this->assertContains('async="', $test);
     }
+
+    /**
+     * @group 23
+     */
+    public function testOmitsTypeAttributeIfNoneGivenAndHtml5Doctype()
+    {
+        $view = new \Laminas\View\Renderer\PhpRenderer();
+        $view->plugin('doctype')->setDoctype(\Laminas\View\Helper\Doctype::HTML5);
+        $this->helper->setView($view);
+
+        $this->helper->__invoke()->appendScript('// some script' . PHP_EOL);
+        $test = $this->helper->__invoke()->toString();
+        $this->assertNotRegExp('#type="text/javascript"#i', $test);
+    }
 }