Merge branch 'samsonasik-fix-134'

Author: froschdesign

src/Helper/HeadMeta.php

@@ -334,22 +334,27 @@ protected function isValid($item)
             return false;
         }
 
+        $doctype = $this->view->plugin('doctype');
+        if ($item->type === 'charset' && $doctype->isXhtml()) {
+            return false;
+        }
+
         if (! isset($item->content)
-            && (! $this->view->plugin('doctype')->isHtml5()
-            || (! $this->view->plugin('doctype')->isHtml5() && $item->type !== 'charset'))
+            && (! $doctype->isHtml5()
+            || (! $doctype->isHtml5() && $item->type !== 'charset'))
         ) {
             return false;
         }
 
         // <meta itemprop= ... /> is only supported with doctype html
-        if (! $this->view->plugin('doctype')->isHtml5()
+        if (! $doctype->isHtml5()
             && $item->type === 'itemprop'
         ) {
             return false;
         }
 
         // <meta property= ... /> is only supported with doctype RDFa
-        if (! $this->view->plugin('doctype')->isRdfa()
+        if (! $doctype->isRdfa()
             && $item->type === 'property'
         ) {
             return false;
@@ -361,15 +366,15 @@ protected function isValid($item)
     /**
      * Append
      *
-     * @param  string $value
+     * @param  object $value
      * @return void
      * @throws Exception\InvalidArgumentException
      */
     public function append($value)
     {
         if (! $this->isValid($value)) {
             throw new Exception\InvalidArgumentException(
-                'Invalid value passed to append; please use appendMeta()'
+                'Invalid value passed to append'
             );
         }
 
@@ -414,15 +419,15 @@ public function offsetUnset($index)
     /**
      * Prepend
      *
-     * @param  string $value
+     * @param  object $value
      * @throws Exception\InvalidArgumentException
      * @return void
      */
     public function prepend($value)
     {
         if (! $this->isValid($value)) {
             throw new Exception\InvalidArgumentException(
-                'Invalid value passed to prepend; please use prependMeta()'
+                'Invalid value passed to prepend'
             );
         }
 
@@ -432,14 +437,14 @@ public function prepend($value)
     /**
      * Set
      *
-     * @param  string $value
+     * @param  object $value
      * @throws Exception\InvalidArgumentException
      * @return void
      */
     public function set($value)
     {
         if (! $this->isValid($value)) {
-            throw new Exception\InvalidArgumentException('Invalid value passed to set; please use setMeta()');
+            throw new Exception\InvalidArgumentException('Invalid value passed to set');
         }
 
         $container = $this->getContainer();
@@ -458,6 +463,7 @@ public function set($value)
      * Not valid in a non-HTML5 doctype
      *
      * @param  string $charset
+     * @param  Exception\InvalidArgumentException
      * @return HeadMeta Provides a fluent interface
      */
     public function setCharset($charset)
@@ -467,6 +473,11 @@ public function setCharset($charset)
         $item->charset = $charset;
         $item->content = null;
         $item->modifiers = [];
+
+        if (! $this->isValid($item)) {
+            throw new Exception\InvalidArgumentException('XHTML* doctype has no attribute charset; please use appendHttpEquiv()');
+        }
+
         $this->set($item);
 
         return $this;

test/Helper/HeadMetaTest.php

@@ -440,6 +440,18 @@ public function testCharsetPosition()
         );
     }
 
+    public function testCarsetWithXhtmlDoctypeGotException()
+    {
+        $this->expectException(Exception\InvalidArgumentException::class);
+        $this->expectExceptionMessage('XHTML* doctype has no attribute charset; please use appendHttpEquiv()');
+
+        $view = new View();
+        $view->plugin('doctype')->__invoke('XHTML1_RDFA');
+
+        $view->plugin('headMeta')
+             ->setCharset('utf-8');
+    }
+
      /**
      * @group ZF-9743
      */