X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2FServer.php;h=ab171685927b6e9171076d9d6ee35eed58ced37c;hb=238968291ce5627e94dbc3928d377d09f6e9eeda;hp=a0e0cb157b9871e8b1f708c952d3fdeb29f87b71;hpb=b0a92b19241515e3484421bfc08ec13a54a2eb1c;p=plcapi.git

diff --git a/src/Server.php b/src/Server.php
index a0e0cb1..ab17168 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -335,7 +335,7 @@ class Server
                             $pt = $p->kindOf();
                         }
                     } else {
-                        $pt = ($in[$n] == 'i4' || $in[$n] == 'i8') ? 'int' : strtolower($in[$n]); // dispatch maps never use i4...
+                        $pt = ($in[$n] == 'i4') ? 'int' : strtolower($in[$n]); // dispatch maps never use i4...
                     }
 
                     // param index is $n+1, as first member of sig is return type
@@ -675,7 +675,8 @@ class Server
                         } else {
                             // functions using EPI api should NOT return resp objects,
                             // so make sure we encode the return type correctly
-                            $r = new Response(php_xmlrpc_encode($r, array('extension_api')));
+                            $encoder = new Encoder();
+                            $r = new Response($encoder->encode($r, array('extension_api')));
                         }
                     } else {
                         $r = call_user_func_array($func, $params);
@@ -685,7 +686,8 @@ class Server
                 if (!is_a($r, '\PhpXmlRpc\Response')) {
                     // what should we assume here about automatic encoding of datetimes
                     // and php classes instances???
-                    $r = new Response(php_xmlrpc_encode($r, $this->phpvals_encoding_options));
+                    $encoder = new Encoder();
+                    $r = new Response($encoder->encode($r, $this->phpvals_encoding_options));
                 }
             }
         } catch (\Exception $e) {