Merge branch 'master' into markup

Conflicts: library/Zend/Markup/Parser/Textile.php library/Zend/Markup/Renderer/AbstractRenderer.php library/Zend/Markup/Renderer/Html.php
zendframework · Oct 30, 2010 · 9f45cc7 · 9f45cc7
2 parents 456243f + 473bfa3
commit 9f45cc7
Show file tree

Hide file tree

Showing 41 changed files with 1,021 additions and 365 deletions.
diff --git a/src/AutoDiscover.php b/src/AutoDiscover.php
@@ -17,7 +17,6 @@
  * @subpackage AutoDiscover
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -122,7 +121,7 @@ public function __construct($strategy = true, $uri=null, $wsdlClass=null)
     public function setUri($uri)
     {
         if(!is_string($uri) && !($uri instanceof Uri\Uri)) {
-            throw new AutoDiscoverException(
+            throw new Exception\InvalidArgumentException(
                 'No uri given to \Zend\Soap\AutoDiscover::setUri as string or \Zend\Uri\Uri instance.'
             );
         }
@@ -165,7 +164,7 @@ public function getUri()
     public function setWsdlClass($wsdlClass)
     {
         if(!is_string($wsdlClass) && !is_subclass_of($wsdlClass, 'Zend\Soap\Wsdl')) {
-            throw new AutoDiscoverException(
+            throw new Exception\InvalidArgumentException(
                 'No \Zend\Soap\Wsdl subclass given to Zend\Soap\AutoDiscover::setWsdlClass as string.'
             );
         }
@@ -196,7 +195,7 @@ public function getWsdlClass()
     public function setOperationBodyStyle(array $operationStyle=array())
     {
         if(!isset($operationStyle['use'])) {
-            throw new AutoDiscoverException("Key 'use' is required in Operation soap:body style.");
+            throw new Exception\InvalidArgumentException("Key 'use' is required in Operation soap:body style.");
         }
         $this->_operationBodyStyle = $operationStyle;
         return $this;
@@ -386,7 +385,7 @@ protected function _addFunctionToWsdl($function, $wsdl, $port, $binding)
             }
         }
         if ($prototype === null) {
-            throw new AutoDiscoverException("No prototypes could be found for the '" . $function->getName() . "' function");
+            throw new Exception\InvalidArgumentException("No prototypes could be found for the '" . $function->getName() . "' function");
         }
 
         $functionName = Wsdl::translateType($function->getName());
@@ -482,7 +481,7 @@ protected function _addFunctionToWsdl($function, $wsdl, $port, $binding)
      */
     public function fault($fault = null, $code = null)
     {
-        throw new AutoDiscoverException('Function has no use in AutoDiscover.');
+        throw new Exception\UnexpectedValueException('Function has no use in AutoDiscover.');
     }
 
     /**
@@ -508,7 +507,7 @@ public function dump($filename)
         if($this->_wsdl !== null) {
             return $this->_wsdl->dump($filename);
         } else {
-            throw new AutoDiscoverException('Cannot dump autodiscovered contents, WSDL file has not been generated yet.');
+            throw new Exception\RuntimeException('Cannot dump autodiscovered contents, WSDL file has not been generated yet.');
         }
     }
 
@@ -520,7 +519,7 @@ public function toXml()
         if($this->_wsdl !== null) {
             return $this->_wsdl->toXml();
         } else {
-            throw new AutoDiscoverException('Cannot return autodiscovered contents, WSDL file has not been generated yet.');
+            throw new Exception\RuntimeException('Cannot return autodiscovered contents, WSDL file has not been generated yet.');
         }
     }
 
@@ -541,7 +540,7 @@ public function getFunctions()
      */
     public function loadFunctions($definition)
     {
-        throw new AutoDiscoverException('Function has no use in AutoDiscover.');
+        throw new Exception\RuntimeException('Function has no use in AutoDiscover.');
     }
 
     /**
@@ -551,7 +550,7 @@ public function loadFunctions($definition)
      */
     public function setPersistence($mode)
     {
-        throw new AutoDiscoverException('Function has no use in AutoDiscover.');
+        throw new Exception\RuntimeException('Function has no use in AutoDiscover.');
     }
 
     /**

diff --git a/src/Client.php b/src/Client.php
@@ -17,7 +17,6 @@
  * @subpackage Client
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -143,7 +142,7 @@ class Client
     public function __construct($wsdl = null, $options = null)
     {
         if (!extension_loaded('soap')) {
-            throw new ClientException('SOAP extension is not loaded.');
+            throw new Exception\ExtensionNotLoadedException('SOAP extension is not loaded.');
         }
 
         if ($wsdl !== null) {
@@ -269,7 +268,7 @@ public function setOptions($options)
                 //    break;
 
                 default:
-                    throw new ClientException('Unknown SOAP client option');
+                    throw new Exception\InvalidArgumentException('Unknown SOAP client option');
                     break;
             }
         }
@@ -338,7 +337,7 @@ public function getOptions()
     public function setSoapVersion($version)
     {
         if (!in_array($version, array(SOAP_1_1, SOAP_1_2))) {
-            throw new ClientException('Invalid soap version specified. Use SOAP_1_1 or SOAP_1_2 constants.');
+            throw new Exception\InvalidArgumentException('Invalid soap version specified. Use SOAP_1_1 or SOAP_1_2 constants.');
         }
         $this->_soapVersion = $version;
 
@@ -368,7 +367,7 @@ public function setClassmap(array $classmap)
     {
         foreach ($classmap as $type => $class) {
             if (!class_exists($class)) {
-                throw new ClientException('Invalid class in class map');
+                throw new Exception\InvalidArgumentException('Invalid class in class map');
             }
         }
 
@@ -430,7 +429,7 @@ public function validateUrn($urn)
     {
         $scheme = parse_url($urn, PHP_URL_SCHEME);
         if ($scheme === false || $scheme === null) {
-            throw new ClientException('Invalid URN');
+            throw new Exception\InvalidArgumentException('Invalid URN');
         }
 
         return true;
@@ -505,7 +504,7 @@ public function getLocation()
     public function setStyle($style)
     {
         if (!in_array($style, array(SOAP_RPC, SOAP_DOCUMENT))) {
-            throw new ClientException('Invalid request style specified. Use SOAP_RPC or SOAP_DOCUMENT constants.');
+            throw new Exception\InvalidArgumentException('Invalid request style specified. Use SOAP_RPC or SOAP_DOCUMENT constants.');
         }
 
         $this->_style = $style;
@@ -535,7 +534,7 @@ public function getStyle()
     public function setEncodingMethod($use)
     {
         if (!in_array($use, array(SOAP_ENCODED, SOAP_LITERAL))) {
-            throw new ClientException('Invalid message encoding method. Use SOAP_ENCODED or SOAP_LITERAL constants.');
+            throw new Exception\InvalidArgumentException('Invalid message encoding method. Use SOAP_ENCODED or SOAP_LITERAL constants.');
         }
 
         $this->_use = $use;
@@ -705,7 +704,7 @@ public function setProxyPassword($proxyPassword)
     public function setHttpsCertificate($localCert)
     {
         if (!is_readable($localCert)) {
-            throw new ClientException('Invalid HTTPS client certificate path.');
+            throw new Exception\InvalidArgumentException('Invalid HTTPS client certificate path.');
         }
 
         $this->_local_cert = $localCert;
@@ -793,7 +792,7 @@ public function getProxyPassword()
     public function setStreamContext($context)
     {
         if(!is_resource($context) || get_resource_type($context) !== "stream-context") {
-            throw new ClientException('Invalid stream context resource given.');
+            throw new Exception\InvalidArgumentException('Invalid stream context resource given.');
         }
 
         $this->_stream_context = $context;
@@ -981,17 +980,17 @@ protected function _initSoapClientObject()
 
         if ($wsdl == null) {
             if (!isset($options['location'])) {
-                throw new ClientException('\'location\' parameter is required in non-WSDL mode.');
+                throw new Exception\UnexpectedValueException('\'location\' parameter is required in non-WSDL mode.');
             }
             if (!isset($options['uri'])) {
-                throw new ClientException('\'uri\' parameter is required in non-WSDL mode.');
+                throw new Exception\UnexpectedValueException('\'uri\' parameter is required in non-WSDL mode.');
             }
         } else {
             if (isset($options['use'])) {
-                throw new ClientException('\'use\' parameter only works in non-WSDL mode.');
+                throw new Exception\UnexpectedValueException('\'use\' parameter only works in non-WSDL mode.');
             }
             if (isset($options['style'])) {
-                throw new ClientException('\'style\' parameter only works in non-WSDL mode.');
+                throw new Exception\UnexpectedValueException('\'style\' parameter only works in non-WSDL mode.');
             }
         }
         unset($options['wsdl']);
@@ -1103,7 +1102,7 @@ public function __call($name, $arguments)
     public function getFunctions()
     {
         if ($this->getWSDL() == null) {
-            throw new ClientException('\'getFunctions\' method is available only in WSDL mode.');
+            throw new Exception\UnexpectedValueException(__METHOD__ . ' is available only in WSDL mode.');
         }
 
         $soapClient = $this->getSoapClient();
@@ -1126,7 +1125,7 @@ public function getFunctions()
     public function getTypes()
     {
         if ($this->getWSDL() == null) {
-            throw new ClientException('\'getTypes\' method is available only in WSDL mode.');
+            throw new Exception\UnexpectedValueException(__METHOD__ . ' method is available only in WSDL mode.');
         }
 
         $soapClient = $this->getSoapClient();

diff --git a/src/Client/Common.php b/src/Client/Common.php
@@ -17,7 +17,6 @@
  * @subpackage Client
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Client/DotNet.php b/src/Client/DotNet.php
@@ -17,7 +17,6 @@
  * @subpackage Client
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -26,7 +25,7 @@
 namespace Zend\Soap\Client;
 
 use Zend\Soap\Client as SOAPClient,
-    Zend\Soap\ClientException;
+    Zend\Soap\Exception;
 
 /**
  * .NET SOAP client
@@ -73,7 +72,7 @@ protected function _preProcessArguments($arguments)
         if (count($arguments) > 1  ||
             (count($arguments) == 1  &&  !is_array(reset($arguments)))
            ) {
-            throw new ClientException('.Net webservice arguments have to be grouped into array: array(\'a\' => $a, \'b\' => $b, ...).');
+            throw new Exception\RuntimeException('.Net webservice arguments have to be grouped into array: array(\'a\' => $a, \'b\' => $b, ...).');
         }
 
         // Do nothing

diff --git a/src/Client/Local.php b/src/Client/Local.php
@@ -17,7 +17,6 @@
  * @subpackage Client
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/ClientException.php b/src/ClientException.php
diff --git a/src/Exception.php b/src/Exception.php
@@ -17,7 +17,6 @@
  * @subpackage AutoDiscover
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -30,6 +29,6 @@
  * @package    Zend_Soap
  * @subpackage AutoDiscover
  */
-class Exception extends \Zend\Exception
+interface Exception
 {
 }
diff --git a/src/AutoDiscoverException.php → src/Exception/AutoDiscoverException.php b/src/AutoDiscoverException.php → src/Exception/AutoDiscoverException.php
@@ -17,7 +17,6 @@
  * @subpackage AutoDiscover
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Exception/ExceptionNotLoadedException.php b/src/Exception/ExceptionNotLoadedException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Zend\Soap\Exception;
+
+class ExtensionNotLoadedException
+    extends \RuntimeException
+    implements \Zend\Soap\Exception
+{
+}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Zend\Soap\Exception;
+
+class InvalidArgumentException
+    extends \InvalidArgumentException
+    implements \Zend\Soap\Exception
+{
+}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Zend\Soap\Exception;
+
+class RuntimeException
+    extends \RuntimeException
+    implements \Zend\Soap\Exception
+{
+
+}
diff --git a/src/ServerException.php → src/Exception/ServerException.php b/src/ServerException.php → src/Exception/ServerException.php
@@ -31,7 +31,6 @@
  * @subpackage Server
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 class ServerException extends Exception
 {}

diff --git a/src/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Zend\Soap\Exception;
+
+class UnexpectedValueException
+    extends \UnexpectedValueException
+    implements \Zend\Soap\Exception
+{
+
+}
diff --git a/src/WsdlException.php → src/Exception/WsdlException.php b/src/WsdlException.php → src/Exception/WsdlException.php
@@ -17,7 +17,6 @@
  * @subpackage WSDL
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**