Merge branch 'master' into rfc/escaper

src/Client.php

@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\XmlRpc;
 
 use Zend\Http,
@@ -87,7 +84,7 @@ class Client implements ServerClient
      *
      * @param  string $server      Full address of the XML-RPC service
      *                             (e.g. http://time.xmlrpc.com/RPC2)
-     * @param  Zend\Http\Client $httpClient HTTP Client to use for requests
+     * @param  \Zend\Http\Client $httpClient HTTP Client to use for requests
      * @return void
      */
     public function __construct($server, Http\Client $httpClient = null)
@@ -259,7 +256,7 @@ public function doRequest($request, $response = null)
         }
 
         $this->_lastResponse = $response;
-        $this->_lastResponse->loadXml($httpResponse->getBody());
+        $this->_lastResponse->loadXml(trim($httpResponse->getBody()));
     }
 
     /**
@@ -278,7 +275,7 @@ public function call($method, $params=array())
             $success = true;
             try {
                 $signatures = $this->getIntrospector()->getMethodSignature($method);
-            } catch (\Zend\XmlRpc\Exception $e) {
+            } catch (\Zend\XmlRpc\Exception\ExceptionInterface $e) {
                 $success = false;
             }
             if ($success) {
@@ -299,21 +296,30 @@ public function call($method, $params=array())
                     $params = array($params);
                 }
                 foreach ($params as $key => $param) {
-
                     if ($param instanceof Value) {
                         continue;
                     }
 
-                    $type = Value::AUTO_DETECT_TYPE;
-                    foreach ($signatures as $signature) {
-                        if (!is_array($signature)) {
-                            continue;
+                    if (count($signatures) > 1) {
+                        $type = Value::getXmlRpcTypeByValue($param);
+                        foreach ($signatures as $signature) {
+                            if (!is_array($signature)) {
+                                continue;
+                            }
+                            if (isset($signature['parameters'][$key])) {
+                                if ($signature['parameters'][$key] == $type) {
+                                    break;
+                                }
+                            }
                         }
+                    } elseif (isset($signatures[0]['parameters'][$key])) {
+                        $type = $signatures[0]['parameters'][$key];
+                    } else {
+                        $type = null;
+                    }
 
-                        if (isset($signature['parameters'][$key])) {
-                            $type = $signature['parameters'][$key];
-                            $type = in_array($type, $validTypes) ? $type : Value::AUTO_DETECT_TYPE;
-                        }
+                    if (empty($type) || !in_array($type, $validTypes)) {
+                        $type = Value::AUTO_DETECT_TYPE;
                     }
 
                     $params[$key] = Value::getXmlRpcValue($param, $type);

src/Client/Exception.php → src/Client/Exception/ExceptionInterface.php

@@ -19,20 +19,18 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
-namespace Zend\XmlRpc\Client;
+namespace Zend\XmlRpc\Client\Exception;
+
+use Zend\XmlRpc\Exception\ExceptionInterface as Exception;
 
 /**
  * Base class for all Zend_XmlRpc_Client_* exceptions
  *
- * @uses       Zend\XmlRpc\Exception
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
  * @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 extends \Zend\XmlRpc\Exception
-{}
+interface ExceptionInterface extends Exception
+{}

src/Client/Exception/FaultException.php

@@ -19,22 +19,20 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\XmlRpc\Client\Exception;
 
+use Zend\XmlRpc\Exception;
+
 /**
  * Thrown by Zend_XmlRpc_Client when an XML-RPC fault response is returned.
  *
- * @uses       Zend\XmlRpc\Client\Exception
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FaultException
-    extends \BadMethodCallException
-    implements \Zend\XmlRpc\Client\Exception
-{}
+    extends Exception\BadMethodCallException
+    implements ExceptionInterface
+{}

src/Client/Exception/HttpException.php

@@ -19,16 +19,12 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\XmlRpc\Client\Exception;
 
 /**
  * Thrown by Zend_XmlRpc_Client when an HTTP error occurs during an
  * XML-RPC method call.
  *
- * @uses       Zend\XmlRpc\Client\Exception
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client

src/Client/Exception/IntrospectException.php

@@ -19,22 +19,17 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\XmlRpc\Client\Exception;
 
 /**
  * Thrown by Zend_XmlRpc_Client_Introspection when any error occurs.
  *
- * @uses       Zend\XmlRpc\Client\Exception
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IntrospectException
-    extends \InvalidArgumentException
-    implements \Zend\XmlRpc\Client\Exception
-{}
+    extends InvalidArgumentException
+{}

src/Client/Exception/InvalidArgumentException.php

@@ -2,7 +2,9 @@
 
 namespace Zend\XmlRpc\Client\Exception;
 
+use Zend\XmlRpc\Exception;
+
 class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements \Zend\XmlRpc\Exception
-{}
+    extends Exception\InvalidArgumentException
+    implements ExceptionInterface
+{}

src/Client/Exception/RuntimeException.php

@@ -2,8 +2,9 @@
 
 namespace Zend\XmlRpc\Client\Exception;
 
+use Zend\XmlRpc\Exception;
+
 class RuntimeException
-    extends \RuntimeException
-    implements \Zend\XmlRpc\Client\Exception
-{}
-
+    extends Exception\RuntimeException
+    implements ExceptionInterface
+{}

src/Client/ServerIntrospection.php

@@ -19,18 +19,13 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\XmlRpc\Client;
 
 use Zend\XmlRpc\Client as XMLRPCClient;
 
 /**
  * Wraps the XML-RPC system.* introspection methods
  *
- * @uses       Zend\XmlRpc\Client\FaultException
- * @uses       Zend\XmlRpc\Client\IntrospectException
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Client

src/Client/ServerProxy.php

@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\XmlRpc\Client;
 
 use Zend\XmlRpc\Client as XMLRPCClient;

src/Exception/BadMethodCallException.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Zend\XmlRpc\Exception;
+
+class BadMethodCallException
+    extends \BadMethodCallException
+    implements ExceptionInterface
+{}

src/Exception.php → src/Exception/ExceptionInterface.php

@@ -18,16 +18,13 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
-namespace Zend\XmlRpc;
+namespace Zend\XmlRpc\Exception;
 
 /**
  * @category   Zend
  * @package    Zend_XmlRpc
  * @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
 {}

src/Exception/InvalidArgumentException.php

@@ -4,6 +4,5 @@
 
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\XmlRpc\Exception
+    implements ExceptionInterface
 {}
-

src/Exception/RuntimeException.php

@@ -4,6 +4,5 @@
 
 class RuntimeException
     extends \RuntimeException
-    implements \Zend\XmlRpc\Exception
+    implements ExceptionInterface
 {}
-

src/Exception/ValueException.php

@@ -19,13 +19,9 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\XmlRpc\Exception;
 
 /**
- * @uses       \Zend\XmlRpc\Exception
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage Value
@@ -34,6 +30,5 @@
  */
 class ValueException
     extends \LogicException
