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 · 0270a77 · 0270a77
2 parents 91571ec + 91c2337
commit 0270a77
Show file tree

Hide file tree

Showing 55 changed files with 257 additions and 331 deletions.
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$
  */
 
 /**
@@ -254,7 +253,7 @@ public function doRequest($request, $response = null)
             /**
              * Exception thrown when an HTTP error occurs
              */
-            throw new Client\HttpException(
+            throw new Client\Exception\HttpException(
                 $httpResponse->getMessage(),
                 $httpResponse->getStatus()
             );
@@ -335,8 +334,10 @@ public function call($method, $params=array())
             /**
              * Exception thrown when an XML-RPC fault is returned
              */
-            throw new Client\FaultException($fault->getMessage(),
-                                                        $fault->getCode());
+            throw new Client\Exception\FaultException(
+                $fault->getMessage(),
+                $fault->getCode()
+                );
         }
 
         return $this->_lastResponse->getReturnValue();

diff --git a/src/Client/Exception.php b/src/Client/Exception.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$
  */
 
 /**
@@ -35,5 +34,5 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Exception extends \Zend\XmlRpc\Exception
+interface Exception extends \Zend\XmlRpc\Exception
 {}
diff --git a/src/Client/FaultException.php → src/Client/Exception/FaultException.php b/src/Client/FaultException.php → src/Client/Exception/FaultException.php
@@ -17,13 +17,12 @@
  * @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$
  */
 
 /**
  * @namespace
  */
-namespace Zend\XmlRpc\Client;
+namespace Zend\XmlRpc\Client\Exception;
 
 /**
  * Thrown by Zend_XmlRpc_Client when an XML-RPC fault response is returned.
@@ -35,5 +34,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class FaultException extends Exception
+class FaultException
+    extends \BadMethodCallException
+    implements \Zend\XmlRpc\Client\Exception
 {}
diff --git a/src/Client/HttpException.php → src/Client/Exception/HttpException.php b/src/Client/HttpException.php → src/Client/Exception/HttpException.php
@@ -17,13 +17,12 @@
  * @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$
  */
 
 /**
  * @namespace
  */
-namespace Zend\XmlRpc\Client;
+namespace Zend\XmlRpc\Client\Exception;
 
 /**
  * Thrown by Zend_XmlRpc_Client when an HTTP error occurs during an
@@ -36,5 +35,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class HttpException extends Exception
+class HttpException
+    extends RuntimeException
+    implements \Zend\XmlRpc\Client\Exception
 {}
diff --git a/src/Client/IntrospectException.php → src/Client/Exception/IntrospectException.php b/src/Client/IntrospectException.php → src/Client/Exception/IntrospectException.php
@@ -17,13 +17,12 @@
  * @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$
  */
 
 /**
  * @namespace
  */
-namespace Zend\XmlRpc\Client;
+namespace Zend\XmlRpc\Client\Exception;
 
 /**
  * Thrown by Zend_XmlRpc_Client_Introspection when any error occurs.
@@ -35,5 +34,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class IntrospectException extends Exception
+class IntrospectException
+    extends \InvalidArgumentException
+    implements \Zend\XmlRpc\Client\Exception
 {}
diff --git a/src/Client/Exception/InvalidArgumentException.php b/src/Client/Exception/InvalidArgumentException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Zend\XmlRpc\Exception;
+
+class InvalidArgumentException
+    extends \InvalidArgumentException
+    implements \Zend\XmlRpc\Exception
+{}
+
diff --git a/src/Client/Exception/RuntimeException.php b/src/Client/Exception/RuntimeException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Zend\XmlRpc\Client\Exception;
+
+class RuntimeException
+    extends \RuntimeException
+    implements \Zend\XmlRpc\Client\Exception
+{}
+
diff --git a/src/Client/ServerIntrospection.php b/src/Client/ServerIntrospection.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$
  */
 
 /**
@@ -103,12 +102,12 @@ public function getSignatureForEachMethodByMulticall($methods = null)
         if (! is_array($serverSignatures)) {
             $type = gettype($serverSignatures);
             $error = "Multicall return is malformed.  Expected array, got $type";
-            throw new IntrospectException($error);
+            throw new Exception\IntrospectException($error);
         }
 
         if (count($serverSignatures) != count($methods)) {
             $error = 'Bad number of signatures received from multicall';
-            throw new IntrospectException($error);
+            throw new Exception\IntrospectException($error);
         }
 
         // Create a new signatures array with the methods name as keys and the signature as value
@@ -152,7 +151,7 @@ public function getMethodSignature($method)
         $signature = $this->_system->methodSignature($method);
         if (!is_array($signature)) {
             $error = 'Invalid signature for method "' . $method . '"';
-            throw new IntrospectException($error);
+            throw new Exception\IntrospectException($error);
         }
         return $signature;
     }

diff --git a/src/Client/ServerProxy.php b/src/Client/ServerProxy.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/Exception.php b/src/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_XmlRpc
  * @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$
  */
 
 /**
@@ -31,6 +30,5 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Exception extends \Zend\Exception
+interface Exception
 {}
-
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Zend\XmlRpc\Exception;
+
+class InvalidArgumentException
+    extends \InvalidArgumentException
+    implements \Zend\XmlRpc\Exception
+{}
+
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Zend\XmlRpc\Exception;
+
+class RuntimeException
+    extends \RuntimeException
+    implements \Zend\XmlRpc\Exception
+{}
+
diff --git a/src/Value/Exception.php → src/Exception/ValueException.php b/src/Value/Exception.php → src/Exception/ValueException.php
@@ -17,13 +17,12 @@
  * @subpackage Value
  * @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$
  */
 
 /**
  * @namespace
  */
