Discussion:
[22859] standard/incubator: * add __toString method
mury89
2010-08-20 16:52:16 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][22859] standard/incubator: * add __toString method</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>22859</dd>
<dt>Author</dt> <dd>mury89</dd>
<dt>Date</dt> <dd>2010-08-20 09:52:15 -0700 (Fri, 20 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>* add __toString method
* add setOptions method
* move html attribs to second parameter (to discussion)
* reurn $this object in gravatar method
* fix set/get secure
* change name of keys options to lower space to underscore</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardincubatordocumentationmanualenmodule_specsZend_View_Helper_Gravatarxml">standard/incubator/documentation/manual/en/module_specs/Zend_View_Helper_Gravatar.xml</a></li>
<li><a href="#standardincubatorlibraryZendViewHelperGravatarphp">standard/incubator/library/Zend/View/Helper/Gravatar.php</a></li>
<li><a href="#standardincubatortestsZendViewHelperGravatarTestphp">standard/incubator/tests/Zend/View/Helper/GravatarTest.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardincubatordocumentationmanualenmodule_specsZend_View_Helper_Gravatarxml"></a>
<div class="modfile"><h4>Modified: standard/incubator/documentation/manual/en/module_specs/Zend_View_Helper_Gravatar.xml (22858 => 22859)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/documentation/manual/en/module_specs/Zend_View_Helper_Gravatar.xml 2010-08-20 16:39:56 UTC (rev 22858)
+++ standard/incubator/documentation/manual/en/module_specs/Zend_View_Helper_Gravatar.xml 2010-08-20 16:52:15 UTC (rev 22859) </span><span class="lines">@@ -37,7 +37,7 @@ </span><span class="cx"> To set different height of image, pass the 'imgSize' =&gt; value as part of the second parameter in the method calls. </span><span class="cx"> &lt;/para&gt; </span><span class="cx"> &lt;para&gt; </span><del>- To add the attributes to image, pass the key =&gt; value as part of the third parameter in the method calls. </del><ins>+ To add the attributes to image, pass the key =&gt; value as part of the second parameter with key attribs in the method calls. </ins><span class="cx"> &lt;/para&gt; </span><span class="cx"> &lt;para&gt; </span><span class="cx"> If the avatar should be loaded from a SSL location, pass the 'secure' =&gt; true as part of the second parameter in the method calls. </span><span class="lines">@@ -45,13 +45,28 @@ </span><span class="cx"> &lt;info&gt;&lt;para&gt; </span><span class="cx"> Default, if request was make through HTTPS, avatar will be load from secure location. If not, will be use No-SSL location. </span><span class="cx"> &lt;/para&gt;&lt;/info&gt; </span><del>- </del><ins>+&lt;info&gt;&lt;para&gt;
+You can use set methods to configure view helper.
+&lt;/para&gt;&lt;/info&gt; </ins><span class="cx"> &lt;programlisting language=&quot;php&quot;&gt; </span><span class="cx"> &lt;![CDATA[ </span><span class="cx"> // in view (HTML DOCTYPE) </span><del>- &lt;?php echo $this-&gt;gravatar('example-***@public.gmane.org', array('imgSize' =&gt; 90, 'defaultImg' =&gt; 'monsterid', 'secure' =&gt; true), array('class' =&gt; 'avatar', 'title' =&gt; 'Title for this image') ); ?&gt;
</del><ins>+ &lt;?php
+ echo $this-&gt;gravatar('example-***@public.gmane.org',
+ array('imgSize' =&gt; 90, 'defaultImg' =&gt; 'monsterid', 'secure' =&gt; true,
+ 'attribs' =&gt; array('class' =&gt; 'avatar', 'title' =&gt; 'Title for this image')) );
+ ?&gt;
+
+ //or use set methods
+ &lt;?php
+ $this-&gt;gravatar()-&gt;setEmail('example-***@public.gmane.org')-&gt;setImgSize(90)
+ -&gt;setDefaultImg(Zend_View_Helper_Gravatar::DEFAULT_MONSTERID)
+ -&gt;setSecure(true)-&gt;setAttribs(array('class' =&gt; 'avatar', 'title' =&gt; 'Title for this image'));
+ ?&gt;
+ </ins><span class="cx"> // The output </span><del>- &lt;img src=&quot;https://secure.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?s=90&amp;d=monsterid&quot; class=&quot;avatar&quot; title=&quot;Title for this image&quot;&gt; </del><ins>+ &lt;img class=&quot;avatar&quot; title=&quot;Title for this image&quot; src=&quot;https://secure.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?s=90&amp;d=monsterid&amp;r=g&quot; &gt;
+ </ins><span class="cx"> ]]&gt; </span><span class="cx"> &lt;/programlisting&gt; </span><span class="cx"> &lt;/example&gt;
</span></span></pre></div>
<a id="standardincubatorlibraryZendViewHelperGravatarphp"></a>
<div class="modfile"><h4>Modified: standard/incubator/library/Zend/View/Helper/Gravatar.php (22858 => 22859)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/library/Zend/View/Helper/Gravatar.php 2010-08-20 16:39:56 UTC (rev 22858)
+++ standard/incubator/library/Zend/View/Helper/Gravatar.php 2010-08-20 16:52:15 UTC (rev 22859) </span><span class="lines">@@ -66,7 +66,9 @@ </span><span class="cx"> * </span><span class="cx"> * @var array </span><span class="cx"> */ </span><del>- protected $_options = array('imgSize' =&gt; 80, 'defaultImg' =&gt; self::DEFAULT_MM, 'rating' =&gt; self::RATING_G, 'secure' =&gt; false ); </del><ins>+ protected $_options = array('img_size' =&gt; 80, 'default_img' =&gt; self::DEFAULT_MM,
+ 'rating' =&gt; self::RATING_G, 'secure' =&gt; null,
+ 'attribs' =&gt; array() );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Email Adress
</span><span class="lines">@@ -76,49 +78,36 @@
</span><span class="cx"> protected $_email;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Attribs for image tag
- *
- * @var array
- */
- protected $_attribs;
-
-
- /**
</del><span class="cx"> * Returns an avatar from gravatar's service.
</span><span class="cx"> *
</span><span class="cx"> * @link http://pl.gravatar.com/site/implement/url
</span><span class="cx"> * @param string|null $email Email adress.
</span><span class="cx"> * @param null|array $options Options
</span><del>- * 'imgSize' height of img to return
- * 'defaultImg' img to return if email adress has not found
- * 'rating' rating parameter for avatar
- * 'secure' load from the SSL or Non-SSL location
- * @param array $attribs Attribs for image tag (title, alt etc.)
</del><ins>+ * 'imgSize' int height of img to return
+ * 'defaultImg' string img to return if email adress has not found
+ * 'rating' string rating parameter for avatar
+ * 'secure' bool load from the SSL or Non-SSL location
+ * 'attribs' array Attribs for image tag (title, alt etc.)
</ins><span class="cx"> * @link http://pl.gravatar.com/site/implement/url More information about gravatar's service.
</span><span class="cx"> * @return string|Zend_View_Helper_Gravatar
</span><span class="cx"> */
</span><del>- public function gravatar( $email = null, $options = array(), $attribs = array() )
</del><ins>+ public function gravatar( $email = &quot;&quot;, $options = array() )
</ins><span class="cx"> {
</span><del>- if ($email === null)
- {
- return $this;
- }
- </del><span class="cx"> $this-&gt;setEmail($email); </span><del>- $this-&gt;setAttribs($attribs); </del><ins>+ $this-&gt;setOptions($options);
+ return $this;
+ }
</ins><span class="cx">
</span><del>- if (isset($options['secure']))
- $this-&gt;setSecure ( $options['secure'] );
- else
</del><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>

</body>
</html>

Loading...