Discussion:
[22881] standard/branches/user/zf-ldap-dev: applied patch provided by Andreas Heigl to make all the unit tests succeed
sgehrig
2010-08-22 09:18:03 UTC
Permalink
<!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][22881] standard/branches/user/zf-ldap-dev: applied patch provided by Andreas Heigl to make all the unit tests succeed</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>22881</dd>
<dt>Author</dt> <dd>sgehrig</dd>
<dt>Date</dt> <dd>2010-08-22 02:18:00 -0700 (Sun, 22 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>applied patch provided by Andreas Heigl to make all the unit tests succeed

some more testing required to make sure that we're still backwards-compatible

Thanks to Andreas!</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesuserzfldapdevlibraryZendLdapConverterphp">standard/branches/user/zf-ldap-dev/library/Zend/Ldap/Converter.php</a></li>
<li><a href="#standardbranchesuserzfldapdevtestsZendLdapConverterTestphp">standard/branches/user/zf-ldap-dev/tests/Zend/Ldap/ConverterTest.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesuserzfldapdevlibraryZendLdapConverterphp"></a>
<div class="modfile"><h4>Modified: standard/branches/user/zf-ldap-dev/library/Zend/Ldap/Converter.php (22880 => 22881)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/user/zf-ldap-dev/library/Zend/Ldap/Converter.php 2010-08-21 23:44:00 UTC (rev 22880)
+++ standard/branches/user/zf-ldap-dev/library/Zend/Ldap/Converter.php 2010-08-22 09:18:00 UTC (rev 22881) </span><span class="lines">@@ -157,6 +157,9 @@ </span><span class="cx"> $date-&gt;setTimezone(new DateTimeZone('UTC'));
</span><span class="cx"> $timezone = 'Z';
</span><span class="cx"> }
</span><ins>+ if ( '+0000' === $timezone ) {
+ $timezone = 'Z';
+ } </ins><span class="cx"> return $date-&gt;format('YmdHis') . $timezone;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -338,6 +341,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Raw-Data is present, so lets create a DateTime-Object from it.
</span><ins>+ $offset = $time['offdir']
+ . str_pad($time['offsethours'],2,'0',STR_PAD_LEFT)
+ . str_pad($time['offsetminutes'],2,'0',STR_PAD_LEFT); </ins><span class="cx"> $timestring = $time['year'] . '-' </span><span class="cx"> . str_pad($time['month'], 2, '0', STR_PAD_LEFT) . '-' </span><span class="cx"> . str_pad($time['day'], 2, '0', STR_PAD_LEFT) . ' ' </span><span class="lines">@@ -350,8 +356,6 @@ </span><span class="cx"> $date = new DateTime($timestring); </span><span class="cx"> if ($asUtc) { </span><span class="cx"> $date-&gt;setTimezone(new DateTimeZone('UTC'));
</span><del>- } else {
- $date-&gt;setTimezone(new DateTimeZone(date_default_timezone_get()));
</del><span class="cx"> }
</span><span class="cx"> return $date;
</span><span class="cx"> }
</span></span></pre></div>
<a id="standardbranchesuserzfldapdevtestsZendLdapConverterTestphp"></a>
<div class="modfile"><h4>Modified: standard/branches/user/zf-ldap-dev/tests/Zend/Ldap/ConverterTest.php (22880 => 22881)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/user/zf-ldap-dev/tests/Zend/Ldap/ConverterTest.php 2010-08-21 23:44:00 UTC (rev 22880)
+++ standard/branches/user/zf-ldap-dev/tests/Zend/Ldap/ConverterTest.php 2010-08-22 09:18:00 UTC (rev 22881) </span><span class="lines">@@ -175,23 +175,28 @@ </span><span class="cx"> /** </span><span class="cx"> * @dataProvider fromLdapDateTimeProvider </span><span class="cx"> */ </span><del>- public function testFromLdapDateTime($expected, $convert) </del><ins>+ public function testFromLdapDateTime($expected, $convert, $utc) </ins><span class="cx"> { </span><del>- $this-&gt;assertEquals($expected, Zend_Ldap_Converter::fromLdapDatetime($convert));
</del><ins>+ if ( true === $utc ) {
+ $expected -&gt; setTimezone(new DateTimeZone('UTC'));
+ }
+ $this-&gt;assertEquals($expected, Zend_Ldap_Converter::fromLdapDatetime($convert,$utc));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function fromLdapDateTimeProvider ()
</span><span class="cx"> {
</span><span class="cx"> $tz = new DateTimeZone('UTC');
</span><ins>+ $tz = null;
</ins><span class="cx"> return array (
</span><del>- array(new DateTime('2010-12-24 08:00:23+0300',$tz),'20101224080023+0300'),
- array(new DateTime('2010-12-24 08:00:23+0300',$tz),'20101224080023+03\'00\''),
- array(new DateTime('2010-12-24 08:00:23+0000',$tz),'20101224080023'),
- array(new DateTime('2010-12-24 08:00:00+0000',$tz),'201012240800'),
- array(new DateTime('2010-12-24 08:00:00+0000',$tz),'2010122408'),
- array(new DateTime('2010-12-24 00:00:00+0000',$tz),'20101224'),
- array(new DateTime('2010-12-01 00:00:00+0000',$tz),'201012'),
- array(new DateTime('2010-01-01 00:00:00+0000',$tz),'2010'),
</del><ins>+ array(new DateTime('2010-12-24 08:00:23+0300'),'20101224080023+0300', false),
+ array(new DateTime('2010-12-24 08:00:23+0300'),'20101224080023+03\'00\'', false),
+ array(new DateTime('2010-12-24 08:00:23+0000'),'20101224080023', false),
+ array(new DateTime('2010-12-24 08:00:00+0000'),'201012240800', false),
+ array(new DateTime('2010-12-24 08:00:00+0000'),'2010122408', false),
+ array(new DateTime('2010-12-24 00:00:00+0000'),'20101224', false),
+ array(new DateTime('2010-12-01 00:00:00+0000'),'201012', false),
+ array(new DateTime('2010-01-01 00:00:00+0000'),'2010', false),
+ array(new DateTime('2010-04-03 12:23:34+0000'), '20100403122334', true),
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>

</body>
</html>

Loading...