Merge branch 'master' of git://github.com/zendframework/zf2 into cach…

…e_interfaces
zendframework · May 31, 2012 · ef273f8 · ef273f8
commit ef273f8
Show file tree

Hide file tree

Showing 30 changed files with 525 additions and 169 deletions.
diff --git a/.travis/run-tests.sh b/.travis/run-tests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-travisdir=$(dirname $(readlink /proc/$$/fd/255))
+travisdir=$(dirname "$0")
 testdir="$travisdir/../tests"
 testedcomponents=(`cat "$travisdir/tested-components"`)
 result=0

diff --git a/.travis/skipped-components b/.travis/skipped-components
@@ -1,5 +1,6 @@
 Zend/Amf
 Zend/Date
+Zend/Dojo
 Zend/Queue
 Zend/Service
 Zend/Test

diff --git a/.travis/tested-components b/.travis/tested-components
@@ -22,17 +22,19 @@ Zend/Form
 Zend/GData
 Zend/Http
 Zend/InfoCard
+Zend/InputFilter
 Zend/Json
 Zend/Ldap
 Zend/Loader
 Zend/Locale
 Zend/Log
 Zend/Mail
 Zend/Markup
+Zend/Math
 Zend/Measure
 Zend/Memory
 Zend/Mime
-Zend/Module
+Zend/ModuleManager
 Zend/Mvc
 Zend/Navigation
 Zend/OAuth

diff --git a/src/Client.php b/src/Client.php
@@ -256,7 +256,7 @@ public function doRequest($request, $response = null)
         }
 
         $this->_lastResponse = $response;
-        $this->_lastResponse->loadXml($httpResponse->getBody());
+        $this->_lastResponse->loadXml(trim($httpResponse->getBody()));
     }
 
     /**
@@ -296,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);

diff --git a/src/Client/Exception/ExceptionInterface.php b/src/Client/Exception/ExceptionInterface.php
@@ -21,6 +21,8 @@
 
 namespace Zend\XmlRpc\Client\Exception;
 
+use Zend\XmlRpc\Exception\ExceptionInterface as Exception;
+
 /**
  * Base class for all Zend_XmlRpc_Client_* exceptions
  *
@@ -30,5 +32,5 @@
  * @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 ExceptionInterface extends \Zend\XmlRpc\Exception\ExceptionInterface
-{}
+interface ExceptionInterface extends Exception
+{}
diff --git a/src/Client/Exception/FaultException.php b/src/Client/Exception/FaultException.php
@@ -21,6 +21,8 @@
 
 namespace Zend\XmlRpc\Client\Exception;
 
+use Zend\XmlRpc\Exception;
+
 /**
  * Thrown by Zend_XmlRpc_Client when an XML-RPC fault response is returned.
  *
@@ -31,6 +33,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class FaultException
-    extends \BadMethodCallException
-    implements \Zend\XmlRpc\Client\Exception\ExceptionInterface
-{}
+    extends Exception\BadMethodCallException
+    implements ExceptionInterface
+{}
diff --git a/src/Client/Exception/IntrospectException.php b/src/Client/Exception/IntrospectException.php
@@ -31,6 +31,5 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IntrospectException
-    extends \InvalidArgumentException
-    implements \Zend\XmlRpc\Client\Exception\ExceptionInterface
-{}
+    extends InvalidArgumentException
+{}
diff --git a/src/Client/Exception/InvalidArgumentException.php b/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\ExceptionInterface
-{}
+    extends Exception\InvalidArgumentException
+    implements ExceptionInterface
+{}
diff --git a/src/Client/Exception/RuntimeException.php b/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\ExceptionInterface
-{}
-
+    extends Exception\RuntimeException
+    implements ExceptionInterface
+{}
diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Zend\XmlRpc\Exception;
+
+class BadMethodCallException
+    extends \BadMethodCallException
+    implements ExceptionInterface
+{}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -4,6 +4,5 @@
 
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\XmlRpc\Exception\ExceptionInterface
+    implements ExceptionInterface
 {}
-
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -4,6 +4,5 @@
 
 class RuntimeException
     extends \RuntimeException
-    implements \Zend\XmlRpc\Exception\ExceptionInterface
+    implements ExceptionInterface
 {}
-
diff --git a/src/Exception/ValueException.php b/src/Exception/ValueException.php
@@ -30,6 +30,5 @@
  */
 class ValueException
     extends \LogicException
