Merge branch 'master' into feature/db-story-35

Conflicts: library/Zend/Db/Sql/Exception/RuntimeException.php
zendframework · May 8, 2012 · 802848d · 802848d
commit 802848d
Show file tree

Hide file tree

Showing 29 changed files with 93 additions and 220 deletions.
diff --git a/src/AutoDiscover.php b/src/AutoDiscover.php
@@ -23,12 +23,13 @@
 
 use Zend\Uri,
     Zend\Soap\Wsdl,
-    Zend\Soap\Wsdl\ComplexTypeStrategy,
+    Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy,
     Zend\Server\Reflection\AbstractFunction,
     Zend\Server\Reflection,
     Zend\Server\Reflection\Prototype,
     Zend\Server\Reflection\ReflectionParameter,
-    Zend\Soap\AutoDiscover\DiscoveryStrategy\ReflectionDiscovery;
+    Zend\Soap\AutoDiscover\DiscoveryStrategy\ReflectionDiscovery,
+    Zend\Soap\AutoDiscover\DiscoveryStrategy\DiscoveryStrategyInterface as DiscoveryStrategy;
 
 /**
  * \Zend\Soap\AutoDiscover
@@ -106,14 +107,14 @@ class AutoDiscover
     /**
      * Discovery strategy for types and other method details.
      *
-     * @var Zend\Soap\AutoDiscover\DiscoveryStrategy
+     * @var DiscoveryStrategy
      */
     protected $_discoveryStrategy;
 
     /**
      * Constructor
      *
-     * @param \Zend\Soap\Wsdl\ComplexTypeStrategy $strategy
+     * @param ComplexTypeStrategy $strategy
      * @param string|Uri\Uri $endpointUri
      * @param string $wsdlClass
      */
