diff options
author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2010-10-24 15:01:02 +0000 |
---|---|---|
committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2010-10-24 15:01:02 +0000 |
commit | 91727cb844ecfe55f6dcd2f13ffeec3962aabbac (patch) | |
tree | 23a66a5e5d2565be626cf00965ac035f757894fe /ext/standard/tests/strings/html_entity_decode2.phpt | |
parent | f0d2559d2649854433ac42869744df3c2f05b6c8 (diff) | |
download | php-git-91727cb844ecfe55f6dcd2f13ffeec3962aabbac.tar.gz |
- Completed rewrite of html.c. Except for determine_charset, almost nothing
remains.
- Fixed bug on determine_charset that was preventing correct detection in
combination with internal mbstring encoding "none", "pass" or "auto".
- Added profiles for entity encode/decode for HTMl 4.01, XHTML 1.0, XML 1.0
and HTML 5. Added the constants ENT_HTML401, ENT_XML1, ENT_XHTML and
ENT_HTML5.
- htmlentities()/htmlspecialchars(), when told not to double encode, verify
the correctness of the existenting entities more thoroughly.
It is checked whether the numerical entity represents a valid unicode code
point (number is between 0 and 0x10FFFF). If using the flag ENT_DISALLOWED,
it is also checked whether that numerical entity is valid in selected
document. In HTML 4.01, all the numerical entities that represent a Unicode
code point (< U+10FFFFFF) are valid, but that's not the case with other
document types. If the entity is not valid, & is encoded to &.
For named entities, the check is also more thorough. While before the only
check would be to determine if the entity was constituted by alphanumeric
characters, now it is checked whether that entity is necessarily defined for
the target document type. Otherwise, & is encoded to &.
- For html_entity_decode(), only valid numerical and named entities (as defined
above for htmlentities()/htmlspecialchars() + !double_encode) are decoded.
But there is in this case one additional check. Entities that represent
non-SGML or otherwise invalid characters are not decoded. Note that, in
HTML5, U+000D is a valid literal character, but the entity 
 is not
valid and is therefore not decoded.
- The hash tables lazily created for decoding in html_entity_decode() that were
added recently were substituted by static hash tables. Instead of 1 hash
table per encoding, there's only one hash table per document type defined in
terms of unicode code points. This means that for charsets other than UTF-8
and ISO-8859-1, a conversion to unicode code points is necessary before
decoding.
- On the encoding side, the ad hoc ranges of entities of the translation
tables, which mapped (in general) non-unicode code points to HTML entities
were replaced by three-stage tables for HTML 4 and HTML 5. This mapping
tables are defined only in terms of unicode code points, so a conversion
is necessary for charsets other than UTF-8 and ISO-8859-1. Even so, the
multi-stage table is much faster than the previous method, by a factor
of 5; the conversion to unicode is a small penalty because it's just a
simple table lookup.
XML 1.0/htmlspecialchars() uses a simple table instead of a three-stage
table.
- Added the flag ENT_SUBSTITUTE, which makes htmlentities()/htmlspecialchars()
replace the invalid multibyte sequences with U+FFFD (UTF-8) or &#FFFD;
(other encodings).
- Added the flag ENT_DISALLOWED. Implements FR #52860. Characters that cannot
appear literally are replaced by U+FFFD (UTF-8) or &#FFFD; (otherwise).
An alternative implementation would be to encode those characters into
numerical entities, but that would only work in HTML 4.01 due to limitations
on the values of numerical entities in other document types. See also the
effects on htmlentities()/htmlspecialchars() with !double_encode above.
Diffstat (limited to 'ext/standard/tests/strings/html_entity_decode2.phpt')
-rw-r--r-- | ext/standard/tests/strings/html_entity_decode2.phpt | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/ext/standard/tests/strings/html_entity_decode2.phpt b/ext/standard/tests/strings/html_entity_decode2.phpt new file mode 100644 index 0000000000..b8a6e49eb3 --- /dev/null +++ b/ext/standard/tests/strings/html_entity_decode2.phpt @@ -0,0 +1,33 @@ +--TEST-- +html_entity_decode: Handling of ' +--FILE-- +<?php + +echo "*** HTML 4.01 implicit (shouldn't decode) ***\n"; +echo html_entity_decode("'", ENT_QUOTES, "UTF-8"), "\n"; + +echo "*** HTML 4.01 (shouldn't decode) ***\n"; +echo html_entity_decode("'", ENT_QUOTES | ENT_HTML401, "UTF-8"), "\n"; + +echo "*** HTML 5 ***\n"; +echo html_entity_decode("'", ENT_QUOTES | ENT_HTML5, "UTF-8"), "\n"; + +echo "*** XHTML 1.0 ***\n"; +echo html_entity_decode("'", ENT_QUOTES | ENT_XHTML, "UTF-8"), "\n"; + +echo "*** XML 1.0 ***\n"; +echo html_entity_decode("'", ENT_QUOTES | ENT_XML1, "UTF-8"), "\n"; + +echo "Done.\n"; +--EXPECT-- +*** HTML 4.01 implicit (shouldn't decode) *** +' +*** HTML 4.01 (shouldn't decode) *** +' +*** HTML 5 *** +' +*** XHTML 1.0 *** +' +*** XML 1.0 *** +' +Done.
\ No newline at end of file |