-    implements \Zend\XmlRpc\Exception\ExceptionInterface
-{}
-
+    implements ExceptionInterface
+{}
diff --git a/src/Request.php b/src/Request.php
@@ -13,7 +13,7 @@
  * to [email protected] so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Controller
+ * @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
  */

diff --git a/src/Request/Http.php b/src/Request/Http.php
@@ -13,7 +13,7 @@
  * to [email protected] so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Controller
+ * @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
  */

diff --git a/src/Request/Stdin.php b/src/Request/Stdin.php
@@ -13,7 +13,7 @@
  * to [email protected] so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Controller
+ * @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
  */

diff --git a/src/Response.php b/src/Response.php
@@ -13,7 +13,7 @@
  * to [email protected] so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Controller
+ * @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
  */

diff --git a/src/Response/Http.php b/src/Response/Http.php
@@ -13,7 +13,7 @@
  * to [email protected] so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Controller
+ * @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
  */

diff --git a/src/Server.php b/src/Server.php
@@ -97,7 +97,7 @@ class Server extends AbstractServer
         'i4'                         => 'i4',
         'int'                        => 'int',
         'integer'                    => 'int',
-        'Zend\Crypt\Math\BigInteger' => 'i8',
+        'Zend\Math\BigInteger'       => 'i8',
         'i8'                         => 'i8',
         'ex:i8'                      => 'i8',
         'double'                     => 'double',

diff --git a/src/Server/Exception/BadMethodCallException.php b/src/Server/Exception/BadMethodCallException.php
@@ -2,7 +2,9 @@
 
 namespace Zend\XmlRpc\Server\Exception;
 
+use Zend\XmlRpc\Exception;
+
 class BadMethodCallException
-    extends \BadMethodCallException
-    implements \Zend\XmlRpc\Server\Exception\ExceptionInterface
-{}
+    extends Exception\BadMethodCallException
+    implements ExceptionInterface
+{}
diff --git a/src/Server/Exception/ExceptionInterface.php b/src/Server/Exception/ExceptionInterface.php
@@ -21,6 +21,8 @@
 
 namespace Zend\XmlRpc\Server\Exception;
 
+use Zend\XmlRpc\Exception\ExceptionInterface as Exception;
+
 /**
  * Zend_XmlRpc_Server_Exception
  *
@@ -30,7 +32,5 @@
  * @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 ExceptionInterface extends \Zend\XmlRpc\Exception\ExceptionInterface
-{
-}
-
+interface ExceptionInterface extends Exception
+{}
diff --git a/src/Server/Exception/InvalidArgumentException.php b/src/Server/Exception/InvalidArgumentException.php
@@ -2,7 +2,9 @@
 
 namespace Zend\XmlRpc\Server\Exception;
 
+use Zend\XmlRpc\Exception;
+
 class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements \Zend\XmlRpc\Server\Exception\ExceptionInterface
-{}
+    extends Exception\InvalidArgumentException
+    implements ExceptionInterface
+{}
diff --git a/src/Server/Exception/RuntimeException.php b/src/Server/Exception/RuntimeException.php
@@ -2,7 +2,9 @@
 
 namespace Zend\XmlRpc\Server\Exception;
 
+use Zend\XmlRpc\Exception;
+
 class RuntimeException
-    extends \RuntimeException
-    implements \Zend\XmlRpc\Server\Exception\ExceptionInterface
-{}
+    extends Exception\RuntimeException
+    implements ExceptionInterface
+{}