Discussion:
[22824] standard/incubator: [INCUBATOR] Zend_Service_Ebay: centred options handling for ebay classes
renanbr
2010-08-09 18:59:58 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][22824] standard/incubator: [INCUBATOR] Zend_Service_Ebay: centred options handling for ebay classes</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>22824</dd>
<dt>Author</dt> <dd>renanbr</dd>
<dt>Date</dt> <dd>2010-08-09 11:59:54 -0700 (Mon, 09 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>[INCUBATOR] Zend_Service_Ebay: centred options handling for ebay classes</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardincubatorlibraryZendServiceEbayAbstractphp">standard/incubator/library/Zend/Service/Ebay/Abstract.php</a></li>
<li><a href="#standardincubatorlibraryZendServiceEbayFindingCategoryphp">standard/incubator/library/Zend/Service/Ebay/Finding/Category.php</a></li>
<li><a href="#standardincubatorlibraryZendServiceEbayFindingResponseAbstractphp">standard/incubator/library/Zend/Service/Ebay/Finding/Response/Abstract.php</a></li>
<li><a href="#standardincubatorlibraryZendServiceEbayFindingResponseKeywordsphp">standard/incubator/library/Zend/Service/Ebay/Finding/Response/Keywords.php</a></li>
<li><a href="#standardincubatorlibraryZendServiceEbayFindingSearchItemphp">standard/incubator/library/Zend/Service/Ebay/Finding/Search/Item.php</a></li>
<li><a href="#standardincubatorlibraryZendServiceEbayFindingStorefrontphp">standard/incubator/library/Zend/Service/Ebay/Finding/Storefront.php</a></li>
<li><a href="#standardincubatorlibraryZendServiceEbayFindingphp">standard/incubator/library/Zend/Service/Ebay/Finding.php</a></li>
<li><a href="#standardincubatortestsZendServiceEbayAbstractTestphp">standard/incubator/tests/Zend/Service/Ebay/AbstractTest.php</a></li>
<li><a href="#standardincubatortestsZendServiceEbayFindingOfflineTestphp">standard/incubator/tests/Zend/Service/Ebay/Finding/OfflineTest.php</a></li>
<li><a href="#standardincubatortestsZendServiceEbayFindingOnlineTestphp">standard/incubator/tests/Zend/Service/Ebay/Finding/OnlineTest.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardincubatorlibraryZendServiceEbayAbstractphp"></a>
<div class="modfile"><h4>Modified: standard/incubator/library/Zend/Service/Ebay/Abstract.php (22823 => 22824)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/library/Zend/Service/Ebay/Abstract.php 2010-08-09 16:07:39 UTC (rev 22823)
+++ standard/incubator/library/Zend/Service/Ebay/Abstract.php 2010-08-09 18:59:54 UTC (rev 22824)
</span><span class="lines">@@ -48,10 +48,8 @@
</span><span class="cx"> */
</span><span class="cx"> public function __construct($options = null)
</span><span class="cx"> {
</span><del>- if (null !== $options) {
- $options = $this-&gt;_optionsToArray($options);
- $this-&gt;setOption($options);
- }
</del><ins>+ $options = self::optionsToArray($options);
+ $this-&gt;setOption($options); </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> /** </span><span class="lines">@@ -62,7 +60,7 @@ </span><span class="cx"> public function setOption($name, $value = null) </span><span class="cx"> { </span><span class="cx"> if ($name instanceof Zend_Config) { </span><del>- $name-&gt;toArray(); </del><ins>+ $name = $name-&gt;toArray(); </ins><span class="cx"> } </span><span class="cx"> if (is_array($name)) { </span><span class="cx"> $this-&gt;_options = $name + $this-&gt;_options;
</span><span class="lines">@@ -112,11 +110,14 @@
</span><span class="cx"> * @throws Zend_Service_Ebay_Finding_Exception When $options is not an array neither a Zend_Config object
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><del>- protected function _optionsToArray($options)
</del><ins>+ public static function optionsToArray($options)
</ins><span class="cx"> {
</span><del>- if ($options instanceof Zend_Config) {
</del><ins>+ if (null === $options) {
+ $options = array();
+ } else if ($options instanceof Zend_Config) { </ins><span class="cx"> $options = $options-&gt;toArray(); </span><span class="cx"> } </span><ins>+ </ins><span class="cx"> if (!is_array($options)) { </span><span class="cx"> /** </span><span class="cx"> * @see Zend_Service_Ebay_Exception </span><span class="lines">@@ -124,6 +125,7 @@ </span><span class="cx"> require_once 'Zend/Service/Ebay/Exception.php'; </span><span class="cx"> throw new Zend_Service_Ebay_Exception('Invalid options provided.'); </span><span class="cx"> } </span><ins>+ </ins><span class="cx"> return $options; </span><span class="cx"> } </span><span class="cx"> </span><span class="lines">@@ -188,7 +190,7 @@ </span><span class="cx"> */ </span><span class="cx"> protected function _optionsToNameValueSyntax($options) </span><span class="cx"> { </span><del>- $options = $this-&gt;_optionsToArray($options);
</del><ins>+ $options = self::optionsToArray($options);
</ins><span class="cx"> ksort($options);
</span><span class="cx"> $new = array();
</span><span class="cx"> $runAgain = false;
</span></span></pre></div>
<a id="standardincubatorlibraryZendServiceEbayFindingCategoryphp"></a>
<div class="modfile"><h4>Modified: standard/incubator/library/Zend/Service/Ebay/Finding/Category.php (22823 => 22824)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/library/Zend/Service/Ebay/Finding/Category.php 2010-08-09 16:07:39 UTC (rev 22823)
+++ standard/incubator/library/Zend/Service/Ebay/Finding/Category.php 2010-08-09 18:59:54 UTC (rev 22824)
</span><span class="lines">@@ -66,13 +66,8 @@
</span><span class="cx"> * @param Zend_Config|array $options
</span><span class="cx"> * @return Zend_Service_Ebay_Finding_Response_Items
</span><span class="cx"> */
</span><del>- public function findItems(Zend_Service_Ebay_Finding $proxy, $options = array())
</del><ins>+ public function findItems(Zend_Service_Ebay_Finding $proxy, $options = null)
</ins><span class="cx"> {
</span><del>- // prepare options
- $options = $this-&gt;_optionsToArray($options);
- $options = array_merge($this-&gt;_options, $options);
-
- // find items </del><span class="cx"> return $proxy-&gt;findItemsByCategory($this-&gt;categoryId, $options);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="standardincubatorlibraryZendServiceEbayFindingResponseAbstractphp"></a>
<div class="modfile"><h4>Modified: standard/incubator/library/Zend/Service/Ebay/Finding/Response/Abstract.php (22823 => 22824)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/library/Zend/Service/Ebay/Finding/Response/Abstract.php 2010-08-09 16:07:39 UTC (rev 22823)
+++ standard/incubator/library/Zend/Service/Ebay/Finding/Response/Abstract.php 2010-08-09 18:59:54 UTC (rev 22824) </span><span class="lines">@@ -158,7 +158,7 @@ </span><span class="cx"> public function setOption($name, $value = null) </span><span class="cx"> { </span><span class="cx"> if ($name instanceof Zend_Config) { </span><del>- $name-&gt;toArray(); </del><ins>+ $name = $name-&gt;toArray(); </ins><span class="cx"> } </span><span class="cx"> if (is_array($name)) { </span><span class="cx"> $this-&gt;_options = $name;
</span><span class="lines">@@ -182,25 +182,4 @@
</span><span class="cx"> }
</span><span class="cx"> return null;
</span><span class="cx"> }
</span><del>-
- /**
- * @param Zend_Config|array $options
- * @throws Zend_Service_Ebay_Finding_Exception When $options is not an array neither a Zend_Config object
- * @return array
- */
- protected function _optionsToArray($options)
- {
- if ($options instanceof Zend_Config) {
- $options = $options-&gt;toArray();
- }
- if (!is_array($options)) {
- /**
- * @see Zend_Service_Ebay_Finding_Exception
- */
- require_once 'Zend/Service/Ebay/Finding/Exception.php';
- throw new Zend_Service_Ebay_Finding_Exception(
- 'Invalid options provided.');
- }
- return $options;
- }
</del><span class="cx"> }
</span></span></pre></div>
<a id="standardincubatorlibraryZendServiceEbayFindingResponseKeywordsphp"></a>
<div class="modfile"><h4>Modified: standard/incubator/library/Zend/Service/Ebay/Finding/Response/Keywords.php (22823 => 22824)</h4>
<pre class="diff"><span>
<span class="info">--- standard/incubator/library/Zend/Service/Ebay/Finding/Response/Keywords.php 2010-08-09 16:07:39 UTC (rev 22823)
+++ standard/incubator/library/Zend/Service/Ebay/Finding/Response/Keywords.php 2010-08-09 18:59:54 UTC (rev 22824) </span><span class="lines">@@ -66,11 +66,11 @@ </span><span class="cx"> * @param Zend_Config|array $options </span><span class="cx"> * @return Zend_Service_Ebay_Finding_Response_Items </span><span class="cx"> */ </span><del>- public function findItems(Zend_Service_Ebay_Finding $proxy, $options = array()) </del><ins>+ public function findItems(Zend_Service_Ebay_Finding $proxy, $options = null) </ins><span class="cx"> { </span><span class="cx"> // prepare options </span><del>- $options = $this-&gt;_optionsToArray($options);
- $options = array_merge($this-&gt;_options, $options);
</del><ins>+ $options = Zend_Service_Ebay_Abstract::optionsToArray($options);
</ins><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>

</body>
</html>

Loading...