add a Wrapper method to help the json-rpc debugger to generate 1.0/2.0 code

Author: gggeek

NEWS.md

@@ -3,8 +3,8 @@
 * improved: allow to force usage of HTTP 1.1. when using curl for calls, via usage of 'http11_only'
 
 * improved: added new methods: `Server::generatePayload($resp, $respCharset)`,
-  `Server::printPayload($payload, $resp->getContentType(), $respEncoding)` and `HTTP::setAcceptedStatusCodes($statusCodes)`
-  to help subclasses such as the Json-Rpc server and request
+  `Server::printPayload($payload, $resp->getContentType(), $respEncoding)` , `HTTP::setAcceptedStatusCodes($statusCodes)`
+  and `Wrapper::cloneClientForClosure($client)` to help subclasses such as the Json-Rpc server and request
 
 * improved: prepare the debugger for json-rpc 2.0 support, which will be in a pending release of the PhpJsonRpc library
 

debugger/action.php

@@ -585,6 +585,9 @@
                         }
                         if ($wstype == 1 || $wstype == 2) {
                             $wrapper = new PhpXmlRpc\JsonRpc\Wrapper();
+                            if ($hasjsonrpc2) {
+                                $wrapper->setJsonRpcVersion($wstype == 1 ? \PhpXmlRpc\JsonRpc\PhpJsonRpc::VERSION_1_0 : \PhpXmlRpc\JsonRpc\PhpJsonRpc::VERSION_2_0);
+                            }
                         } else {
                             $wrapper = new PhpXmlRpc\Wrapper();
                         }

src/Wrapper.php

@@ -740,7 +740,7 @@ protected function generateMethodNameForClassMethod($className, $classMethod, $e
      *                                                          trusted servers ---
      *                            - mixed   return_on_fault     a php value to be returned when the xml-rpc call fails/returns
      *                                                          a fault response (by default the Response object is returned
-     *                                                          in this case).  If a string is used, '%faultCode%' and
+     *                                                          in this case). If a string is used, '%faultCode%' and
      *                                                          '%faultString%' tokens  will be substituted with actual error values
      *                            - bool    throw_on_fault      if true, throw an exception instead of returning a Response
      *                                                          in case of errors/faults;
@@ -877,7 +877,7 @@ protected function retrieveMethodHelp($client, $methodName, array $extraOptions
     protected function buildWrapMethodClosure($client, $methodName, array $extraOptions, $mSig)
     {
         // we clone the client, so that we can modify it a bit independently of the original
-        $clientClone = clone $client;
+        $clientClone = $this->cloneClientForClosure($client);
         $function = function() use($clientClone, $methodName, $extraOptions, $mSig)
         {
             $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
@@ -1270,4 +1270,13 @@ public static function getHeldObject($index)
 
         throw new ValueErrorException("No object held for index '$index'");
     }
+
+    /**
+     * @param Client $client
+     * @return Client
+     */
+    protected function cloneClientForClosure($client)
+    {
+        return clone $client;
+    }
 }