diff --git documentation/manual/en/module_specs/Zend_View-Helpers-Doctype.xml documentation/manual/en/module_specs/Zend_View-Helpers-Doctype.xml
index 9bcf495..17251b4 100644
--- documentation/manual/en/module_specs/Zend_View-Helpers-Doctype.xml
+++ documentation/manual/en/module_specs/Zend_View-Helpers-Doctype.xml
@@ -22,6 +22,7 @@
XHTML1_TRANSITIONAL
XHTML1_FRAMESET
XHTML_BASIC1
+ XHTML5
HTML4_STRICT
HTML4_LOOSE
HTML4_FRAMESET
diff --git library/Zend/View/Helper/Doctype.php library/Zend/View/Helper/Doctype.php
index 697eb70..97feacb 100644
--- library/Zend/View/Helper/Doctype.php
+++ library/Zend/View/Helper/Doctype.php
@@ -44,6 +44,7 @@ class Zend_View_Helper_Doctype extends Zend_View_Helper_Abstract
const XHTML1_TRANSITIONAL = 'XHTML1_TRANSITIONAL';
const XHTML1_FRAMESET = 'XHTML1_FRAMESET';
const XHTML_BASIC1 = 'XHTML_BASIC1';
+ const XHTML5 = 'XHTML5';
const HTML4_STRICT = 'HTML4_STRICT';
const HTML4_LOOSE = 'HTML4_LOOSE';
const HTML4_FRAMESET = 'HTML4_FRAMESET';
@@ -87,6 +88,7 @@ class Zend_View_Helper_Doctype extends Zend_View_Helper_Abstract
self::XHTML1_TRANSITIONAL => '',
self::XHTML1_FRAMESET => '',
self::XHTML_BASIC1 => '',
+ self::XHTML5 => '',
self::HTML4_STRICT => '',
self::HTML4_LOOSE => '',
self::HTML4_FRAMESET => '',
@@ -115,6 +117,7 @@ class Zend_View_Helper_Doctype extends Zend_View_Helper_Abstract
case self::XHTML1_TRANSITIONAL:
case self::XHTML1_FRAMESET:
case self::XHTML_BASIC1:
+ case self::XHTML5:
case self::HTML4_STRICT:
case self::HTML4_LOOSE:
case self::HTML4_FRAMESET:
diff --git tests/Zend/View/Helper/DoctypeTest.php tests/Zend/View/Helper/DoctypeTest.php
index f5fe875..989e1eb 100644
--- tests/Zend/View/Helper/DoctypeTest.php
+++ tests/Zend/View/Helper/DoctypeTest.php
@@ -122,7 +122,7 @@ class Zend_View_Helper_DoctypeTest extends PHPUnit_Framework_TestCase
public function testIsXhtmlReturnsTrueForXhtmlDoctypes()
{
- foreach (array('XHTML1_STRICT', 'XHTML1_TRANSITIONAL', 'XHTML1_FRAMESET') as $type) {
+ foreach (array('XHTML1_STRICT', 'XHTML1_TRANSITIONAL', 'XHTML1_FRAMESET', 'XHTML5') as $type) {
$doctype = $this->helper->doctype($type);
$this->assertEquals($type, $doctype->getDoctype());
$this->assertTrue($doctype->isXhtml());
@@ -135,7 +135,7 @@ class Zend_View_Helper_DoctypeTest extends PHPUnit_Framework_TestCase
public function testIsXhtmlReturnsFalseForNonXhtmlDoctypes()
{
- foreach (array('HTML4_STRICT', 'HTML4_LOOSE', 'HTML4_FRAMESET') as $type) {
+ foreach (array('HTML4_STRICT', 'HTML4_LOOSE', 'HTML4_FRAMESET', 'HTML5') as $type) {
$doctype = $this->helper->doctype($type);
$this->assertEquals($type, $doctype->getDoctype());
$this->assertFalse($doctype->isXhtml());