diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/standard/html.c | 10 | ||||
| -rw-r--r-- | ext/standard/tests/strings/bug44703.phpt | 12 | ||||
| -rw-r--r-- | ext/standard/tests/strings/get_html_translation_table_basic1.phpt | 239 | ||||
| -rw-r--r-- | ext/standard/tests/strings/get_html_translation_table_basic2.phpt | 717 | ||||
| -rw-r--r-- | ext/standard/tests/strings/get_html_translation_table_variation1.phpt | 1000 | ||||
| -rw-r--r-- | ext/standard/tests/strings/htmlentities.phpt | 10 | ||||
| -rw-r--r-- | php.ini-development | 2 | ||||
| -rw-r--r-- | php.ini-production | 2 |
9 files changed, 1569 insertions, 424 deletions
@@ -1,6 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 201?, PHP 5.3.99 +- default_charset if not specified is now UTF-8 instead of ISO-8859-1. (Rasmus) ?? ??? 20??, PHP 5.3.3 - Upgraded bundled PCRE to version 8.01. (Ilia) diff --git a/ext/standard/html.c b/ext/standard/html.c index e5891588a7..d9ccff9dd0 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -711,17 +711,17 @@ inline static unsigned int get_next_char(enum entity_charset charset, /* {{{ entity_charset determine_charset * returns the charset identifier based on current locale or a hint. - * defaults to iso-8859-1 */ + * defaults to UTF-8 */ static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC) { int i; - enum entity_charset charset = cs_8859_1; + enum entity_charset charset = cs_utf_8; int len = 0; zval *uf_result = NULL; - /* Guarantee default behaviour for backwards compatibility */ + /* Default is now UTF-8 */ if (charset_hint == NULL) - return cs_8859_1; + return cs_utf_8; if ((len = strlen(charset_hint)) != 0) { goto det_charset; @@ -855,7 +855,7 @@ det_charset: } } if (!found) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "charset `%s' not supported, assuming iso-8859-1", + php_error_docref(NULL TSRMLS_CC, E_WARNING, "charset `%s' not supported, assuming utf-8", charset_hint); } } diff --git a/ext/standard/tests/strings/bug44703.phpt b/ext/standard/tests/strings/bug44703.phpt index 0b019b9cb4..e20b1dd83f 100644 --- a/ext/standard/tests/strings/bug44703.phpt +++ b/ext/standard/tests/strings/bug44703.phpt @@ -22,25 +22,25 @@ var_dump(htmlspecialchars(b"<>", ENT_COMPAT, str_repeat('a', 100))); ?> --EXPECTF-- -Warning: htmlspecialchars(): charset `1' not supported, assuming iso-8859-1 in %s on line %d +Warning: htmlspecialchars(): charset `1' not supported, assuming utf-8 in %s on line %d string(35) "<a href='test'>Test</a>" -Warning: htmlspecialchars(): charset `12' not supported, assuming iso-8859-1 in %s on line %d +Warning: htmlspecialchars(): charset `12' not supported, assuming utf-8 in %s on line %d string(35) "<a href='test'>Test</a>" -Warning: htmlspecialchars(): charset `125' not supported, assuming iso-8859-1 in %s on line %d +Warning: htmlspecialchars(): charset `125' not supported, assuming utf-8 in %s on line %d string(35) "<a href='test'>Test</a>" string(35) "<a href='test'>Test</a>" -Warning: htmlspecialchars(): charset `12526' not supported, assuming iso-8859-1 in %s on line %d +Warning: htmlspecialchars(): charset `12526' not supported, assuming utf-8 in %s on line %d string(35) "<a href='test'>Test</a>" string(8) "<>" -Warning: htmlspecialchars(): charset `8666' not supported, assuming iso-8859-1 in %s on line %d +Warning: htmlspecialchars(): charset `8666' not supported, assuming utf-8 in %s on line %d string(8) "<>" string(8) "<>" string(8) "<>" string(8) "<>" -Warning: htmlspecialchars(): charset `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' not supported, assuming iso-8859-1 in %s on line %d +Warning: htmlspecialchars(): charset `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' not supported, assuming utf-8 in %s on line %d string(8) "<>" diff --git a/ext/standard/tests/strings/get_html_translation_table_basic1.phpt b/ext/standard/tests/strings/get_html_translation_table_basic1.phpt index a3dd507123..c09388335b 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic1.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic1.phpt @@ -53,33 +53,33 @@ array(4) { string(5) "&" } -- with table = HTML_ENTITIES -- -array(100) { +array(171) { [""]=> - string(6) " " + string(4) "Π" [""]=> - string(7) "¡" + string(5) "Ρ" [""]=> string(6) "¢" [""]=> - string(7) "£" + string(7) "Σ" [""]=> - string(8) "¤" + string(5) "Τ" [""]=> - string(5) "¥" + string(6) "⊥" [""]=> - string(8) "¦" + string(5) "Φ" [""]=> - string(6) "§" + string(5) "Χ" [""]=> - string(5) "¨" + string(5) "Ψ" [""]=> - string(6) "©" + string(7) "Ω" [""]=> string(6) "ª" [""]=> string(7) "«" [""]=> - string(5) "¬" + string(6) "€" [""]=> string(5) "­" [""]=> @@ -89,57 +89,57 @@ array(100) { [""]=> string(5) "°" [""]=> - string(8) "±" + string(7) "α" [""]=> - string(6) "²" + string(6) "β" [""]=> - string(6) "³" + string(7) "γ" [""]=> - string(7) "´" + string(7) "δ" [""]=> - string(7) "µ" + string(7) "↵" [""]=> - string(6) "¶" + string(6) "ζ" [""]=> - string(8) "·" + string(5) "η" [""]=> - string(7) "¸" + string(7) "θ" [""]=> - string(6) "¹" + string(6) "ι" [""]=> - string(6) "º" + string(7) "κ" [""]=> - string(7) "»" + string(8) "λ" [""]=> - string(8) "¼" + string(4) "μ" [""]=> - string(8) "½" + string(4) "ν" [""]=> - string(8) "¾" + string(4) "ξ" [""]=> - string(8) "¿" + string(9) "ο" [""]=> - string(8) "À" + string(4) "π" [""]=> - string(8) "Á" + string(5) "ρ" [""]=> - string(7) "Â" + string(8) "ς" [""]=> - string(8) "Ã" + string(7) "σ" [""]=> - string(6) "Ä" + string(5) "τ" [""]=> - string(7) "Å" + string(6) "⋅" [""]=> - string(7) "Æ" + string(5) "φ" [""]=> - string(8) "Ç" + string(5) "χ" [""]=> - string(8) "È" + string(5) "ψ" [""]=> - string(8) "É" + string(7) "ω" [""]=> - string(7) "Ê" + string(5) "◊" [""]=> string(6) "Ë" [""]=> @@ -151,19 +151,19 @@ array(100) { [""]=> string(6) "Ï" [""]=> - string(5) "Ð" + string(6) "⇐" [""]=> - string(8) "Ñ" + string(6) "⇑" [""]=> - string(8) "Ò" + string(6) "⇒" [""]=> - string(8) "Ó" + string(6) "⇓" [""]=> - string(7) "Ô" + string(6) "⇔" [""]=> string(8) "Õ" [""]=> - string(6) "Ö" + string(5) "ϖ" [""]=> string(7) "×" [""]=> @@ -175,7 +175,7 @@ array(100) { [""]=> string(7) "Û" [""]=> - string(6) "Ü" + string(7) "˜" [""]=> string(8) "Ý" [""]=> @@ -246,14 +246,157 @@ array(100) { string(7) "þ" [""]=> string(6) "ÿ" + ["R"]=> + string(7) "Œ" + ["S"]=> + string(7) "œ" + ["`"]=> + string(8) "♠" + ["a"]=> + string(7) "≡" + ["x"]=> + string(6) "Ÿ" + [""]=> + string(6) "→" + [""]=> + string(6) "↑" + [""]=> + string(6) "↓" + [""]=> + string(6) "↔" + [""]=> + string(7) "⊕" + [""]=> + string(6) "Ζ" + [""]=> + string(8) "⊗" + [""]=> + string(7) "Θ" + [""]=> + string(6) "Ι" + [""]=> + string(7) "Κ" + [""]=> + string(8) "Λ" + [""]=> + string(4) "Μ" + [""]=> + string(4) "Ν" + [""]=> + string(4) "Ξ" + [""]=> + string(9) "Ο" + [""]=> + string(6) "∂" + [""]=> + string(7) "∃" + [" "]=> + string(7) "⌉" + [" "]=> + string(6) "‌" + ["
"]=> + string(5) "‍" + [""]=> + string(5) "‎" + [""]=> + string(6) "∏" + [""]=> + string(7) "–" + [""]=> + string(7) "—" + [""]=> + string(8) "℘" + [""]=> + string(7) "’" + [""]=> + string(7) "√" + [" "]=> + string(6) "ℜ" + [" "]=> + string(6) "∝" + [" "]=> + string(7) "∞" + [" "]=> + string(5) "∠" + ["!"]=> + string(8) "‡" ["""]=> string(6) """ - ["<"]=> - string(4) "<" - [">"]=> - string(4) ">" ["&"]=> string(5) "&" + [0]=> + string(8) "‰" + [2]=> + string(7) "′" + [3]=> + string(7) "″" + [9]=> + string(8) "‹" + [":"]=> + string(8) "›" + [">"]=> + string(4) ">" + ["D"]=> + string(7) "⁄" + [""]=> + string(5) "∑" + [5]=> + string(9) "ℵ" + [""]=> + string(6) "←" + [""]=> + string(8) "∀" + [""]=> + string(7) "∅" + [""]=> + string(7) "∇" + [""]=> + string(7) "⌈" + [" "]=> + string(8) "⌋" + [""]=> + string(7) "−" + [""]=> + string(8) "∗" + ["'"]=> + string(5) "∧" + ["("]=> + string(4) "∨" + [")"]=> + string(6) "⟨" + ["*"]=> + string(6) "⟩" + ["+"]=> + string(5) "∫" + [4]=> + string(8) "∴" + ["<"]=> + string(4) "<" + ["E"]=> + string(6) "≅" + ["H"]=> + string(7) "≈" + ["d"]=> + string(4) "≤" + ["e"]=> + string(8) "♥" + [""]=> + string(5) "⊂" + [""]=> + string(5) "⊃" + [""]=> + string(6) "⊄" + [""]=> + string(6) "⊆" + [""]=> + string(6) "⊇" + [" +"]=> + string(8) "⌊" + ["c"]=> + string(7) "♣" + ["f"]=> + string(7) "♦" } -- with table = HTML_SPECIALCHARS -- array(4) { diff --git a/ext/standard/tests/strings/get_html_translation_table_basic2.phpt b/ext/standard/tests/strings/get_html_translation_table_basic2.phpt index 3e04638ccd..ca9f8ce8ca 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic2.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic2.phpt @@ -61,33 +61,33 @@ array(4) { string(5) "&" } -- with table = HTML_ENTITIES & quote_style = ENT_COMPAT -- -array(100) { +array(171) { [""]=> - string(6) " " + string(4) "Π" [""]=> - string(7) "¡" + string(5) "Ρ" [""]=> string(6) "¢" [""]=> - string(7) "£" + string(7) "Σ" [""]=> - string(8) "¤" + string(5) "Τ" [""]=> - string(5) "¥" + string(6) "⊥" [""]=> - string(8) "¦" + string(5) "Φ" [""]=> - string(6) "§" + string(5) "Χ" [""]=> - string(5) "¨" + string(5) "Ψ" [""]=> - string(6) "©" + string(7) "Ω" [""]=> string(6) "ª" [""]=> string(7) "«" [""]=> - string(5) "¬" + string(6) "€" [""]=> string(5) "­" [""]=> @@ -97,57 +97,57 @@ array(100) { [""]=> string(5) "°" [""]=> - string(8) "±" + string(7) "α" [""]=> - string(6) "²" + string(6) "β" [""]=> - string(6) "³" + string(7) "γ" [""]=> - string(7) "´" + string(7) "δ" [""]=> - string(7) "µ" + string(7) "↵" [""]=> - string(6) "¶" + string(6) "ζ" [""]=> - string(8) "·" + string(5) "η" [""]=> - string(7) "¸" + string(7) "θ" [""]=> - string(6) "¹" + string(6) "ι" [""]=> - string(6) "º" + string(7) "κ" [""]=> - string(7) "»" + string(8) "λ" [""]=> - string(8) "¼" + string(4) "μ" [""]=> - string(8) "½" + string(4) "ν" [""]=> - string(8) "¾" + string(4) "ξ" [""]=> - string(8) "¿" + string(9) "ο" [""]=> - string(8) "À" + string(4) "π" [""]=> - string(8) "Á" + string(5) "ρ" [""]=> - string(7) "Â" + string(8) "ς" [""]=> - string(8) "Ã" + string(7) "σ" [""]=> - string(6) "Ä" + string(5) "τ" [""]=> - string(7) "Å" + string(6) "⋅" [""]=> - string(7) "Æ" + string(5) "φ" [""]=> - string(8) "Ç" + string(5) "χ" [""]=> - string(8) "È" + string(5) "ψ" [""]=> - string(8) "É" + string(7) "ω" [""]=> - string(7) "Ê" + string(5) "◊" [""]=> string(6) "Ë" [""]=> @@ -159,19 +159,19 @@ array(100) { [""]=> string(6) "Ï" [""]=> - string(5) "Ð" + string(6) "⇐" [""]=> - string(8) "Ñ" + string(6) "⇑" [""]=> - string(8) "Ò" + string(6) "⇒" [""]=> - string(8) "Ó" + string(6) "⇓" [""]=> - string(7) "Ô" + string(6) "⇔" [""]=> string(8) "Õ" [""]=> - string(6) "Ö" + string(5) "ϖ" [""]=> string(7) "×" [""]=> @@ -183,7 +183,7 @@ array(100) { [""]=> string(7) "Û" [""]=> - string(6) "Ü" + string(7) "˜" [""]=> string(8) "Ý" [""]=> @@ -254,43 +254,186 @@ array(100) { string(7) "þ" [""]=> string(6) "ÿ" + ["R"]=> + string(7) "Œ" + ["S"]=> + string(7) "œ" + ["`"]=> + string(8) "♠" + ["a"]=> + string(7) "≡" + ["x"]=> + string(6) "Ÿ" + [""]=> + string(6) "→" + [""]=> + string(6) "↑" + [""]=> + string(6) "↓" + [""]=> + string(6) "↔" + [""]=> + string(7) "⊕" + [""]=> + string(6) "Ζ" + [""]=> + string(8) "⊗" + [""]=> + string(7) "Θ" + [""]=> + string(6) "Ι" + [""]=> + string(7) "Κ" + [""]=> + string(8) "Λ" + [""]=> + string(4) "Μ" + [""]=> + string(4) "Ν" + [""]=> + string(4) "Ξ" + [""]=> + string(9) "Ο" + [""]=> + string(6) "∂" + [""]=> + string(7) "∃" + [" "]=> + string(7) "⌉" + [" "]=> + string(6) "‌" + ["
"]=> + string(5) "‍" + [""]=> + string(5) "‎" + [""]=> + string(6) "∏" + [""]=> + string(7) "–" + [""]=> + string(7) "—" + [""]=> + string(8) "℘" + [""]=> + string(7) "’" + [""]=> + string(7) "√" + [" "]=> + string(6) "ℜ" + [" "]=> + string(6) "∝" + [" "]=> + string(7) "∞" + [" "]=> + string(5) "∠" + ["!"]=> + string(8) "‡" ["""]=> string(6) """ - ["<"]=> - string(4) "<" - [">"]=> - string(4) ">" ["&"]=> string(5) "&" + [0]=> + string(8) "‰" + [2]=> + string(7) "′" + [3]=> + string(7) "″" + [9]=> + string(8) "‹" + [":"]=> + string(8) "›" + [">"]=> + string(4) ">" + ["D"]=> + string(7) "⁄" + [""]=> + string(5) "∑" + [5]=> + string(9) "ℵ" + [""]=> + string(6) "←" + [""]=> + string(8) "∀" + [""]=> + string(7) "∅" + [""]=> + string(7) "∇" + [""]=> + string(7) "⌈" + [" "]=> + string(8) "⌋" + [""]=> + string(7) "−" + [""]=> + string(8) "∗" + ["'"]=> + string(5) "∧" + ["("]=> + string(4) "∨" + [")"]=> + string(6) "⟨" + ["*"]=> + string(6) "⟩" + ["+"]=> + string(5) "∫" + [4]=> + string(8) "∴" + ["<"]=> + string(4) "<" + ["E"]=> + string(6) "≅" + ["H"]=> + string(7) "≈" + ["d"]=> + string(4) "≤" + ["e"]=> + string(8) "♥" + [""]=> + string(5) "⊂" + [""]=> + string(5) "⊃" + [""]=> + string(6) "⊄" + [""]=> + string(6) "⊆" + [""]=> + string(6) "⊇" + [" +"]=> + string(8) "⌊" + ["c"]=> + string(7) "♣" + ["f"]=> + string(7) "♦" } -- with table = HTML_ENTITIES & quote_style = ENT_QUOTES -- -array(101) { +array(171) { [""]=> - string(6) " " + string(4) "Π" [""]=> - string(7) "¡" + string(5) "Ρ" [""]=> string(6) "¢" [""]=> - string(7) "£" + string(7) "Σ" [""]=> - string(8) "¤" + string(5) "Τ" [""]=> - string(5) "¥" + string(6) "⊥" [""]=> - string(8) "¦" + string(5) "Φ" [""]=> - string(6) "§" + string(5) "Χ" [""]=> - string(5) "¨" + string(5) "Ψ" [""]=> - string(6) "©" + string(7) "Ω" [""]=> string(6) "ª" [""]=> string(7) "«" [""]=> - string(5) "¬" + string(6) "€" [""]=> string(5) "­" [""]=> @@ -300,57 +443,57 @@ array(101) { [""]=> string(5) "°" [""]=> - string(8) "±" + string(7) "α" [""]=> - string(6) "²" + string(6) "β" [""]=> - string(6) "³" + string(7) "γ" [""]=> - string(7) "´" + string(7) "δ" [""]=> - string(7) "µ" + string(7) "↵" [""]=> - string(6) "¶" + string(6) "ζ" [""]=> - string(8) "·" + string(5) "η" [""]=> - string(7) "¸" + string(7) "θ" [""]=> - string(6) "¹" + string(6) "ι" [""]=> - string(6) "º" + string(7) "κ" [""]=> - string(7) "»" + string(8) "λ" [""]=> - string(8) "¼" + string(4) "μ" [""]=> - string(8) "½" + string(4) "ν" [""]=> - string(8) "¾" + string(4) "ξ" [""]=> - string(8) "¿" + string(9) "ο" [""]=> - string(8) "À" + string(4) "π" [""]=> - string(8) "Á" + string(5) "ρ" [""]=> - string(7) "Â" + string(8) "ς" [""]=> - string(8) "Ã" + string(7) "σ" [""]=> - string(6) "Ä" + string(5) "τ" [""]=> - string(7) "Å" + string(6) "⋅" [""]=> - string(7) "Æ" + string(5) "φ" [""]=> - string(8) "Ç" + string(5) "χ" [""]=> - string(8) "È" + string(5) "ψ" [""]=> - string(8) "É" + string(7) "ω" [""]=> - string(7) "Ê" + string(5) "◊" [""]=> string(6) "Ë" [""]=> @@ -362,19 +505,19 @@ array(101) { [""]=> string(6) "Ï" [""]=> - string(5) "Ð" + string(6) "⇐" [""]=> - string(8) "Ñ" + string(6) "⇑" [""]=> - string(8) "Ò" + string(6) "⇒" [""]=> - string(8) "Ó" + string(6) "⇓" [""]=> - string(7) "Ô" + string(6) "⇔" [""]=> string(8) "Õ" [""]=> - string(6) "Ö" + string(5) "ϖ" [""]=> string(7) "×" [""]=> @@ -386,7 +529,7 @@ array(101) { [""]=> string(7) "Û" [""]=> - string(6) "Ü" + string(7) "˜" [""]=> string(8) "Ý" [""]=> @@ -457,45 +600,186 @@ array(101) { string(7) "þ" [""]=> string(6) "ÿ" + ["R"]=> + string(7) "Œ" + ["S"]=> + string(7) "œ" + ["`"]=> + string(8) "♠" + ["a"]=> + string(7) "≡" + ["x"]=> + string(6) "Ÿ" + [""]=> + string(6) "→" + [""]=> + string(6) "↑" + [""]=> + string(6) "↓" + [""]=> + string(6) "↔" + [""]=> + string(7) "⊕" + [""]=> + string(6) "Ζ" + [""]=> + string(8) "⊗" + [""]=> + string(7) "Θ" + [""]=> + string(6) "Ι" + [""]=> + string(7) "Κ" + [""]=> + string(8) "Λ" + [""]=> + string(4) "Μ" + [""]=> + string(4) "Ν" + [""]=> + string(4) "Ξ" + [""]=> + string(9) "Ο" + [""]=> + string(6) "∂" + [""]=> + string(7) "∃" + [" "]=> + string(7) "⌉" + [" "]=> + string(6) "‌" + ["
"]=> + string(5) "‍" + [""]=> + string(5) "‎" + [""]=> + string(6) "∏" + [""]=> + string(7) "–" + [""]=> + string(7) "—" + [""]=> + string(8) "℘" + [""]=> + string(7) "’" + [""]=> + string(7) "√" + [" "]=> + string(6) "ℜ" + [" "]=> + string(6) "∝" + [" "]=> + string(7) "∞" + [" "]=> + string(5) "∠" + ["!"]=> + string(8) "‡" ["""]=> string(6) """ + ["&"]=> + string(5) "&" + [0]=> + string(8) "‰" + [2]=> + string(7) "′" + [3]=> + string(7) "″" + [9]=> + string(8) "‹" + [":"]=> + string(8) "›" + [">"]=> + string(4) ">" + ["D"]=> + string(7) "⁄" + [""]=> + string(5) "∑" + [5]=> + string(9) "ℵ" + [""]=> + string(6) "←" + [""]=> + string(8) "∀" + [""]=> + string(7) "∅" + [""]=> + string(7) "∇" + [""]=> + string(7) "⌈" + [" "]=> + string(8) "⌋" + [""]=> + string(7) "−" + [""]=> + string(8) "∗" ["'"]=> string(5) "'" + ["("]=> + string(4) "∨" + [")"]=> + string(6) "⟨" + ["*"]=> + string(6) "⟩" + ["+"]=> + string(5) "∫" + [4]=> + string(8) "∴" ["<"]=> string(4) "<" - [">"]=> - string(4) ">" - ["&"]=> - string(5) "&" + ["E"]=> + string(6) "≅" + ["H"]=> + string(7) "≈" + ["d"]=> + string(4) "≤" + ["e"]=> + string(8) "♥" + [""]=> + string(5) "⊂" + [""]=> + string(5) "⊃" + [""]=> + string(6) "⊄" + [""]=> + string(6) "⊆" + [""]=> + string(6) "⊇" + [" +"]=> + string(8) "⌊" + ["c"]=> + string(7) "♣" + ["f"]=> + string(7) "♦" } -- with table = HTML_ENTITIES & quote_style = ENT_NOQUOTES -- -array(99) { +array(171) { [""]=> - string(6) " " + string(4) "Π" [""]=> - string(7) "¡" + string(5) "Ρ" [""]=> string(6) "¢" [""]=> - string(7) "£" + string(7) "Σ" [""]=> - string(8) "¤" + string(5) "Τ" [""]=> - string(5) "¥" + string(6) "⊥" [""]=> - string(8) "¦" + string(5) "Φ" [""]=> - string(6) "§" + string(5) "Χ" [""]=> - string(5) "¨" + string(5) "Ψ" [""]=> - string(6) "©" + string(7) "Ω" [""]=> string(6) "ª" [""]=> string(7) "«" [""]=> - string(5) "¬" + string(6) "€" [""]=> string(5) "­" [""]=> @@ -505,57 +789,57 @@ array(99) { [""]=> string(5) "°" [""]=> - string(8) "±" + string(7) "α" [""]=> - string(6) "²" + string(6) "β" [""]=> - string(6) "³" + string(7) "γ" [""]=> - string(7) "´" + string(7) "δ" [""]=> - string(7) "µ" + string(7) "↵" [""]=> - string(6) "¶" + string(6) "ζ" [""]=> - string(8) "·" + string(5) "η" [""]=> - string(7) "¸" + string(7) "θ" [""]=> - string(6) "¹" + string(6) "ι" [""]=> - string(6) "º" + string(7) "κ" [""]=> - string(7) "»" + string(8) "λ" [""]=> - string(8) "¼" + string(4) "μ" [""]=> - string(8) "½" + string(4) "ν" [""]=> - string(8) "¾" + string(4) "ξ" [""]=> - string(8) "¿" + string(9) "ο" [""]=> - string(8) "À" + string(4) "π" [""]=> - string(8) "Á" + string(5) "ρ" [""]=> - string(7) "Â" + string(8) "ς" [""]=> - string(8) "Ã" + string(7) "σ" [""]=> - string(6) "Ä" + string(5) "τ" [""]=> - string(7) "Å" + string(6) "⋅" [""]=> - string(7) "Æ" + string(5) "φ" [""]=> - string(8) "Ç" + string(5) "χ" [""]=> - string(8) "È" + string(5) "ψ" [""]=> - string(8) "É" + string(7) "ω" [""]=> - string(7) "Ê" + string(5) "◊" [""]=> string(6) "Ë" [""]=> @@ -567,19 +851,19 @@ array(99) { [""]=> string(6) "Ï" [""]=> - string(5) "Ð" + string(6) "⇐" [""]=> - string(8) "Ñ" + string(6) "⇑" [""]=> - string(8) "Ò" + string(6) "⇒" [""]=> - string(8) "Ó" + string(6) "⇓" [""]=> - string(7) "Ô" + string(6) "⇔" [""]=> string(8) "Õ" [""]=> - string(6) "Ö" + string(5) "ϖ" [""]=> string(7) "×" [""]=> @@ -591,7 +875,7 @@ array(99) { [""]=> string(7) "Û" [""]=> - string(6) "Ü" + string(7) "˜" [""]=> string(8) "Ý" [""]=> @@ -662,11 +946,156 @@ array(99) { string(7) "þ" [""]=> string(6) "ÿ" - ["<"]=> - string(4) "<" - [">"]=> - string(4) ">" + ["R"]=> + string(7) "Œ" + ["S"]=> + string(7) "œ" + ["`"]=> + string(8) "♠" + ["a"]=> + string(7) "≡" + ["x"]=> + string(6) "Ÿ" + [""]=> + string(6) "→" + [""]=> + string(6) "↑" + [""]=> + string(6) "↓" + [""]=> + string(6) "↔" + [""]=> + string(7) "⊕" + [""]=> + string(6) "Ζ" + [""]=> + string(8) "⊗" + [""]=> + string(7) "Θ" + [""]=> + string(6) "Ι" + [""]=> + string(7) "Κ" + [""]=> + string(8) "Λ" + [""]=> + string(4) "Μ" + [""]=> + string(4) "Ν" + [""]=> + string(4) "Ξ" + [""]=> + string(9) "Ο" + [""]=> + string(6) "∂" + [""]=> + string(7) "∃" + [" "]=> + string(7) "⌉" + [" "]=> + string(6) "‌" + ["
"]=> + string(5) "‍" + [""]=> + string(5) "‎" + [""]=> + string(6) "∏" + [""]=> + string(7) "–" + [""]=> + string(7) "—" + [""]=> + string(8) "℘" + [""]=> + string(7) "’" + [""]=> + string(7) "√" + [" "]=> + string(6) "ℜ" + [" "]=> + string(6) "∝" + [" "]=> + string(7) "∞" + [" "]=> + string(5) "∠" + ["!"]=> + string(8) "‡" + ["""]=> + string(7) "™" ["&"]=> string(5) "&" + [0]=> + string(8) "‰" + [2]=> + string(7) "′" + [3]=> + string(7) "″" + [9]=> + string(8) "‹" + [":"]=> + string(8) "›" + [">"]=> + string(4) ">" + ["D"]=> + string(7) "⁄" + [""]=> + string(5) "∑" + [5]=> + string(9) "ℵ" + [""]=> + string(6) "←" + [""]=> + string(8) "∀" + [""]=> + string(7) "∅" + [""]=> + string(7) "∇" + [""]=> + string(7) "⌈" + [" "]=> + string(8) "⌋" + [""]=> + string(7) "−" + [""]=> + string(8) "∗" + ["'"]=> + string(5) "∧" + ["("]=> + string(4) "∨" + [")"]=> + string(6) "⟨" + ["*"]=> + string(6) "⟩" + ["+"]=> + string(5) "∫" + [4]=> + string(8) "∴" + ["<"]=> + string(4) "<" + ["E"]=> + string(6) "≅" + ["H"]=> + string(7) "≈" + ["d"]=> + string(4) "≤" + ["e"]=> + string(8) "♥" + [""]=> + string(5) "⊂" + [""]=> + string(5) "⊃" + [""]=> + string(6) "⊄" + [""]=> + string(6) "⊆" + [""]=> + string(6) "⊇" + [" +"]=> + string(8) "⌊" + ["c"]=> + string(7) "♣" + ["f"]=> + string(7) "♦" } Done diff --git a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt index 7bf919e350..3113f40a8b 100644 --- a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt @@ -102,67 +102,67 @@ echo "Done\n"; --- Testing get_html_translation_table() by supplying different values for 'table' argument --- -- Iteration 1 -- -Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d NULL -- Iteration 2 -- -Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d NULL -- Iteration 3 -- -Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d NULL -- Iteration 4 -- -Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d NULL -- Iteration 5 -- -Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d NULL -- Iteration 6 -- -array(100) { +array(171) { [""]=> - string(6) " " + string(4) "Π" [""]=> - string(7) "¡" + string(5) "Ρ" [""]=> string(6) "¢" [""]=> - string(7) "£" + string(7) "Σ" [""]=> - string(8) "¤" + string(5) "Τ" [""]=> - string(5) "¥" + string(6) "⊥" [""]=> - string(8) "¦" + string(5) "Φ" [""]=> - string(6) "§" + string(5) "Χ" [""]=> - string(5) "¨" + string(5) "Ψ" [""]=> - string(6) "©" + string(7) "Ω" [""]=> string(6) "ª" [""]=> string(7) "«" [""]=> - string(5) "¬" + string(6) "€" [""]=> string(5) "­" [""]=> @@ -172,57 +172,57 @@ array(100) { [""]=> string(5) "°" [""]=> - string(8) "±" + string(7) "α" [""]=> - string(6) "²" + string(6) "β" [""]=> - string(6) "³" + string(7) "γ" [""]=> - string(7) "´" + string(7) "δ" [""]=> - string(7) "µ" + string(7) "↵" [""]=> - string(6) "¶" + string(6) "ζ" [""]=> - string(8) "·" + string(5) "η" [""]=> - string(7) "¸" + string(7) "θ" [""]=> - string(6) "¹" + string(6) "ι" [""]=> - string(6) "º" + string(7) "κ" [""]=> - string(7) "»" + string(8) "λ" [""]=> - string(8) "¼" + string(4) "μ" [""]=> - string(8) "½" + string(4) "ν" [""]=> - string(8) "¾" + string(4) "ξ" [""]=> - string(8) "¿" + string(9) "ο" [""]=> - string(8) "À" + string(4) "π" [""]=> - string(8) "Á" + string(5) "ρ" [""]=> - string(7) "Â" + string(8) "ς" [""]=> - string(8) "Ã" + string(7) "σ" [""]=> - string(6) "Ä" + string(5) "τ" [""]=> - string(7) "Å" + string(6) "⋅" [""]=> - string(7) "Æ" + string(5) "φ" [""]=> - string(8) "Ç" + string(5) "χ" [""]=> - string(8) "È" + string(5) "ψ" [""]=> - string(8) "É" + string(7) "ω" [""]=> - string(7) "Ê" + string(5) "◊" [""]=> string(6) "Ë" [""]=> @@ -234,19 +234,19 @@ array(100) { [""]=> string(6) "Ï" [""]=> - string(5) "Ð" + string(6) "⇐" [""]=> - string(8) "Ñ" + string(6) "⇑" [""]=> - string(8) "Ò" + string(6) "⇒" [""]=> - string(8) "Ó" + string(6) "⇓" [""]=> - string(7) "Ô" + string(6) "⇔" [""]=> string(8) "Õ" [""]=> - string(6) "Ö" + string(5) "ϖ" [""]=> string(7) "×" [""]=> @@ -258,7 +258,7 @@ array(100) { [""]=> string(7) "Û" [""]=> - string(6) "Ü" + string(7) "˜" [""]=> string(8) "Ý" [""]=> @@ -329,42 +329,185 @@ array(100) { string(7) "þ" [""]=> string(6) "ÿ" + ["R"]=> + string(7) "Œ" + ["S"]=> + string(7) "œ" + ["`"]=> + string(8) "♠" + ["a"]=> + string(7) "≡" + ["x"]=> + string(6) "Ÿ" + [""]=> + string(6) "→" + [""]=> + string(6) "↑" + [""]=> + string(6) "↓" + [""]=> + string(6) "↔" + [""]=> + string(7) "⊕" + [""]=> + string(6) "Ζ" + [""]=> + string(8) "⊗" + [""]=> + string(7) "Θ" + [""]=> + string(6) "Ι" + [""]=> + string(7) "Κ" + [""]=> + string(8) "Λ" + [""]=> + string(4) "Μ" + [""]=> + string(4) "Ν" + [""]=> + string(4) "Ξ" + [""]=> + string(9) "Ο" + [""]=> + string(6) "∂" + [""]=> + string(7) "∃" + [" "]=> + string(7) "⌉" + [" "]=> + string(6) "‌" + ["
"]=> + string(5) "‍" + [""]=> + string(5) "‎" + [""]=> + string(6) "∏" + [""]=> + string(7) "–" + [""]=> + string(7) "—" + [""]=> + string(8) "℘" + [""]=> + string(7) "’" + [""]=> + string(7) "√" + [" "]=> + string(6) "ℜ" + [" "]=> + string(6) "∝" + [" "]=> + string(7) "∞" + [" "]=> + string(5) "∠" + ["!"]=> + string(8) "‡" ["""]=> string(6) """ - ["<"]=> - string(4) "<" - [">"]=> - string(4) ">" ["&"]=> string(5) "&" + [0]=> + string(8) "‰" + [2]=> + string(7) "′" + [3]=> + string(7) "″" + [9]=> + string(8) "‹" + [":"]=> + string(8) "›" + [">"]=> + string(4) ">" + ["D"]=> + string(7) "⁄" + [""]=> + string(5) "∑" + [5]=> + string(9) "ℵ" + [""]=> + string(6) "←" + [""]=> + string(8) "∀" + [""]=> + string(7) "∅" + [""]=> + string(7) "∇" + [""]=> + string(7) "⌈" + [" "]=> + string(8) "⌋" + [""]=> + string(7) "−" + [""]=> + string(8) "∗" + ["'"]=> + string(5) "∧" + ["("]=> + string(4) "∨" + [")"]=> + string(6) "⟨" + ["*"]=> + string(6) "⟩" + ["+"]=> + string(5) "∫" + [4]=> + string(8) "∴" + ["<"]=> + string(4) "<" + ["E"]=> + string(6) "≅" + ["H"]=> + string(7) "≈" + ["d"]=> + string(4) "≤" + ["e"]=> + string(8) "♥" + [""]=> + string(5) "⊂" + [""]=> + string(5) "⊃" + [""]=> + string(6) "⊄" + [""]=> + string(6) "⊆" + [""]=> + string(6) "⊇" + [" +"]=> + string(8) "⌊" + ["c"]=> + string(7) "♣" + ["f"]=> + string(7) "♦" } -array(100) { +array(171) { [""]=> - string(6) " " + string(4) "Π" [""]=> - string(7) "¡" + string(5) "Ρ" [""]=> string(6) "¢" [""]=> - string(7) "£" + string(7) "Σ" [""]=> - string(8) "¤" + string(5) "Τ" [""]=> - string(5) "¥" + string(6) "⊥" [""]=> - string(8) "¦" + string(5) "Φ" [""]=> - string(6) "§" + string(5) "Χ" [""]=> - string(5) "¨" + string(5) "Ψ" [""]=> - string(6) "©" + string(7) "Ω" [""]=> string(6) "ª" [""]=> string(7) "«" [""]=> - string(5) "¬" + string(6) "€" [""]=> string(5) "­" [""]=> @@ -374,57 +517,57 @@ array(100) { [""]=> string(5) "°" [""]=> - string(8) "±" + string(7) "α" [""]=> - string(6) "²" + string(6) "β" [""]=> - string(6) "³" + string(7) "γ" [""]=> - string(7) "´" + string(7) "δ" [""]=> - string(7) "µ" + string(7) "↵" [""]=> - string(6) "¶" + string(6) "ζ" [""]=> - string(8) "·" + string(5) "η" [""]=> - string(7) "¸" + string(7) "θ" [""]=> - string(6) "¹" + string(6) "ι" [""]=> - string(6) "º" + string(7) "κ" [""]=> - string(7) "»" + string(8) "λ" [""]=> - string(8) "¼" + string(4) "μ" [""]=> - string(8) "½" + string(4) "ν" [""]=> - string(8) "¾" + string(4) "ξ" [""]=> - string(8) "¿" + string(9) "ο" [""]=> - string(8) "À" + string(4) "π" [""]=> - string(8) "Á" + string(5) "ρ" [""]=> - string(7) "Â" + string(8) "ς" [""]=> - string(8) "Ã" + string(7) "σ" [""]=> - string(6) "Ä" + string(5) "τ" [""]=> - string(7) "Å" + string(6) "⋅" [""]=> - string(7) "Æ" + string(5) "φ" [""]=> - string(8) "Ç" + string(5) "χ" [""]=> - string(8) "È" + string(5) "ψ" [""]=> - string(8) "É" + string(7) "ω" [""]=> - string(7) "Ê" + string(5) "◊" [""]=> string(6) "Ë" [""]=> @@ -436,19 +579,19 @@ array(100) { [""]=> string(6) "Ï" [""]=> - string(5) "Ð" + string(6) "⇐" [""]=> - string(8) "Ñ" + string(6) "⇑" [""]=> - string(8) "Ò" + string(6) "⇒" [""]=> - string(8) "Ó" + string(6) "⇓" [""]=> - string(7) "Ô" + string(6) "⇔" [""]=> string(8) "Õ" [""]=> - string(6) "Ö" + string(5) "ϖ" [""]=> string(7) "×" [""]=> @@ -460,7 +603,7 @@ array(100) { [""]=> string(7) "Û" [""]=> - string(6) "Ü" + string(7) "˜" [""]=> string(8) "Ý" [""]=> @@ -531,14 +674,157 @@ array(100) { string(7) "þ" [""]=> string(6) "ÿ" + ["R"]=> + string(7) "Œ" + ["S"]=> + string(7) "œ" + ["`"]=> + string(8) "♠" + ["a"]=> + string(7) "≡" + ["x"]=> + string(6) "Ÿ" + [""]=> + string(6) "→" + [""]=> + string(6) "↑" + [""]=> + string(6) "↓" + [""]=> + string(6) "↔" + [""]=> + string(7) "⊕" + [""]=> + string(6) "Ζ" + [""]=> + string(8) "⊗" + [""]=> + string(7) "Θ" + [""]=> + string(6) "Ι" + [""]=> + string(7) "Κ" + [""]=> + string(8) "Λ" + [""]=> + string(4) "Μ" + [""]=> + string(4) "Ν" + [""]=> + string(4) "Ξ" + [""]=> + string(9) "Ο" + [""]=> + string(6) "∂" + [""]=> + string(7) "∃" + [" "]=> + string(7) "⌉" + [" "]=> + string(6) "‌" + ["
"]=> + string(5) "‍" + [""]=> + string(5) "‎" + [""]=> + string(6) "∏" + [""]=> + string(7) "–" + [""]=> + string(7) "—" + [""]=> + string(8) "℘" + [""]=> + string(7) "’" + [""]=> + string(7) "√" + [" "]=> + string(6) "ℜ" + [" "]=> + string(6) "∝" + [" "]=> + string(7) "∞" + [" "]=> + string(5) "∠" + ["!"]=> + string(8) "‡" ["""]=> string(6) """ - ["<"]=> - string(4) "<" - [">"]=> - string(4) ">" ["&"]=> string(5) "&" + [0]=> + string(8) "‰" + [2]=> + string(7) "′" + [3]=> + string(7) "″" + [9]=> + string(8) "‹" + [":"]=> + string(8) "›" + [">"]=> + string(4) ">" + ["D"]=> + string(7) "⁄" + [""]=> + string(5) "∑" + [5]=> + string(9) "ℵ" + [""]=> + string(6) "←" + [""]=> + string(8) "∀" + [""]=> + string(7) "∅" + [""]=> + string(7) "∇" + [""]=> + string(7) "⌈" + [" "]=> + string(8) "⌋" + [""]=> + string(7) "−" + [""]=> + string(8) "∗" + ["'"]=> + string(5) "∧" + ["("]=> + string(4) "∨" + [")"]=> + string(6) "⟨" + ["*"]=> + string(6) "⟩" + ["+"]=> + string(5) "∫" + [4]=> + string(8) "∴" + ["<"]=> + string(4) "<" + ["E"]=> + string(6) "≅" + ["H"]=> + string(7) "≈" + ["d"]=> + string(4) "≤" + ["e"]=> + string(8) "♥" + [""]=> + string(5) "⊂" + [""]=> + string(5) "⊃" + [""]=> + string(6) "⊄" + [""]=> + string(6) "⊆" + [""]=> + string(6) "⊇" + [" +"]=> + string(8) "⌊" + ["c"]=> + string(7) "♣" + ["f"]=> + string(7) "♦" } -- Iteration 7 -- array(4) { @@ -562,33 +848,33 @@ array(4) { string(5) "&" } -- Iteration 8 -- -array(100) { +array(171) { [""]=> - string(6) " " + string(4) "Π" [""]=> - string(7) "¡" + string(5) "Ρ" [""]=> string(6) "¢" [""]=> - string(7) "£" + string(7) "Σ" [""]=> - string(8) "¤" + string(5) "Τ" [""]=> - string(5) "¥" + string(6) "⊥" [""]=> - string(8) "¦" + string(5) "Φ" [""]=> - string(6) "§" + string(5) "Χ" [""]=> - string(5) "¨" + string(5) "Ψ" [""]=> - string(6) "©" + string(7) "Ω" [""]=> string(6) "ª" [""]=> string(7) "«" [""]=> - string(5) "¬" + string(6) "€" [""]=> string(5) "­" [""]=> @@ -598,57 +884,57 @@ array(100) { [""]=> string(5) "°" [""]=> - string(8) "±" + string(7) "α" [""]=> - string(6) "²" + string(6) "β" [""]=> - string(6) "³" + string(7) "γ" [""]=> - string(7) "´" + string(7) "δ" [""]=> - string(7) "µ" + string(7) "↵" [""]=> - string(6) "¶" + string(6) "ζ" [""]=> - string(8) "·" + string(5) "η" [""]=> - string(7) "¸" + string(7) "θ" [""]=> - string(6) "¹" + string(6) "ι" [""]=> - string(6) "º" + string(7) "κ" [""]=> - string(7) "»" + string(8) "λ" [""]=> - string(8) "¼" + string(4) "μ" [""]=> - string(8) "½" + string(4) "ν" [""]=> - string(8) "¾" + string(4) "ξ" [""]=> - string(8) "¿" + string(9) "ο" [""]=> - string(8) "À" + string(4) "π" [""]=> - string(8) "Á" + string(5) "ρ" [""]=> - string(7) "Â" + string(8) "ς" [""]=> - string(8) "Ã" + string(7) "σ" [""]=> - string(6) "Ä" + string(5) "τ" [""]=> - string(7) "Å" + string(6) "⋅" [""]=> - string(7) "Æ" + string(5) "φ" [""]=> - string(8) "Ç" + string(5) "χ" [""]=> - string(8) "È" + string(5) "ψ" [""]=> - string(8) "É" + string(7) "ω" [""]=> - string(7) "Ê" + string(5) "◊" [""]=> string(6) "Ë" [""]=> @@ -660,19 +946,19 @@ array(100) { [""]=> string(6) "Ï" [""]=> - string(5) "Ð" + string(6) "⇐" [""]=> - string(8) "Ñ" + string(6) "⇑" [""]=> - string(8) "Ò" + string(6) "⇒" [""]=> - string(8) "Ó" + string(6) "⇓" [""]=> - string(7) "Ô" + string(6) "⇔" [""]=> string(8) "Õ" [""]=> - string(6) "Ö" + string(5) "ϖ" [""]=> string(7) "×" [""]=> @@ -684,7 +970,7 @@ array(100) { [""]=> string(7) "Û" [""]=> - string(6) "Ü" + string(7) "˜" [""]=> string(8) "Ý" [""]=> @@ -755,42 +1041,185 @@ array(100) { string(7) "þ" [""]=> string(6) "ÿ" + ["R"]=> + string(7) "Œ" + ["S"]=> + string(7) "œ" + ["`"]=> + string(8) "♠" + ["a"]=> + string(7) "≡" + ["x"]=> + string(6) "Ÿ" + [""]=> + string(6) "→" + [""]=> + string(6) "↑" + [""]=> + string(6) "↓" + [""]=> + string(6) "↔" + [""]=> + string(7) "⊕" + [""]=> + string(6) "Ζ" + [""]=> + string(8) "⊗" + [""]=> + string(7) "Θ" + [""]=> + string(6) "Ι" + [""]=> + string(7) "Κ" + [""]=> + string(8) "Λ" + [""]=> + string(4) "Μ" + [""]=> + string(4) "Ν" + [""]=> + string(4) "Ξ" + [""]=> + string(9) "Ο" + [""]=> + string(6) "∂" + [""]=> + string(7) "∃" + [" "]=> + string(7) "⌉" + [" "]=> + string(6) "‌" + ["
"]=> + string(5) "‍" + [""]=> + string(5) "‎" + [""]=> + string(6) "∏" + [""]=> + string(7) "–" + [""]=> + string(7) "—" + [""]=> + string(8) "℘" + [""]=> + string(7) "’" + [""]=> + string(7) "√" + [" "]=> + string(6) "ℜ" + [" "]=> + string(6) "∝" + [" "]=> + string(7) "∞" + [" "]=> + string(5) "∠" + ["!"]=> + string(8) "‡" ["""]=> string(6) """ - ["<"]=> - string(4) "<" - [">"]=> - string(4) ">" ["&"]=> string(5) "&" + [0]=> + string(8) "‰" + [2]=> + string(7) "′" + [3]=> + string(7) "″" + [9]=> + string(8) "‹" + [":"]=> + string(8) "›" + [">"]=> + string(4) ">" + ["D"]=> + string(7) "⁄" + [""]=> + string(5) "∑" + [5]=> + string(9) "ℵ" + [""]=> + string(6) "←" + [""]=> + string(8) "∀" + [""]=> + string(7) "∅" + [""]=> + string(7) "∇" + [""]=> + string(7) "⌈" + [" "]=> + string(8) "⌋" + [""]=> + string(7) "−" + [""]=> + string(8) "∗" + ["'"]=> + string(5) "∧" + ["("]=> + string(4) "∨" + [")"]=> + string(6) "⟨" + ["*"]=> + string(6) "⟩" + ["+"]=> + string(5) "∫" + [4]=> + string(8) "∴" + ["<"]=> + string(4) "<" + ["E"]=> + string(6) "≅" + ["H"]=> + string(7) "≈" + ["d"]=> + string(4) "≤" + ["e"]=> + string(8) "♥" + [""]=> + string(5) "⊂" + [""]=> + string(5) "⊃" + [""]=> + string(6) "⊄" + [""]=> + string(6) "⊆" + [""]=> + string(6) "⊇" + [" +"]=> + string(8) "⌊" + ["c"]=> + string(7) "♣" + ["f"]=> + string(7) "♦" } -array(100) { +array(171) { [""]=> - string(6) " " + string(4) "Π" [""]=> - string(7) "¡" + string(5) "Ρ" [""]=> string(6) "¢" [""]=> - string(7) "£" + string(7) "Σ" [""]=> - string(8) "¤" + string(5) "Τ" [""]=> - string(5) "¥" + string(6) "⊥" [""]=> - string(8) "¦" + string(5) "Φ" [""]=> - string(6) "§" + string(5) "Χ" [""]=> - string(5) "¨" + string(5) "Ψ" [""]=> - string(6) "©" + string(7) "Ω" [""]=> string(6) "ª" [""]=> string(7) "«" [""]=> - string(5) "¬" + string(6) "€" [""]=> string(5) "­" [""]=> @@ -800,57 +1229,57 @@ array(100) { [""]=> string(5) "°" [""]=> - string(8) "±" + string(7) "α" [""]=> - string(6) "²" + string(6) "β" [""]=> - string(6) "³" + string(7) "γ" [""]=> - string(7) "´" + string(7) "δ" [""]=> - string(7) "µ" + string(7) "↵" [""]=> - string(6) "¶" + string(6) "ζ" [""]=> - string(8) "·" + string(5) "η" [""]=> - string(7) "¸" + string(7) "θ" [""]=> - string(6) "¹" + string(6) "ι" [""]=> - string(6) "º" + string(7) "κ" [""]=> - string(7) "»" + string(8) "λ" [""]=> - string(8) "¼" + string(4) "μ" [""]=> - string(8) "½" + string(4) "ν" [""]=> - string(8) "¾" + string(4) "ξ" [""]=> - string(8) "¿" + string(9) "ο" [""]=> - string(8) "À" + string(4) "π" [""]=> - string(8) "Á" + string(5) "ρ" [""]=> - string(7) "Â" + string(8) "ς" [""]=> - string(8) "Ã" + string(7) "σ" [""]=> - string(6) "Ä" + string(5) "τ" [""]=> - string(7) "Å" + string(6) "⋅" [""]=> - string(7) "Æ" + string(5) "φ" [""]=> - string(8) "Ç" + string(5) "χ" [""]=> - string(8) "È" + string(5) "ψ" [""]=> - string(8) "É" + string(7) "ω" [""]=> - string(7) "Ê" + string(5) "◊" [""]=> string(6) "Ë" [""]=> @@ -862,19 +1291,19 @@ array(100) { [""]=> string(6) "Ï" [""]=> - string(5) "Ð" + string(6) "⇐" [""]=> - string(8) "Ñ" + string(6) "⇑" [""]=> - string(8) "Ò" + string(6) "⇒" [""]=> - string(8) "Ó" + string(6) "⇓" [""]=> - string(7) "Ô" + string(6) "⇔" [""]=> string(8) "Õ" [""]=> - string(6) "Ö" + string(5) "ϖ" [""]=> string(7) "×" [""]=> @@ -886,7 +1315,7 @@ array(100) { [""]=> string(7) "Û" [""]=> - string(6) "Ü" + string(7) "˜" [""]=> string(8) "Ý" [""]=> @@ -957,14 +1386,157 @@ array(100) { string(7) "þ" [""]=> string(6) "ÿ" + ["R"]=> + string(7) "Œ" + ["S"]=> + string(7) "œ" + ["`"]=> + string(8) "♠" + ["a"]=> + string(7) "≡" + ["x"]=> + string(6) "Ÿ" + [""]=> + string(6) "→" + [""]=> + string(6) "↑" + [""]=> + string(6) "↓" + [""]=> + string(6) "↔" + [""]=> + string(7) "⊕" + [""]=> + string(6) "Ζ" + [""]=> + string(8) "⊗" + [""]=> + string(7) "Θ" + [""]=> + string(6) "Ι" + [""]=> + string(7) "Κ" + [""]=> + string(8) "Λ" + [""]=> + string(4) "Μ" + [""]=> + string(4) "Ν" + [""]=> + string(4) "Ξ" + [""]=> + string(9) "Ο" + [""]=> + string(6) "∂" + [""]=> + string(7) "∃" + [" "]=> + string(7) "⌉" + [" "]=> + string(6) "‌" + ["
"]=> + string(5) "‍" + [""]=> + string(5) "‎" + [""]=> + string(6) "∏" + [""]=> + string(7) "–" + [""]=> + string(7) "—" + [""]=> + string(8) "℘" + [""]=> + string(7) "’" + [""]=> + string(7) "√" + [" "]=> + string(6) "ℜ" + [" "]=> + string(6) "∝" + [" "]=> + string(7) "∞" + [" "]=> + string(5) "∠" + ["!"]=> + string(8) "‡" ["""]=> string(6) """ - ["<"]=> - string(4) "<" - [">"]=> - string(4) ">" ["&"]=> string(5) "&" + [0]=> + string(8) "‰" + [2]=> + string(7) "′" + [3]=> + string(7) "″" + [9]=> + string(8) "‹" + [":"]=> + string(8) "›" + [">"]=> + string(4) ">" + ["D"]=> + string(7) "⁄" + [""]=> + string(5) "∑" + [5]=> + string(9) "ℵ" + [""]=> + string(6) "←" + [""]=> + string(8) "∀" + [""]=> + string(7) "∅" + [""]=> + string(7) "∇" + [""]=> + string(7) "⌈" + [" "]=> + string(8) "⌋" + [""]=> + string(7) "−" + [""]=> + string(8) "∗" + ["'"]=> + string(5) "∧" + ["("]=> + string(4) "∨" + [")"]=> + string(6) "⟨" + ["*"]=> + string(6) "⟩" + ["+"]=> + string(5) "∫" + [4]=> + string(8) "∴" + ["<"]=> + string(4) "<" + ["E"]=> + string(6) "≅" + ["H"]=> + string(7) "≈" + ["d"]=> + string(4) "≤" + ["e"]=> + string(8) "♥" + [""]=> + string(5) "⊂" + [""]=> + string(5) "⊃" + [""]=> + string(6) "⊄" + [""]=> + string(6) "⊆" + [""]=> + string(6) "⊇" + [" +"]=> + string(8) "⌊" + ["c"]=> + string(7) "♣" + ["f"]=> + string(7) "♦" } -- Iteration 9 -- array(4) { @@ -989,38 +1561,38 @@ array(4) { } -- Iteration 10 -- -Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d NULL -- Iteration 11 -- -Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d NULL -- Iteration 12 -- -Warning: get_html_translation_table() expects parameter 1 to be long, object given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, object given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be long, object given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, object given in %s on line %d NULL -- Iteration 13 -- -Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d NULL -- Iteration 14 -- -Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d NULL -- Iteration 15 -- array(4) { @@ -1066,10 +1638,10 @@ array(4) { } -- Iteration 17 -- -Warning: get_html_translation_table() expects parameter 1 to be long, resource given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, resource given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be long, resource given in %s on line %s +Warning: get_html_translation_table() expects parameter 1 to be long, resource given in %s on line %d NULL -- Iteration 18 -- array(4) { diff --git a/ext/standard/tests/strings/htmlentities.phpt b/ext/standard/tests/strings/htmlentities.phpt index 743651ecad..f2e107a735 100644 --- a/ext/standard/tests/strings/htmlentities.phpt +++ b/ext/standard/tests/strings/htmlentities.phpt @@ -1,16 +1,16 @@ --TEST-- -HTML entities +HTML entities of ISO-8859 chars --INI-- output_handler= --FILE-- <?php setlocale (LC_CTYPE, "C"); -$sc_encoded = htmlspecialchars ("<>\"&\n"); +$sc_encoded = htmlspecialchars ("<>\"&\n",ENT_COMPAT,"ISO-8859-1"); echo $sc_encoded; -$ent_encoded = htmlentities ("<>\"&\n"); +$ent_encoded = htmlentities ("<>\"&\n",ENT_COMPAT,"ISO-8859-1"); echo $ent_encoded; -echo html_entity_decode($sc_encoded); -echo html_entity_decode($ent_encoded); +echo html_entity_decode($sc_encoded,ENT_COMPAT,"ISO-8859-1"); +echo html_entity_decode($ent_encoded,ENT_COMPAT,"ISO-8859-1"); ?> --EXPECT-- <>"& diff --git a/php.ini-development b/php.ini-development index 2eecc139ff..7e304461c5 100644 --- a/php.ini-development +++ b/php.ini-development @@ -769,7 +769,7 @@ default_mimetype = "text/html" ; PHP's default character set is set to empty. ; http://php.net/default-charset -;default_charset = "iso-8859-1" +;default_charset = "UTF-8" ; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is ; to disable this feature. diff --git a/php.ini-production b/php.ini-production index c84d830465..793f67ed7a 100644 --- a/php.ini-production +++ b/php.ini-production @@ -769,7 +769,7 @@ default_mimetype = "text/html" ; PHP's default character set is set to empty. ; http://php.net/default-charset -;default_charset = "iso-8859-1" +;default_charset = "UTF-8" ; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is ; to disable this feature. |