Trang chủ Khám phá Trợ giúp
Đăng nhập
boarspring
/
repo_zf1
mirror of https://github.com/bluescreen/zf1-php7.2.git
2
0
Fork 1
Các tập tin Các vấn đề 0 Wiki
Browse Source

ZF-7722: add doctype support for HTML5; patch courtesy Andy Fowler

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19771 44c647ce-9c0f-0410-b52a-842ac1e357ba
matthew 16 năm trước cách đây
mục cha
0ca65869a5
commit
85d72f3b96
6 tập tin đã thay đổi với 134 bổ sung và 6 xóa
Split View Hiển thị tình trạng sai khác
  1. 10 0
      documentation/manual/en/module_specs/Zend_View-Helpers-Doctype.xml
  2. 16 0
      documentation/manual/en/module_specs/Zend_View-Helpers-HeadMeta.xml
  3. 12 0
      library/Zend/View/Helper/Doctype.php
  4. 42 5
      library/Zend/View/Helper/HeadMeta.php
  5. 21 1
      tests/Zend/View/Helper/DoctypeTest.php
  6. 33 0
      tests/Zend/View/Helper/HeadMetaTest.php

+ 10 - 0
documentation/manual/en/module_specs/Zend_View-Helpers-Doctype.xml
Xem Tập Tin 

@@ -86,6 +86,16 @@ if ($view->doctype()->isXhtml()) {
 
     // do something differently
 
 }
 
 ]]></programlisting>
 
+
 
+        <para>
 
+            You can also check if the doctype represents an <acronym>HTML5</acronym> document
 
+        </para>
 
+
 
+        <programlisting language="php"><![CDATA[
 
+if ($view->doctype()->isHtml5()) {
 
+    // do something differently
 
+}
 
+]]></programlisting>
 
     </example>
 
 </sect3>
 
 <!--

+ 16 - 0
documentation/manual/en/module_specs/Zend_View-Helpers-HeadMeta.xml
Xem Tập Tin 

@@ -65,6 +65,12 @@
 
                 <command>setHttpEquiv($keyValue, $content, $modifiers)</command>
 
             </para>
 
         </listitem>
 
+
 
+		<listitem>
 
+            <para>
 
+                <command>setCharset($charset)</command>
 
+            </para>
 
+        </listitem>
 
     </itemizedlist>
 
 
     <para>
 
@@ -146,6 +152,16 @@ $this->headMeta()->appendHttpEquiv('Content-Type',
 
 ]]></programlisting>
 
 
         <para>
 
+            If you are serving an HTML5 document, you should provide the character 
+			set like this:
 
+        </para>
 
+
 
+        <programlisting language="php"><![CDATA[
 
+// setting character set in HTML5
 
+$this->headMeta()->setCharset('UTF-8'); // Will look like <meta charset="UTF-8">
 
+]]></programlisting>
 
+
 
+        <para>
 
             As a final example, an easy way to display a transitional message
 
             before a redirect is using a "meta refresh":
 
         </para>

+ 12 - 0
library/Zend/View/Helper/Doctype.php
Xem Tập Tin 

@@ -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 => '<!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::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">',
 
                     self::HTML4_LOOSE         => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
 
                     self::HTML4_FRAMESET      => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
 
@@ -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:
 
@@ -183,6 +186,15 @@ class Zend_View_Helper_Doctype extends Zend_View_Helper_Abstract
 
     {
 
         return (stristr($this->getDoctype(), 'xhtml') ? true : false);
 
     }
 
+	
+	/**
 
+	 * Is doctype HTML5? (HeadMeta uses this for validation)
 
+	 *
 
+	 * @return booleean
 
+	 */
 
+	public function isHtml5() {
 
+		return (stristr($this->doctype(), '<!DOCTYPE html>') ? true : false);
 
+	}
 
 
     /**
 
      * String representation of doctype

+ 42 - 5
library/Zend/View/Helper/HeadMeta.php
Xem Tập Tin 

@@ -39,7 +39,7 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S
 
      * Types of attributes
 
      * @var array
 
      */
 
-    protected $_typeKeys     = array('name', 'http-equiv');
 
+    protected $_typeKeys     = array('name', 'http-equiv', 'charset');
 
     protected $_requiredKeys = array('content');
 
     protected $_modifierKeys = array('lang', 'scheme');
 
 
@@ -166,6 +166,25 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S
 
         return parent::__call($method, $args);
 
     }
 
 
+	/**
 
+	 * Create an HTML5-style meta charset tag. Something like <meta charset="utf-8">
 
+	 * 
+	 * Not valid in a non-HTML5 doctype
 
+	 *
 
+	 * @param string $charset 
+	 * @return Zend_View_Helper_HeadMeta Provides a fluent interface
 
+	 */
 
+    public function setCharset($charset)
 
+    {
 
+        $item = new stdClass;
 
+        $item->type = 'charset';
 
+        $item->charset = $charset;
 
+        $item->content = null;
 
+        $item->modifiers = array();
 
+        $this->set($item);
 
+        return $this;
 
+    }
 
