alexander
2010-08-20 19:22:08 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][22862] standard/branches/release-1.10/library/Zend/Soap/AutoDiscover.php: Zend_Soap: [ZF-9780] (setters become fluent interfaces) plus some additional dockblocks fixes.</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>22862</dd>
<dt>Author</dt> <dd>alexander</dd>
<dt>Date</dt> <dd>2010-08-20 12:22:03 -0700 (Fri, 20 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Zend_Soap: [ZF-9780] (setters become fluent interfaces) plus some additional dockblocks fixes. Merges cs-22860 and cs-22861 from trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesrelease110libraryZendSoapAutoDiscoverphp">standard/branches/release-1.10/library/Zend/Soap/AutoDiscover.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesrelease110libraryZendSoapAutoDiscoverphp"></a>
<div class="modfile"><h4>Modified: standard/branches/release-1.10/library/Zend/Soap/AutoDiscover.php (22861 => 22862)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/release-1.10/library/Zend/Soap/AutoDiscover.php 2010-08-20 19:15:39 UTC (rev 22861)
+++ standard/branches/release-1.10/library/Zend/Soap/AutoDiscover.php 2010-08-20 19:22:03 UTC (rev 22862) </span><span class="lines">@@ -111,20 +111,20 @@ </span><span class="cx"> * Set the location at which the WSDL file will be availabe. </span><span class="cx"> * </span><span class="cx"> * @see Zend_Soap_Exception </span><del>- * @throws Zend_Soap_AutoDiscover_Exception </del><span class="cx"> * @param Zend_Uri|string $uri </span><span class="cx"> * @return Zend_Soap_AutoDiscover </span><ins>+ * @throws Zend_Soap_AutoDiscover_Exception </ins><span class="cx"> */ </span><span class="cx"> public function setUri($uri) </span><span class="cx"> { </span><del>- if(!is_string($uri) && !($uri instanceof Zend_Uri)) { </del><ins>+ if (!is_string($uri) && !($uri instanceof Zend_Uri)) { </ins><span class="cx"> require_once "Zend/Soap/AutoDiscover/Exception.php"; </span><span class="cx"> throw new Zend_Soap_AutoDiscover_Exception("No uri given to Zend_Soap_AutoDiscover::setUri as string or Zend_Uri instance."); </span><span class="cx"> } </span><span class="cx"> $this->_uri = $uri; </span><span class="cx"> </span><span class="cx"> // change uri in WSDL file also if existant </span><del>- if($this->_wsdl instanceof Zend_Soap_Wsdl) { </del><ins>+ if ($this->_wsdl instanceof Zend_Soap_Wsdl) { </ins><span class="cx"> $this->_wsdl->setUri($uri); </span><span class="cx"> } </span><span class="cx"> </span><span class="lines">@@ -159,6 +159,7 @@ </span><span class="cx"> * @see Zend_Soap_AutoDiscover_Exception </span><span class="cx"> * @param array $operationStyle </span><span class="cx"> * @return Zend_Soap_AutoDiscover </span><ins>+ * @throws Zend_Soap_AutoDiscover_Exception </ins><span class="cx"> */ </span><span class="cx"> public function setOperationBodyStyle(array $operationStyle=array()) </span><span class="cx"> { </span><span class="lines">@@ -263,6 +264,7 @@ </span><span class="cx"> * @param string $class Class Name </span><span class="cx"> * @param string $namespace Class Namspace - Not Used </span><span class="cx"> * @param array $argv Arguments to instantiate the class - Not Used </span><ins>+ * @return Zend_Soap_AutoDiscover </ins><span class="cx"> */ </span><span class="cx"> public function setClass($class, $namespace = '', $argv = null) </span><span class="cx"> { </span><span class="lines">@@ -282,6 +284,8 @@ </span><span class="cx"> $this->_addFunctionToWsdl($method, $wsdl, $port, $binding); </span><span class="cx"> } </span><span class="cx"> $this->_wsdl = $wsdl;
</span><ins>+
+ return this; </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> /** </span><span class="lines">@@ -289,6 +293,7 @@ </span><span class="cx"> * </span><span class="cx"> * @param string $function Function Name </span><span class="cx"> * @param string $namespace Function namespace - Not Used </span><ins>+ * @return Zend_Soap_AutoDiscover </ins><span class="cx"> */ </span><span class="cx"> public function addFunction($function, $namespace = '') </span><span class="cx"> { </span><span class="lines">@@ -324,6 +329,8 @@ </span><span class="cx"> $this->_addFunctionToWsdl($method, $wsdl, $port, $binding); </span><span class="cx"> } </span><span class="cx"> $this->_wsdl = $wsdl;
</span><ins>+
+ return $this;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -442,6 +449,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $fault
</span><span class="cx"> * @param string|int $code
</span><ins>+ * @throws Zend_Soap_AutoDiscover_Exception
</ins><span class="cx"> */
</span><span class="cx"> public function fault($fault = null, $code = null)
</span><span class="cx"> {
</span><span class="lines">@@ -466,6 +474,8 @@
</span><span class="cx"> * Proxy to WSDL dump function
</span><span class="cx"> *
</span><span class="cx"> * @param string $filename
</span><ins>+ * @return boolean
+ * @throws Zend_Soap_AutoDiscover_Exception
</ins><span class="cx"> */
</span><span class="cx"> public function dump($filename)
</span><span class="cx"> {
</span><span class="lines">@@ -482,6 +492,9 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Proxy to WSDL toXml() function
</span><ins>+ *
+ * @return string
+ * @throws Zend_Soap_AutoDiscover_Exception
</ins><span class="cx"> */
</span><span class="cx"> public function toXml()
</span><span class="cx"> {
</span><span class="lines">@@ -510,6 +523,7 @@
</span><span class="cx"> * Load Functions
</span><span class="cx"> *
</span><span class="cx"> * @param unknown_type $definition
</span><ins>+ * @throws Zend_Soap_AutoDiscover_Exception
</ins><span class="cx"> */
</span><span class="cx"> public function loadFunctions($definition)
</span><span class="cx"> {
</span><span class="lines">@@ -521,6 +535,7 @@
</span><span class="cx"> * Set Persistance
</span><span class="cx"> *
</span><span class="cx"> * @param int $mode
</span><ins>+ * @throws Zend_Soap_AutoDiscover_Exception
</ins><span class="cx"> */
</span><span class="cx"> public function setPersistence($mode)
</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][22862] standard/branches/release-1.10/library/Zend/Soap/AutoDiscover.php: Zend_Soap: [ZF-9780] (setters become fluent interfaces) plus some additional dockblocks fixes.</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>22862</dd>
<dt>Author</dt> <dd>alexander</dd>
<dt>Date</dt> <dd>2010-08-20 12:22:03 -0700 (Fri, 20 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Zend_Soap: [ZF-9780] (setters become fluent interfaces) plus some additional dockblocks fixes. Merges cs-22860 and cs-22861 from trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesrelease110libraryZendSoapAutoDiscoverphp">standard/branches/release-1.10/library/Zend/Soap/AutoDiscover.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesrelease110libraryZendSoapAutoDiscoverphp"></a>
<div class="modfile"><h4>Modified: standard/branches/release-1.10/library/Zend/Soap/AutoDiscover.php (22861 => 22862)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/release-1.10/library/Zend/Soap/AutoDiscover.php 2010-08-20 19:15:39 UTC (rev 22861)
+++ standard/branches/release-1.10/library/Zend/Soap/AutoDiscover.php 2010-08-20 19:22:03 UTC (rev 22862) </span><span class="lines">@@ -111,20 +111,20 @@ </span><span class="cx"> * Set the location at which the WSDL file will be availabe. </span><span class="cx"> * </span><span class="cx"> * @see Zend_Soap_Exception </span><del>- * @throws Zend_Soap_AutoDiscover_Exception </del><span class="cx"> * @param Zend_Uri|string $uri </span><span class="cx"> * @return Zend_Soap_AutoDiscover </span><ins>+ * @throws Zend_Soap_AutoDiscover_Exception </ins><span class="cx"> */ </span><span class="cx"> public function setUri($uri) </span><span class="cx"> { </span><del>- if(!is_string($uri) && !($uri instanceof Zend_Uri)) { </del><ins>+ if (!is_string($uri) && !($uri instanceof Zend_Uri)) { </ins><span class="cx"> require_once "Zend/Soap/AutoDiscover/Exception.php"; </span><span class="cx"> throw new Zend_Soap_AutoDiscover_Exception("No uri given to Zend_Soap_AutoDiscover::setUri as string or Zend_Uri instance."); </span><span class="cx"> } </span><span class="cx"> $this->_uri = $uri; </span><span class="cx"> </span><span class="cx"> // change uri in WSDL file also if existant </span><del>- if($this->_wsdl instanceof Zend_Soap_Wsdl) { </del><ins>+ if ($this->_wsdl instanceof Zend_Soap_Wsdl) { </ins><span class="cx"> $this->_wsdl->setUri($uri); </span><span class="cx"> } </span><span class="cx"> </span><span class="lines">@@ -159,6 +159,7 @@ </span><span class="cx"> * @see Zend_Soap_AutoDiscover_Exception </span><span class="cx"> * @param array $operationStyle </span><span class="cx"> * @return Zend_Soap_AutoDiscover </span><ins>+ * @throws Zend_Soap_AutoDiscover_Exception </ins><span class="cx"> */ </span><span class="cx"> public function setOperationBodyStyle(array $operationStyle=array()) </span><span class="cx"> { </span><span class="lines">@@ -263,6 +264,7 @@ </span><span class="cx"> * @param string $class Class Name </span><span class="cx"> * @param string $namespace Class Namspace - Not Used </span><span class="cx"> * @param array $argv Arguments to instantiate the class - Not Used </span><ins>+ * @return Zend_Soap_AutoDiscover </ins><span class="cx"> */ </span><span class="cx"> public function setClass($class, $namespace = '', $argv = null) </span><span class="cx"> { </span><span class="lines">@@ -282,6 +284,8 @@ </span><span class="cx"> $this->_addFunctionToWsdl($method, $wsdl, $port, $binding); </span><span class="cx"> } </span><span class="cx"> $this->_wsdl = $wsdl;
</span><ins>+
+ return this; </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> /** </span><span class="lines">@@ -289,6 +293,7 @@ </span><span class="cx"> * </span><span class="cx"> * @param string $function Function Name </span><span class="cx"> * @param string $namespace Function namespace - Not Used </span><ins>+ * @return Zend_Soap_AutoDiscover </ins><span class="cx"> */ </span><span class="cx"> public function addFunction($function, $namespace = '') </span><span class="cx"> { </span><span class="lines">@@ -324,6 +329,8 @@ </span><span class="cx"> $this->_addFunctionToWsdl($method, $wsdl, $port, $binding); </span><span class="cx"> } </span><span class="cx"> $this->_wsdl = $wsdl;
</span><ins>+
+ return $this;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -442,6 +449,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $fault
</span><span class="cx"> * @param string|int $code
</span><ins>+ * @throws Zend_Soap_AutoDiscover_Exception
</ins><span class="cx"> */
</span><span class="cx"> public function fault($fault = null, $code = null)
</span><span class="cx"> {
</span><span class="lines">@@ -466,6 +474,8 @@
</span><span class="cx"> * Proxy to WSDL dump function
</span><span class="cx"> *
</span><span class="cx"> * @param string $filename
</span><ins>+ * @return boolean
+ * @throws Zend_Soap_AutoDiscover_Exception
</ins><span class="cx"> */
</span><span class="cx"> public function dump($filename)
</span><span class="cx"> {
</span><span class="lines">@@ -482,6 +492,9 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Proxy to WSDL toXml() function
</span><ins>+ *
+ * @return string
+ * @throws Zend_Soap_AutoDiscover_Exception
</ins><span class="cx"> */
</span><span class="cx"> public function toXml()
</span><span class="cx"> {
</span><span class="lines">@@ -510,6 +523,7 @@
</span><span class="cx"> * Load Functions
</span><span class="cx"> *
</span><span class="cx"> * @param unknown_type $definition
</span><ins>+ * @throws Zend_Soap_AutoDiscover_Exception
</ins><span class="cx"> */
</span><span class="cx"> public function loadFunctions($definition)
</span><span class="cx"> {
</span><span class="lines">@@ -521,6 +535,7 @@
</span><span class="cx"> * Set Persistance
</span><span class="cx"> *
</span><span class="cx"> * @param int $mode
</span><ins>+ * @throws Zend_Soap_AutoDiscover_Exception
</ins><span class="cx"> */
</span><span class="cx"> public function setPersistence($mode)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>