-namespace Zend\XmlRpc\Value;
+namespace Zend\XmlRpc\Exception;
 
 /**
  * @uses       \Zend\XmlRpc\Exception
@@ -33,6 +32,8 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Exception extends \Zend\XmlRpc\Exception
+class ValueException
+    extends \LogicException
+    implements \Zend\XmlRpc\Exception
 {}
 
diff --git a/src/Fault.php b/src/Fault.php
@@ -16,7 +16,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$
  */
 
 /**
@@ -197,14 +196,14 @@ public function getEncoding()
     public function loadXml($fault)
     {
         if (!is_string($fault)) {
-            throw new Exception('Invalid XML provided to fault');
+            throw new Exception\InvalidArgumentException('Invalid XML provided to fault');
         }
 
         try {
             $xml = new \SimpleXMLElement($fault);
         } catch (\Exception $e) {
             // Not valid XML
-            throw new Exception('Failed to parse XML fault: ' .  $e->getMessage(), 500, $e);
+            throw new Exception\InvalidArgumentException('Failed to parse XML fault: ' .  $e->getMessage(), 500, $e);
         }
 
         // Check for fault
@@ -215,7 +214,7 @@ public function loadXml($fault)
 
         if (!$xml->fault->value->struct) {
             // not a proper fault
-            throw new Exception('Invalid fault structure', 500);
+            throw new Exception\InvalidArgumentException('Invalid fault structure', 500);
         }
 
         $structXml = $xml->fault->value->asXML();
@@ -230,7 +229,7 @@ public function loadXml($fault)
         }
 
         if (empty($code) && empty($message)) {
-            throw new Exception('Fault code and string required');
+            throw new Exception\InvalidArgumentException('Fault code and string required');
         }
 
         if (empty($code)) {

diff --git a/src/Generator.php b/src/Generator.php
@@ -16,7 +16,6 @@
  * @package    Zend_XmlRpc
  * @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/Generator/AbstractGenerator.php b/src/Generator/AbstractGenerator.php
@@ -17,7 +17,6 @@
  * @subpackage Generator
  * @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/Generator/DomDocument.php b/src/Generator/DomDocument.php
@@ -17,7 +17,6 @@
  * @subpackage Generator
  * @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/Generator/XmlWriter.php b/src/Generator/XmlWriter.php
@@ -17,7 +17,6 @@
  * @subpackage Generator
  * @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/Request.php b/src/Request.php
@@ -41,7 +41,6 @@
  * @package    Zend_XmlRpc
  * @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 Request
 {

diff --git a/src/Request/Http.php b/src/Request/Http.php
@@ -39,7 +39,6 @@
  * @package    Zend_XmlRpc
  * @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 Http extends XmlRpcRequest
 {

diff --git a/src/Request/Stdin.php b/src/Request/Stdin.php
@@ -39,7 +39,6 @@
  * @package    Zend_XmlRpc
  * @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 Stdin extends XmlRpcRequest
 {

diff --git a/src/Response.php b/src/Response.php
@@ -36,7 +36,6 @@
  * @package    Zend_XmlRpc
  * @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 Response
 {
@@ -204,7 +203,7 @@ public function loadXml($response)
 
         try {
             if (!isset($xml->params) || !isset($xml->params->param) || !isset($xml->params->param->value)) {
-                throw new Value\Exception('Missing XML-RPC value in XML');
+                throw new Exception\ValueException('Missing XML-RPC value in XML');
             }
             $valueXml = $xml->params->param->value->asXML();
             $value = Value::getXmlRpcValue($valueXml, Value::XML_STRING);

diff --git a/src/Response/Http.php b/src/Response/Http.php
@@ -33,7 +33,6 @@
  * @package    Zend_XmlRpc
  * @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 Http extends XmlRpcResponse
 {