-    implements \Zend\XmlRpc\Exception
-{}
-
+    implements ExceptionInterface
+{}

src/Fault.php

@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\XmlRpc;
 
 /**
@@ -33,9 +30,6 @@
  * To allow method chaining, you may only use the {@link getInstance()} factory
  * to instantiate a Zend_XmlRpc_Server_Fault.
  *
- * @uses       SimpleXMLElement
- * @uses       Zend\XmlRpc\Exception
- * @uses       Zend\XmlRpc\Value\Value
  * @category   Zend
  * @package    Zend_XmlRpc
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
@@ -121,7 +115,7 @@ public function __construct($code = 404, $message = '')
      * Set the fault code
      *
      * @param int $code
-     * @return Zend\XmlRpc\Fault
+     * @return Fault
      */
     public function setCode($code)
     {
@@ -143,7 +137,7 @@ public function getCode()
      * Retrieve fault message
      *
      * @param string
-     * @return Zend\XmlRpc\Fault
+     * @return Fault
      */
     public function setMessage($message)
     {
@@ -165,7 +159,7 @@ public function getMessage()
      * Set encoding to use in fault response
      *
      * @param string $encoding
-     * @return Zend\XmlRpc\Fault
+     * @return Fault
      */
     public function setEncoding($encoding)
     {
@@ -190,7 +184,7 @@ public function getEncoding()
      * @param string $fault
      * @return boolean Returns true if successfully loaded fault response, false
      * if response was not a fault response
-     * @throws Zend\XmlRpc\Exception if no or faulty XML provided, or if fault
+     * @throws \Zend\XmlRpc\Exception\ExceptionInterface if no or faulty XML provided, or if fault
      * response does not contain either code or message
      */
     public function loadXml($fault)
@@ -261,7 +255,7 @@ public static function isFault($xml)
         $fault = new self();
         try {
             $isFault = $fault->loadXml($xml);
-        } catch (Exception $e) {
+        } catch (Exception\ExceptionInterface $e) {
             $isFault = false;
         }