rob
2010-08-13 14:35:33 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][22833] standard/trunk: Fix ZF-9275: Zend_Form_Element overrides Zend_Validate DefaultTranslator.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22833</dd>
<dt>Author</dt> <dd>rob</dd>
<dt>Date</dt> <dd>2010-08-13 07:35:23 -0700 (Fri, 13 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix ZF-9275: Zend_Form_Element overrides Zend_Validate DefaultTranslator. Thanks to Kim Blomqvist for the fix</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardtrunklibraryZendFormphp">standard/trunk/library/Zend/Form.php</a></li>
<li><a href="#standardtrunktestsZendFormFormTestphp">standard/trunk/tests/Zend/Form/FormTest.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardtrunklibraryZendFormphp"></a>
<div class="modfile"><h4>Modified: standard/trunk/library/Zend/Form.php (22832 => 22833)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/library/Zend/Form.php 2010-08-12 18:02:41 UTC (rev 22832)
+++ standard/trunk/library/Zend/Form.php 2010-08-13 14:35:23 UTC (rev 22833) </span><span class="lines">@@ -2222,7 +2222,8 @@ </span><span class="cx"> } </span><span class="cx"> $context = $data; </span><span class="cx"> foreach ($this->getElements() as $key => $element) { </span><del>- if (null !== $translator && !$element->hasTranslator()) { </del><ins>+ if (null !== $translator && $this->hasTranslator()
+ && !$element->hasTranslator()) { </ins><span class="cx"> $element->setTranslator($translator);
</span><span class="cx"> }
</span><span class="cx"> $check = $data;
</span></span></pre></div>
<a id="standardtrunktestsZendFormFormTestphp"></a>
<div class="modfile"><h4>Modified: standard/trunk/tests/Zend/Form/FormTest.php (22832 => 22833)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/tests/Zend/Form/FormTest.php 2010-08-12 18:02:41 UTC (rev 22832)
+++ standard/trunk/tests/Zend/Form/FormTest.php 2010-08-13 14:35:23 UTC (rev 22833) </span><span class="lines">@@ -4196,7 +4196,39 @@ </span><span class="cx"> </span><span class="cx"> $this->assertEquals(array('sub' => array('valid' => 1234)), $this->form->getValidValues($data));
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ /**
+ * @group ZF-9275
+ */
+ public function testElementTranslatorNotOverriddenbyGlobalTranslatorDuringValidation()
+ {
+ $translator = new Zend_Translate('array', array('foo' => 'bar'));
+ Zend_Registry::set('Zend_Translate', $translator);
+
+ $this->form->addElement('text', 'foo');
+ $this->form->isValid(array());
+
+ $received = $this->form->foo->hasTranslator();
+ $this->assertSame(false, $received);
+ }
+
+ /**
+ * @group ZF-9275
+ */
+ public function testZendValidateDefaultTranslatorOverridesZendTranslateDefaultTranslator()
+ {
+ $translate = new Zend_Translate('array', array('isEmpty' => 'translate'));
+ Zend_Registry::set('Zend_Translate', $translate);
+
+ $translateValidate = new Zend_Translate('array', array('isEmpty' => 'validate'));
+ Zend_Validate_Abstract::setDefaultTranslator($translateValidate);
+
+ $this->form->addElement('text', 'foo', array('required'=>1));
+ $this->form->isValid(array());
+
+ $this->assertSame(array('isEmpty' => 'validate'), $this->form->foo->getMessages());
+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * @group ZF-9494
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>
"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][22833] standard/trunk: Fix ZF-9275: Zend_Form_Element overrides Zend_Validate DefaultTranslator.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22833</dd>
<dt>Author</dt> <dd>rob</dd>
<dt>Date</dt> <dd>2010-08-13 07:35:23 -0700 (Fri, 13 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix ZF-9275: Zend_Form_Element overrides Zend_Validate DefaultTranslator. Thanks to Kim Blomqvist for the fix</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardtrunklibraryZendFormphp">standard/trunk/library/Zend/Form.php</a></li>
<li><a href="#standardtrunktestsZendFormFormTestphp">standard/trunk/tests/Zend/Form/FormTest.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardtrunklibraryZendFormphp"></a>
<div class="modfile"><h4>Modified: standard/trunk/library/Zend/Form.php (22832 => 22833)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/library/Zend/Form.php 2010-08-12 18:02:41 UTC (rev 22832)
+++ standard/trunk/library/Zend/Form.php 2010-08-13 14:35:23 UTC (rev 22833) </span><span class="lines">@@ -2222,7 +2222,8 @@ </span><span class="cx"> } </span><span class="cx"> $context = $data; </span><span class="cx"> foreach ($this->getElements() as $key => $element) { </span><del>- if (null !== $translator && !$element->hasTranslator()) { </del><ins>+ if (null !== $translator && $this->hasTranslator()
+ && !$element->hasTranslator()) { </ins><span class="cx"> $element->setTranslator($translator);
</span><span class="cx"> }
</span><span class="cx"> $check = $data;
</span></span></pre></div>
<a id="standardtrunktestsZendFormFormTestphp"></a>
<div class="modfile"><h4>Modified: standard/trunk/tests/Zend/Form/FormTest.php (22832 => 22833)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/tests/Zend/Form/FormTest.php 2010-08-12 18:02:41 UTC (rev 22832)
+++ standard/trunk/tests/Zend/Form/FormTest.php 2010-08-13 14:35:23 UTC (rev 22833) </span><span class="lines">@@ -4196,7 +4196,39 @@ </span><span class="cx"> </span><span class="cx"> $this->assertEquals(array('sub' => array('valid' => 1234)), $this->form->getValidValues($data));
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ /**
+ * @group ZF-9275
+ */
+ public function testElementTranslatorNotOverriddenbyGlobalTranslatorDuringValidation()
+ {
+ $translator = new Zend_Translate('array', array('foo' => 'bar'));
+ Zend_Registry::set('Zend_Translate', $translator);
+
+ $this->form->addElement('text', 'foo');
+ $this->form->isValid(array());
+
+ $received = $this->form->foo->hasTranslator();
+ $this->assertSame(false, $received);
+ }
+
+ /**
+ * @group ZF-9275
+ */
+ public function testZendValidateDefaultTranslatorOverridesZendTranslateDefaultTranslator()
+ {
+ $translate = new Zend_Translate('array', array('isEmpty' => 'translate'));
+ Zend_Registry::set('Zend_Translate', $translate);
+
+ $translateValidate = new Zend_Translate('array', array('isEmpty' => 'validate'));
+ Zend_Validate_Abstract::setDefaultTranslator($translateValidate);
+
+ $this->form->addElement('text', 'foo', array('required'=>1));
+ $this->form->isValid(array());
+
+ $this->assertSame(array('isEmpty' => 'validate'), $this->form->foo->getMessages());
+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * @group ZF-9494
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>