Merge branch 'hotfix/98' into develop

Forward port #98

Author: weierophinney

CHANGELOG.md

@@ -40,6 +40,11 @@ All notable changes to this project will be documented in this file, in reverse
   and exception messages in the breadcrumbs and menu navigation helpers to
   remove references to 'module' keys for the `$partial` argument, as that key
   is no longer used.
+- [#98](https://github.com/zendframework/zend-view/pull/98) fixes how the
+  `HeadMeta` helper renders the `<meta charset>` tag, ensuring it is the first
+  rendered. As long as the `HeadMeta` helper is called early in your markup, this
+  should ensure it is within the first 1024 characters, ensuring your document
+  validates.
 
 ## 2.8.1 - 2016-06-30
 

src/Helper/HeadMeta.php

@@ -176,9 +176,18 @@ public function toString($indent = null)
         $items = [];
         $this->getContainer()->ksort();
 
+        $isHtml5 = $this->view->plugin('doctype')->isHtml5();
+
         try {
             foreach ($this as $item) {
-                $items[] = $this->itemToString($item);
+                $content = $this->itemToString($item);
+
+                if ($isHtml5 && $item->type == 'charset') {
+                    array_unshift($items, $content);
+                    continue;
+                }
+
+                $items[] = $content;
             }
         } catch (Exception\InvalidArgumentException $e) {
             trigger_error($e->getMessage(), E_USER_WARNING);

test/Helper/HeadMetaTest.php

@@ -422,6 +422,21 @@ public function testCharset()
         );
     }
 
+    public function testCharsetPosition()
+    {
+        $view = new View();
+        $view->plugin('doctype')->__invoke('HTML5');
+
+        $view->plugin('headMeta')
+            ->setProperty('description', 'foobar')
+            ->setCharset('utf-8');
+
+        $this->assertEquals(
+            '<meta charset="utf-8">' . PHP_EOL
+            . '<meta property="description" content="foobar">',
+            $view->plugin('headMeta')->toString());
+    }
+
      /**
      * @group ZF-9743
      */