[22846] standard/branches/user/mabe/zend_filter_entity: user branch: entity filter: fixed some bugs on decode and added more tests

mabe

2010-08-17 17:26:21 UTC

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22846] standard/branches/user/mabe/zend_filter_entity: user branch: entity filter: fixed some bugs on decode and added more tests</title>
</head>
<body>

<style type="text/css"></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22846</dd>
<dt>Author</dt> <dd>mabe</dd>
<dt>Date</dt> <dd>2010-08-17 10:26:13 -0700 (Tue, 17 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>user branch: entity filter: fixed some bugs on decode and added more tests</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesusermabezend_filter_entitylibraryZendFilterEncodeEntityphp">standard/branches/user/mabe/zend_filter_entity/library/Zend/Filter/Encode/Entity.php</a></li>
<li><a href="#standardbranchesusermabezend_filter_entitytestsZendFilterEncodeEntityTestphp">standard/branches/user/mabe/zend_filter_entity/tests/Zend/Filter/Encode/EntityTest.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesusermabezend_filter_entitylibraryZendFilterEncodeEntityphp"></a>
<div class="modfile"><h4>Modified: standard/branches/user/mabe/zend_filter_entity/library/Zend/Filter/Encode/Entity.php (22845 => 22846)</h4>
<pre class="diff">
--- standard/branches/user/mabe/zend_filter_entity/library/Zend/Filter/Encode/Entity.php 2010-08-17 16:20:50 UTC (rev 22845)
+++ standard/branches/user/mabe/zend_filter_entity/library/Zend/Filter/Encode/Entity.php 2010-08-17 17:26:13 UTC (rev 22846) @@ -43,7 +43,7 @@ const ACTION_TRANSLIT_CALLBACK = 'translitCallback'; const ACTION_TRANSLIT_IGNORE = 'translitIgnore'; const ACTION_TRANSLIT_SUBSTITUTE = 'translitSubstitute'; <del>- const ACTION_TRANSLIT_ENTITY = 'translitSubstitute'; </del><ins>+ const ACTION_TRANSLIT_ENTITY = 'translitEntity'; </ins> /** * Predefined entity references. @@ -505,7 +505,7 @@ * * @return string Value of Zend_Filter_Encode_Entity::INVALID_ENTITY_* */ <del>- public function getinvalidEntityAction() </del><ins>+ public function getInvalidEntityAction() </ins> { return $this->_invalidEntityAction;
 }
@@ -897,7 +897,8 @@
 }

 $tmp = (string)@iconv('UTF-8', $iconvTo, $buffer);
<del>- if ($tmp === '') {
</del><ins>+ // \xEDconv feature //TRANSLIT//IGNORE convert not tranlitable characters to "?"
+ if ($tmp === '' || $tmp === '?') { </ins> $outStr.= $this->_handleInvalidChar($buffer);
 } else {
 $outStr.= $tmp;
</pre></div>
<a id="standardbranchesusermabezend_filter_entitytestsZendFilterEncodeEntityTestphp"></a>
<div class="modfile"><h4>Modified: standard/branches/user/mabe/zend_filter_entity/tests/Zend/Filter/Encode/EntityTest.php (22845 => 22846)</h4>
<pre class="diff">
--- standard/branches/user/mabe/zend_filter_entity/tests/Zend/Filter/Encode/EntityTest.php 2010-08-17 16:20:50 UTC (rev 22845)
+++ standard/branches/user/mabe/zend_filter_entity/tests/Zend/Filter/Encode/EntityTest.php 2010-08-17 17:26:13 UTC (rev 22846) @@ -114,8 +114,9 @@ $this->_filter->setInputCharset('UTF-8'); $this->_filter->setOutputCharset('UTF-8'); <del>- $text = "\xC3\xA4\xC3\xB6\xC3\xBC - <>&\"'"; // auml + ouml + uuml
- $expected = "\xC3\xA4\xC3\xB6\xC3\xBC - &#60;&#62;&#38;&#34;&#39;";
</del><ins>+ // auml euro
+ $text = "\xC3\xA4 - \xE2\x82\xAC - <>&\"'";
+ $expected = "\xC3\xA4 - \xE2\x82\xAC - &#60;&#62;&#38;&#34;&#39;"; </ins> $actual = $this->_filter->encode($text); $this->assertEquals($expected, $actual); } @@ -125,8 +126,9 @@ $this->_filter->setInputCharset('UTF-8'); $this->_filter->setOutputCharset('ISO-8859-1'); <del>- $text = "\xC3\xA4\xC3\xB6\xC3\xBC - \xE2\x82\xAC - <>&\"'"; // auml + ouml + uuml + euro
- $expected = "\xE4\xF6\xFC - &#8364; - &#60;&#62;&#38;&#34;&#39;"; // ISO-8859-1
</del><ins>+ // auml euro
+ $text = "\xC3\xA4 - \xE2\x82\xAC - <>&\"'";
+ $expected = "\xE4 - &#8364; - &#60;&#62;&#38;&#34;&#39;"; </ins> $actual = $this->_filter->encode($text); $this->assertEquals($expected, $actual); } @@ -159,6 +161,30 @@ $this->assertEquals($expected, $actual);
 }

<ins>+ public function testDecodeUtf8ToUtf8()
+ {
+ $this->_filter->setInputCharset('UTF-8');
+ $this->_filter->setOutputCharset('UTF-8');
+
+ // euro in different scopes
+ $input = "\xE2\x82\xAC - &#8364; - &#x20AC; - &#x20ac;";
+ $expected = "\xE2\x82\xAC - \xE2\x82\xAC - \xE2\x82\xAC - \xE2\x82\xAC";
+ $actual = $this->_filter->decode($input);
+ $this->assertEquals($expected, $actual);
+ }
+
+ public function testDecodeUtf8ToISO885915()
+ {
+ $this->_filter->setInputCharset('UTF-8');
+ $this->_filter->setOutputCharset('ISO-8859-15');
+
+ // euro in different scopes
+ $input = "\xE2\x82\xAC - &#8364; - &#x20AC; - &#x20ac;";
+ $expected = "\xA4 - \xA4 - \xA4 - \xA4";
+ $actual = $this->_filter->decode($input);
+ $this->assertEquals($expected, $actual);
+ }
+ </ins> public function testDecodeOnInvalidCharException() { $this->_filter->setInputCharset('UTF-8'); @@ -176,13 +202,13 @@ $this->_filter->setInvalidCharAction(Zend_Filter_Encode_Entity::ACTION_CALLBACK); $this->_filter->setInvalidCharCallback(array($this, 'callback_testDecodeOnInvalidCharCallback')); <del>- $expected = '[2e28ca]'; </del><ins>+ $expected = '[e282ac]'; </ins> $actual = $this->_filter->decode('&#x20AC;'); // euro $this->assertEquals($expected, $actual); } public function callback_testDecodeOnInvalidCharCallback($char) { <del>- $tmp = unpack('h*', $char); </del><ins>+ $tmp = unpack('H*', $char); </ins> return '[' . $tmp[1] . ']'; } @@ -239,4 +265,67 @@ $this->assertEquals($expected, $actual);
@@ Diff output truncated at 4096 characters. @@
</pre>
</div>
</div>

</body>
</html>