Merge pull request #8117 from afilina/master

HTML5 meta charset

src/View/Helper/HtmlHelper.php

@@ -74,7 +74,7 @@ class HtmlHelper extends Helper
             'parastart' => '<p{{attrs}}>',
             'css' => '<link rel="{{rel}}" href="{{url}}"{{attrs}}/>',
             'style' => '<style{{attrs}}>{{content}}</style>',
-            'charset' => '<meta http-equiv="Content-Type" content="text/html; charset={{charset}}"/>',
+            'charset' => '<meta charset="{{charset}}"/>',
             'ul' => '<ul{{attrs}}>{{content}}</ul>',
             'ol' => '<ol{{attrs}}>{{content}}</ol>',
             'li' => '<li{{attrs}}>{{content}}</li>',

tests/TestCase/View/Helper/HtmlHelperTest.php

@@ -1209,16 +1209,16 @@ class HtmlHelperTest extends TestCase
     {
         Configure::write('App.encoding', null);
         $result = $this->Html->charset();
-        $expected = ['meta' => ['http-equiv' => 'Content-Type', 'content' => 'text/html; charset=utf-8']];
+        $expected = ['meta' => ['charset' => 'utf-8']];
         $this->assertHtml($expected, $result);
 
         Configure::write('App.encoding', 'ISO-8859-1');
         $result = $this->Html->charset();
-        $expected = ['meta' => ['http-equiv' => 'Content-Type', 'content' => 'text/html; charset=iso-8859-1']];
+        $expected = ['meta' => ['charset' => 'iso-8859-1']];
         $this->assertHtml($expected, $result);
 
         $result = $this->Html->charset('UTF-7');
-        $expected = ['meta' => ['http-equiv' => 'Content-Type', 'content' => 'text/html; charset=UTF-7']];
+        $expected = ['meta' => ['charset' => 'UTF-7']];
         $this->assertHtml($expected, $result);
     }
 

tests/TestCase/View/ViewTest.php

@@ -1267,7 +1267,7 @@ class ViewTest extends TestCase
         $View->templatePath($this->PostsController->name);
         $result = $View->render('index');
 
-        $this->assertRegExp("/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=utf-8\"\/>\s*<title>/", $result);
+        $this->assertRegExp("/<meta charset=\"utf-8\"\/>\s*<title>/", $result);
         $this->assertRegExp("/<div id=\"content\">\s*posts index\s*<\/div>/", $result);
         $this->assertRegExp("/<div id=\"content\">\s*posts index\s*<\/div>/", $result);
 
@@ -1286,7 +1286,7 @@ class ViewTest extends TestCase
         $View->templatePath($this->PostsController->name);
         $result = $View->render('index');
 
-        $this->assertRegExp("/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=utf-8\"\/>\s*<title>/", $result);
+        $this->assertRegExp("/<meta charset=\"utf-8\"\/>\s*<title>/", $result);
         $this->assertRegExp("/<div id=\"content\">\s*posts index\s*<\/div>/", $result);
     }