Merge pull request #182 from moegeler/master

Optional Autoescaping in HeadMeta ViewHelper

Author: weierophinney

src/Helper/HeadMeta.php

@@ -243,7 +243,7 @@ public function itemToString(stdClass $item)
             if (! in_array($key, $this->modifierKeys)) {
                 continue;
             }
-            $modifiersString .= $key . '="' . $this->escapeAttribute($value) . '" ';
+            $modifiersString .= sprintf('%s="%s"', $key, $this->autoEscape ? $this->escapeAttribute($value) : $value);
         }
 
         $modifiersString = rtrim($modifiersString);
@@ -271,8 +271,8 @@ public function itemToString(stdClass $item)
         $meta = sprintf(
             $tpl,
             $type,
-            $this->escapeAttribute($item->$type),
-            $this->escapeAttribute($item->content),
+            $this->autoEscape ? $this->escapeAttribute($item->$type) : $item->$type,
+            $this->autoEscape ? $this->escapeAttribute($item->content) : $item->content,
             $modifiersString
         );
 

test/Helper/HeadMetaTest.php

@@ -615,4 +615,10 @@ public function testConditionalNoIEWidthSpace()
         $this->assertContains('<!--[if ! IE]><!--><', $html);
         $this->assertContains('<!--<![endif]-->', $html);
     }
+
+    public function testTurnOffAutoEscapeDoesNotEncode()
+    {
+        $this->helper->setAutoEscape(false)->appendHttpEquiv('foo', 'bar=baz');
+        $this->assertEquals('<meta http-equiv="foo" content="bar=baz" />', $this->helper->toString());
+    }
 }