Inicio Explorar Ayuda
Iniciar sesión
boarspring
/
repo_zf1
espejo de https://github.com/bluescreen/zf1-php7.2.git
2
0
Fork 1
Archivos Incidencias 0 Wiki
Explorar el Código

merge r25100 to release-1.12

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25101 44c647ce-9c0f-0410-b52a-842ac1e357ba
rob hace 13 años
padre
493c602ffb
commit
8833ce3a5d
Se han modificado 2 ficheros con 15 adiciones y 3 borrados
Dividir vista Mostrar estadísticas de diff
  1. 3 0
      library/Zend/View/Helper/Doctype.php
  2. 12 3
      tests/Zend/View/Helper/DoctypeTest.php

+ 3 - 0
library/Zend/View/Helper/Doctype.php
Ver fichero 

@@ -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 XHTML1_RDFA         = 'XHTML1_RDFA';
 
+    const XHTML1_RDFA11       = 'XHTML1_RDFA11';
 
     const XHTML_BASIC1        = 'XHTML_BASIC1';
 
     const XHTML5              = 'XHTML5';
 
     const HTML4_STRICT        = 'HTML4_STRICT';
 
@@ -89,6 +90,7 @@ class Zend_View_Helper_Doctype extends Zend_View_Helper_Abstract
 
                     self::XHTML1_TRANSITIONAL => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
 
                     self::XHTML1_FRAMESET     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
 
                     self::XHTML1_RDFA         => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
 
+                    self::XHTML1_RDFA11       => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">',
 
                     self::XHTML_BASIC1        => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">',
 
                     self::XHTML5              => '<!DOCTYPE html>',
 
                     self::HTML4_STRICT        => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
 
@@ -120,6 +122,7 @@ class Zend_View_Helper_Doctype extends Zend_View_Helper_Abstract
 
                 case self::XHTML1_FRAMESET:
 
                 case self::XHTML_BASIC1:
 
                 case self::XHTML1_RDFA:
 
+                case self::XHTML1_RDFA11:
 
                 case self::XHTML5:
 
                 case self::HTML4_STRICT:
 
                 case self::HTML4_LOOSE:

+ 12 - 3
tests/Zend/View/Helper/DoctypeTest.php
Ver fichero 

@@ -117,7 +117,16 @@ class Zend_View_Helper_DoctypeTest extends PHPUnit_Framework_TestCase
 
 
     public function testIsXhtmlReturnsTrueForXhtmlDoctypes()
 
     {
 
-        foreach (array('XHTML1_STRICT', 'XHTML1_TRANSITIONAL', 'XHTML1_FRAMESET', 'XHTML1_RDFA', 'XHTML5') as $type) {
 
+        $types = array(
 
+            'XHTML1_STRICT',
 
+            'XHTML1_TRANSITIONAL',
 
+            'XHTML1_FRAMESET',
 
+            'XHTML1_RDFA',
 
+            'XHTML1_RDFA11',
 
+            'XHTML5',
 
+        );
 
+
 
+        foreach ($types as $type) {
 
             $doctype = $this->helper->doctype($type);
 
             $this->assertEquals($type, $doctype->getDoctype());
 
             $this->assertTrue($doctype->isXhtml());
 
@@ -157,8 +166,8 @@ class Zend_View_Helper_DoctypeTest extends PHPUnit_Framework_TestCase
 
 
     public function testIsRdfa()
 
     {
 
-        $doctype = $this->helper->doctype('XHTML1_RDFA');
 
-        $this->assertTrue($doctype->isRdfa());
 
+        $this->assertTrue($this->helper->doctype('XHTML1_RDFA')->isRdfa());
 
+        $this->assertTrue($this->helper->doctype('XHTML1_RDFA11')->isRdfa());
 
 
         // built-in doctypes
 
         foreach (array('HTML4_STRICT', 'HTML4_LOOSE', 'HTML4_FRAMESET', 'XHTML1_STRICT', 'XHTML1_TRANSITIONAL', 'XHTML1_FRAMESET') as $type) {