Merge branch 'develop'

Preparing to tag 2.1.0 -- all new features from develop are now merged to master.
zendframework · Jan 29, 2013 · 6e89cc1 · 6e89cc1
commit 6e89cc1
Show file tree

Hide file tree

Showing 45 changed files with 37 additions and 197 deletions.
diff --git a/src/AbstractValue.php b/src/AbstractValue.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc;
@@ -22,8 +21,6 @@
  *
  * Using this function, users/Zend\XmlRpc\Client object can create the Zend\XmlRpc\Value objects
  * from PHP variables, XML string or by specifying the exact XML-RPC natvie type
- *
- * @package    Zend_XmlRpc
  */
 abstract class AbstractValue
 {

diff --git a/src/Client.php b/src/Client.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc;
@@ -16,10 +15,6 @@
 
 /**
  * An XML-RPC client implementation
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
  */
 class Client implements ServerClient
 {

diff --git a/src/Client/Exception/ExceptionInterface.php b/src/Client/Exception/ExceptionInterface.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Client\Exception;
@@ -14,10 +13,6 @@
 
 /**
  * Base class for all Zend_XmlRpc_Client_* exceptions
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
  */
 interface ExceptionInterface extends Exception
 {

diff --git a/src/Client/Exception/FaultException.php b/src/Client/Exception/FaultException.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Client\Exception;
@@ -14,10 +13,6 @@
 
 /**
  * Thrown by Zend_XmlRpc_Client when an XML-RPC fault response is returned.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
  */
 class FaultException extends Exception\BadMethodCallException implements ExceptionInterface
 {

diff --git a/src/Client/Exception/HttpException.php b/src/Client/Exception/HttpException.php
@@ -5,18 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Client\Exception;
 
 /**
  * Thrown by Zend_XmlRpc_Client when an HTTP error occurs during an
  * XML-RPC method call.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
  */
 class HttpException extends RuntimeException
 {

diff --git a/src/Client/Exception/IntrospectException.php b/src/Client/Exception/IntrospectException.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Client\Exception;
 
 /**
  * Thrown by Zend_XmlRpc_Client_Introspection when any error occurs.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
  */
 class IntrospectException extends InvalidArgumentException
 {

diff --git a/src/Client/Exception/InvalidArgumentException.php b/src/Client/Exception/InvalidArgumentException.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Client\Exception;

diff --git a/src/Client/Exception/RuntimeException.php b/src/Client/Exception/RuntimeException.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Client\Exception;

diff --git a/src/Client/ServerIntrospection.php b/src/Client/ServerIntrospection.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Client;
@@ -14,10 +13,6 @@
 
 /**
  * Wraps the XML-RPC system.* introspection methods
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
  */
 class ServerIntrospection
 {
@@ -48,7 +43,7 @@ public function getSignatureForEachMethod()
 
         try {
             $signatures = $this->getSignatureForEachMethodByMulticall($methods);
-        } catch (FaultException $e) {
+        } catch (Exception\FaultException $e) {
             // degrade to looping
         }
 

diff --git a/src/Client/ServerProxy.php b/src/Client/ServerProxy.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Client;
@@ -16,10 +15,6 @@
  * The namespace decorator enables object chaining to permit
  * calling XML-RPC namespaced functions like "foo.bar.baz()"
  * as "$remote->foo->bar->baz()".
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Client
  */
 class ServerProxy
 {

diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Exception;

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -5,15 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- */
 interface ExceptionInterface
 {
 }
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Exception;

diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Exception;

diff --git a/src/Exception/ValueException.php b/src/Exception/ValueException.php
@@ -5,16 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Value
- */
 class ValueException extends \LogicException implements ExceptionInterface
 {
 }
diff --git a/src/Fault.php b/src/Fault.php
@@ -5,11 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc;
 
+use SimpleXMLElement;
+
 /**
  * XMLRPC Faults
  *
@@ -19,9 +20,6 @@
  *
  * To allow method chaining, you may only use the {@link getInstance()} factory
  * to instantiate a Zend_XmlRpc_Server_Fault.
- *
- * @category   Zend
- * @package    Zend_XmlRpc
  */
 class Fault
 {
@@ -171,7 +169,7 @@ public function getEncoding()
      * @param string $fault
      * @return bool Returns true if successfully loaded fault response, false
      * if response was not a fault response
-     * @throws \Zend\XmlRpc\Exception\ExceptionInterface if no or faulty XML provided, or if fault
+     * @throws Exception\ExceptionInterface if no or faulty XML provided, or if fault
      * response does not contain either code or message
      */
     public function loadXml($fault)
@@ -180,12 +178,25 @@ public function loadXml($fault)
             throw new Exception\InvalidArgumentException('Invalid XML provided to fault');
         }
 
+        $xmlErrorsFlag = libxml_use_internal_errors(true);
         try {
-            $xml = new \SimpleXMLElement($fault);
+            $xml = new SimpleXMLElement($fault);
         } catch (\Exception $e) {
             // Not valid XML
             throw new Exception\InvalidArgumentException('Failed to parse XML fault: ' .  $e->getMessage(), 500, $e);
         }
+        if (!$xml instanceof SimpleXMLElement) {
+            $errors = libxml_get_errors();
+            $errors = array_reduce($errors, function ($result, $item) {
+                if (empty($result)) {
+                    return $item->message;
+                }
+                return $result . '; ' . $item->message;
+            }, '');
+            libxml_use_internal_errors($xmlErrorsFlag);
+            throw new Exception\InvalidArgumentException('Failed to parse XML fault: ' . $errors, 500);
+        }
+        libxml_use_internal_errors($xmlErrorsFlag);
 
         // Check for fault
         if (!$xml->fault) {

diff --git a/src/Generator/AbstractGenerator.php b/src/Generator/AbstractGenerator.php
@@ -5,14 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Generator;
 
 /**
  * Abstract XML generator adapter
- *
  */
 abstract class AbstractGenerator implements GeneratorInterface
 {

diff --git a/src/Generator/DomDocument.php b/src/Generator/DomDocument.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Generator;
 
 /**
  * DOMDocument based implementation of a XML/RPC generator
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Generator
  */
 class DomDocument extends AbstractGenerator
 {

diff --git a/src/Generator/GeneratorInterface.php b/src/Generator/GeneratorInterface.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Generator;

diff --git a/src/Generator/XmlWriter.php b/src/Generator/XmlWriter.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace Zend\XmlRpc\Generator;
 
 /**
  * XML generator adapter based on XMLWriter
- *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage Generator
  */
 class XmlWriter extends AbstractGenerator
 {