Merge branch 'html5-rdfa' of https://github.com/bakura10/zf2

zendframework · Jul 30, 2012 · 5c7001d · 5c7001d
commit 5c7001d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Helper/Doctype.php b/src/Helper/Doctype.php
@@ -214,7 +214,7 @@ public function isHtml5()
      */
     public function isRdfa()
     {
-        return (stristr($this->getDoctype(), 'rdfa') ? true : false);
+        return ($this->isHtml5() || stristr($this->getDoctype(), 'rdfa') ? true : false);
     }
 
     /**

diff --git a/test/Helper/DoctypeTest.php b/test/Helper/DoctypeTest.php
@@ -141,6 +141,8 @@ public function testIsRdfa()
 
         $this->assertTrue($this->helper->__invoke(Helper\Doctype::XHTML1_RDFA)->isRdfa());
         $this->assertTrue($this->helper->__invoke(Helper\Doctype::XHTML1_RDFA11)->isRdfa());
+        $this->assertTrue($this->helper->__invoke(Helper\Doctype::XHTML5)->isRdfa());
+        $this->assertTrue($this->helper->__invoke(Helper\Doctype::HTML5)->isRdfa());
 
         // build-in doctypes
         $doctypes = array(
@@ -149,11 +151,9 @@ public function testIsRdfa()
             Helper\Doctype::XHTML1_TRANSITIONAL,
             Helper\Doctype::XHTML1_FRAMESET,
             Helper\Doctype::XHTML_BASIC1,
-            Helper\Doctype::XHTML5,
             Helper\Doctype::HTML4_STRICT,
             Helper\Doctype::HTML4_LOOSE,
-            Helper\Doctype::HTML4_FRAMESET,
-            Helper\Doctype::HTML5,
+            Helper\Doctype::HTML4_FRAMESET
         );
 
         foreach ($doctypes as $type) {