fix recent change improving checking for unexpected errors in the parser

diff --git a/src/Request.php b/src/Request.php
index 203113e..8da377b 100644 (file)
--- a/src/Request.php
+++ b/src/Request.php
@@ -356,8 +356,9 @@ class Request
             //}
         }
         // third error check: parsing of the response has somehow gone boink.
-        /// @todo shall we omit this check, since we trust the parsing code?
-        elseif ($_xh['isf'] > 3 || ($returnType == XMLParser::RETURN_XMLRPCVALS && !is_object($_xh['value']))) {
+        /// @todo shall we omit the 2nd part of this check, since we trust the parsing code?
+        ///       Either that, or check the fault results too...
+        elseif ($_xh['isf'] > 3 || ($returnType == XMLParser::RETURN_XMLRPCVALS && !$_xh['isf'] && !is_object($_xh['value']))) {
             // something odd has happened and it's time to generate a client side error indicating something odd went on
             $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'],
                 '', $httpResponse

diff --git a/tests/13LegacyAPITest.php b/tests/13LegacyAPITest.php
index 4c5c636..a2991a7 100644 (file)
--- a/tests/13LegacyAPITest.php
+++ b/tests/13LegacyAPITest.php
@@ -9,7 +9,7 @@ class LegacyAPITest extends PhpXmlRpc_ServerAwareTestCase
 {
     public function testLegacyLoader()
     {
-        /// @todo pass on as cli args for the executed script all the args that are already parsed by now
+        /// @todo pass on as cli args for the executed script all the args that are already parsed by now, plus $this->testId
 
         exec('php ' . __DIR__ . '/legacy_loader_test.php', $out, $result);