Merge branch 'hotfix/zendframework/zendframework#6634-allow-crossorig…

…in-headscript-attribute' into develop Close zendframework/zendframework#6634 Forward port zendframework/zendframework#6634
zendframework · Dec 11, 2014 · 328eff7 · 328eff7
3 parents 3bf5c92 + 859c3bb + 7cec5b3
commit 328eff7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/Helper/HeadScript.php b/src/Helper/HeadScript.php
@@ -83,7 +83,13 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
      *
      * @var array
      */
-    protected $optionalAttributes = array('charset', 'defer', 'language', 'src');
+    protected $optionalAttributes = array(
+        'charset',
+        'crossorigin',
+        'defer',
+        'language',
+        'src',
+    );
 
     /**
      * Required attributes for script tag

diff --git a/test/Helper/HeadScriptTest.php b/test/Helper/HeadScriptTest.php
@@ -458,4 +458,17 @@ public function testNoEscapeTrue()
         $this->assertNotContains('//<!--', $test);
         $this->assertNotContains('//-->', $test);
     }
+
+    /**
+     * @group 6634
+     */
+    public function testSupportsCrossOriginAttribute()
+    {
+        $this->helper->__invoke()->appendScript(
+            '// some script' . PHP_EOL, 'text/javascript', array('crossorigin' => true)
+        );
+        $test = $this->helper->__invoke()->toString();
+
+        $this->assertContains('crossorigin="', $test);
+    }
 }