+
 
     /**
 
      * Determine if item is valid
 
      *
 
@@ -176,12 +195,17 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S
 
     {
 
         if ((!$item instanceof stdClass)
 
             || !isset($item->type)
 
-            || !isset($item->content)
 
             || !isset($item->modifiers))
 
         {
 
             return false;
 
         }
 
 
+        if (!isset($item->content)
 
+        && (! $this->view->doctype()->isHtml5()
 
+        || (! $this->view->doctype()->isHtml5() && $item->type !== 'charset'))) {
 
+            return false;
 
+        }
 
+
 
         return true;
 
     }
 
 
@@ -309,6 +333,12 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S
 
 
         $modifiersString = '';
 
         foreach ($item->modifiers as $key => $value) {
 
+            if ($this->view->doctype()->isHtml5()
 
+            && $key == 'scheme') {
 
+                require_once 'Zend/View/Exception.php';
 
+                throw new Zend_View_Exception('Invalid modifier '
 
+                . '"scheme" provided; not supported by HTML5');
 
+            }
 
             if (!in_array($key, $this->_modifierKeys)) {
 
                 continue;
 
             }
 
@@ -316,9 +346,16 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S
 
         }
 
 
         if ($this->view instanceof Zend_View_Abstract) {
 
-            $tpl = ($this->view->doctype()->isXhtml())
 
-                 ? '<meta %s="%s" content="%s" %s/>'
 
-                 : '<meta %s="%s" content="%s" %s>';
 
+            if ($this->view->doctype()->isHtml5()
 
+            && $type == 'charset') {
 
+				$tpl = ($this->view->doctype()->isXhtml())
 
+					? '<meta %s="%s"/>'
 
+					: '<meta %s="%s">';
 
+            } elseif ($this->view->doctype()->isXhtml()) {
 
+                $tpl = '<meta %s="%s" content="%s" %s/>';
 
+            } else {
 
+                $tpl = '<meta %s="%s" content="%s" %s>';
 
+            }
 
         } else {
 
             $tpl = '<meta %s="%s" content="%s" %s/>';
 
         }

+ 21 - 1
tests/Zend/View/Helper/DoctypeTest.php
Xem Tập Tin 

@@ -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());
 
@@ -146,6 +146,26 @@ class Zend_View_Helper_DoctypeTest extends PHPUnit_Framework_TestCase
 
         $this->assertFalse($doctype->isXhtml());
 
     }
 
 
+	public function testIsHtml5() {
 
+		foreach (array('HTML5', 'XHTML5') as $type) {
 
+            $doctype = $this->helper->doctype($type);
 
+            $this->assertEquals($type, $doctype->getDoctype());
 
+            $this->assertTrue($doctype->isHtml5());
 
+        }
 
+
 
+		foreach (array('HTML4_STRICT', 'HTML4_LOOSE', 'HTML4_FRAMESET', 'XHTML1_STRICT', 'XHTML1_TRANSITIONAL', 'XHTML1_FRAMESET') as $type) {
 
+			$doctype = $this->helper->doctype($type);
 
+            $this->assertEquals($type, $doctype->getDoctype());
 
+            $this->assertFalse($doctype->isHtml5());
 
+		}
 
+	}
 
+	
+	public function testCanRegisterCustomHtml5Doctype() {
 
+		$doctype = $this->helper->doctype('<!DOCTYPE html>');
 
+        $this->assertEquals('CUSTOM', $doctype->getDoctype());
 
+        $this->assertTrue($doctype->isHtml5());
 
+	}
 
+
 
     public function testCanRegisterCustomXhtmlDoctype()
 
     {
 
         $doctype = $this->helper->doctype('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://framework.zend.com/foo/DTD/xhtml1-custom.dtd">');

+ 33 - 0
tests/Zend/View/Helper/HeadMetaTest.php
Xem Tập Tin 

@@ -435,6 +435,39 @@ class Zend_View_Helper_HeadMetaTest extends PHPUnit_Framework_TestCase
 
 
         $this->assertEquals($expected, $test);
 
     }
 
+	
+	/**
 
+	 * @issue ZF-7722
 
+	 */
 
+	public function testCharsetValidateFail() 
+	{
 
+		$view = new Zend_View();
 
+		$view->doctype('HTML4_STRICT');
 
+		
+		try {
 
+			$view->headMeta()->setCharset('utf-8');
 
+			$this->fail('Should not be able to set charset for a HTML4 doctype');
 
+		} catch (Zend_View_Exception $e) {}
 
+	}
 
+	
+	/**
 
+	 * @issue ZF-7722
 
+	 */
 
+	public function testCharset() {
 
+		$view = new Zend_View();
 
+		$view->doctype('HTML5');
 
+		
+		$view->headMeta()->setCharset('utf-8');
 
+		$this->assertEquals(
 
+			'<meta charset="utf-8">',
 
+			$view->headMeta()->toString());
 
+			
+		$view->doctype('XHTML5');
 
+		
+		$this->assertEquals(
 
+			'<meta charset="utf-8"/>',
 
+			$view->headMeta()->toString());
 
+	}
 
 
 }