@@ -138,8 +139,8 @@ public function __construct(ComplexTypeStrategy $strategy = null, $endpointUri=n
     /**
      * Set the discovery strategy for method type and other information.
      *
-     * @param  AutoDiscover\DiscoveryStrategy $discoveryStrategy
-     * @return Zend\Soap\AutoDiscover
+     * @param  DiscoveryStrategy $discoveryStrategy
+     * @return AutoDiscover
      */
     public function setDiscoveryStrategy(DiscoveryStrategy $discoveryStrategy)
     {
@@ -148,7 +149,7 @@ public function setDiscoveryStrategy(DiscoveryStrategy $discoveryStrategy)
     }
 
     /**
-     * @return AutoDiscover\DiscoveryStrategy
+     * @return DiscoveryStrategy
      */
     public function getDiscoveryStrategy()
     {
@@ -190,6 +191,7 @@ public function setServiceName($serviceName)
      * Get service name
      *
      * @return string
+     * @throws Exception\RuntimeException
      */
     public function getServiceName()
     {
@@ -212,8 +214,8 @@ public function getServiceName()
      * Set the location at which the WSDL file will be availabe.
      *
      * @param  Uri\Uri|string $uri
-     * @return \Zend\Soap\AutoDiscover
-     * @throws \Zend\Soap\Exception\InvalidArgumentException
+     * @return AutoDiscover
+     * @throws Exception\InvalidArgumentException
      */
     public function setUri($uri)
     {
@@ -231,6 +233,7 @@ public function setUri($uri)
      * Return the current Uri that the SOAP WSDL Service will be located at.
      *
      * @return Uri\Uri
+     * @throws Exception\RuntimeException
      */
     public function getUri()
     {
@@ -248,8 +251,8 @@ public function getUri()
      * Set the name of the WSDL handling class.
      *
      * @param  string $wsdlClass
-     * @return \Zend\Soap\AutoDiscover
-     * @throws \Zend\Soap\Exception\InvalidArgumentException
+     * @return AutoDiscover
+     * @throws Exception\InvalidArgumentException
      */
     public function setWsdlClass($wsdlClass)
     {
@@ -280,8 +283,8 @@ public function getWsdlClass()
      * 'encodingStyle' => "http://schemas.xmlsoap.org/soap/encoding/".
      *
      * @param  array $operationStyle
-     * @return \Zend\Soap\AutoDiscover
-     * @throws \Zend\Soap\Exception\InvalidArgumentException
+     * @return AutoDiscover
+     * @throws Exception\InvalidArgumentException
      */
     public function setOperationBodyStyle(array $operationStyle=array())
     {
@@ -298,7 +301,7 @@ public function setOperationBodyStyle(array $operationStyle=array())
      * By default 'style' is 'rpc' and 'transport' is 'http://schemas.xmlsoap.org/soap/http'.
      *
      * @param  array $bindingStyle
-     * @return \Zend\Soap\AutoDiscover
+     * @return AutoDiscover
      */
     public function setBindingStyle(array $bindingStyle=array())
     {
@@ -314,8 +317,8 @@ public function setBindingStyle(array $bindingStyle=array())
     /**
      * Set the strategy that handles functions and classes that are added AFTER this call.
      *
-     * @param  \Zend\Soap\Wsdl\ComplexTypeStrategy $strategy
-     * @return \Zend\Soap\AutoDiscover
+     * @param  ComplexTypeStrategy $strategy
+     * @return AutoDiscover
      */
     public function setComplexTypeStrategy(ComplexTypeStrategy $strategy)
     {
@@ -328,7 +331,7 @@ public function setComplexTypeStrategy(ComplexTypeStrategy $strategy)
      * Set the Class the SOAP server will use
      *
      * @param string $class Class Name
-     * @return \Zend\Soap\AutoDiscover
+     * @return AutoDiscover
      */
     public function setClass($class)
     {
@@ -340,7 +343,7 @@ public function setClass($class)
      * Add a Single or Multiple Functions to the WSDL
      *
      * @param string $function Function Name
-     * @return \Zend\Soap\AutoDiscover
+     * @return AutoDiscover
      */
     public function addFunction($function)
     {

diff --git a/src/AutoDiscover/DiscoveryStrategy.php → ...ryStrategy/DiscoveryStrategyInterface.php b/src/AutoDiscover/DiscoveryStrategy.php → ...ryStrategy/DiscoveryStrategyInterface.php
@@ -19,7 +19,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Soap\AutoDiscover;
+namespace Zend\Soap\AutoDiscover\DiscoveryStrategy;
 
 use Zend\Server\Reflection\AbstractFunction,
     Zend\Server\Reflection\Prototype,
@@ -34,7 +34,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface DiscoveryStrategy
+interface DiscoveryStrategyInterface
 {
     /**
      * Get the function parameters php type.

diff --git a/src/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php b/src/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
@@ -21,8 +21,7 @@
 
 namespace Zend\Soap\AutoDiscover\DiscoveryStrategy;
 
-use Zend\Soap\AutoDiscover\DiscoveryStrategy,
-    Zend\Server\Reflection\AbstractFunction,
+use Zend\Server\Reflection\AbstractFunction,
     Zend\Server\Reflection\Prototype,
     Zend\Server\Reflection\ReflectionParameter;
 
@@ -36,7 +35,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-class ReflectionDiscovery implements DiscoveryStrategy
+class ReflectionDiscovery implements DiscoveryStrategyInterface
 {
     public function getFunctionDocumentation(AbstractFunction $function)
     {

diff --git a/src/Client/Common.php b/src/Client/Common.php
@@ -24,7 +24,6 @@
 if (extension_loaded('soap')) {
 
 /**
- * @uses       SoapClient
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client

diff --git a/src/Client/DotNet.php b/src/Client/DotNet.php
@@ -33,8 +33,6 @@
  * Please leave your notes, compatiblity issues reports or
  * suggestions in fw-webservices@lists.zend.com or fw-general@lists.com
  *
- * @uses       \Zend\Soap\Client
- * @uses       \Zend\Soap\ClientException
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client

diff --git a/src/Client/Local.php b/src/Client/Local.php
@@ -32,8 +32,6 @@
  *
  * Could be used for development or testing purposes.
  *
- * @uses       \Zend\Soap\Client
- * @uses       \Zend\Soap\Server
  * @category   Zend
  * @package    Zend_Soap
  * @subpackage Client

diff --git a/src/Exception/AutoDiscoverException.php b/src/Exception/AutoDiscoverException.php
diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -4,6 +4,6 @@
 
 class BadMethodCallException
     extends \BadMethodCallException
-    implements \Zend\Soap\Exception
+    implements ExceptionInterface
 {
 }
diff --git a/src/Exception.php → src/Exception/ExceptionInterface.php b/src/Exception.php → src/Exception/ExceptionInterface.php
@@ -19,7 +19,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Soap;
+namespace Zend\Soap\Exception;
 
 /**
  * @category   Zend
@@ -28,6 +28,6 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Exception
+interface ExceptionInterface
 {
 }
diff --git a/src/Exception/ExceptionNotLoadedException.php b/src/Exception/ExceptionNotLoadedException.php
@@ -4,6 +4,6 @@
 
 class ExtensionNotLoadedException
     extends \RuntimeException
-    implements \Zend\Soap\Exception
+    implements ExceptionInterface
 {
 }
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -4,6 +4,6 @@
 
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\Soap\Exception
+    implements ExceptionInterface
 {
 }
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -4,7 +4,7 @@
 
 class RuntimeException
     extends \RuntimeException
-    implements \Zend\Soap\Exception
+    implements ExceptionInterface
 {
 
 }
diff --git a/src/Exception/ServerException.php b/src/Exception/ServerException.php
diff --git a/src/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php
@@ -4,7 +4,7 @@
 
 class UnexpectedValueException
     extends \UnexpectedValueException
-    implements \Zend\Soap\Exception
+    implements ExceptionInterface
 {
 
 }
diff --git a/src/Exception/WsdlException.php b/src/Exception/WsdlException.php