- welcome 2014

[plcapi.git] / lib / xmlrpc_wrappers.inc

diff --git a/lib/xmlrpc_wrappers.inc b/lib/xmlrpc_wrappers.inc
index 8b5bac9..4a92348 100644 (file)
--- a/lib/xmlrpc_wrappers.inc
+++ b/lib/xmlrpc_wrappers.inc
@@ -3,9 +3,8 @@
  * PHP-XMLRPC "wrapper" functions\r
  * Generate stubs to transparently access xmlrpc methods as php functions and viceversa\r
  *\r
- * @version $Id: xmlrpc_wrappers.inc,v 1.13 2008/09/20 01:23:47 ggiunta Exp $\r
  * @author Gaetano Giunta\r
- * @copyright (C) 2006-2009 G. Giunta\r
+ * @copyright (C) 2006-2014 G. Giunta\r
  * @license code licensed under the BSD License: http://phpxmlrpc.sourceforge.net/license.txt\r
  *\r
  * @todo separate introspection from code generation for func-2-method wrapping\r
@@ -22,6 +21,7 @@
        * accepted come from javadoc blocks), return corresponding phpxmlrpc type.\r
        * NB: for php 'resource' types returns empty string, since resources cannot be serialized;\r
        * for php class names returns 'struct', since php objects can be serialized as xmlrpc structs\r
+       * for php arrays always return array, even though arrays sometiles serialize as json structs\r
        * @param string $phptype\r
        * @return string\r
        */\r
@@ -157,6 +157,10 @@
                }\r
 \r
         $exists = false;\r
+           if (is_string($funcname) && strpos($funcname, '::') !== false)\r
+           {\r
+               $funcname = explode('::', $funcname);\r
+           }\r
         if(is_array($funcname))\r
         {\r
             if(count($funcname) < 2 || (!is_string($funcname[0]) && !is_object($funcname[0])))\r
@@ -173,6 +177,11 @@
                 $plainfuncname = get_class($funcname[0]) . '->' . $funcname[1];\r
             }\r
             $exists = method_exists($funcname[0], $funcname[1]);\r
+            if (!$exists && version_compare(phpversion(), '5.1') < 0)\r
+            {\r
+               // workaround for php 5.0: static class methods are not seen by method_exists\r
+               $exists = is_callable( $funcname );\r
+            }\r
         }\r
         else\r
         {\r
@@ -214,7 +223,7 @@
                        // start to introspect PHP code\r
                        if(is_array($funcname))\r
                        {\r
-                       $func =& new ReflectionMethod($funcname[0], $funcname[1]);\r
+                       $func = new ReflectionMethod($funcname[0], $funcname[1]);\r
                        if($func->isPrivate())\r
                        {\r
                                error_log('XML-RPC: method to be wrapped is private: '.$plainfuncname);\r
@@ -230,7 +239,8 @@
                                error_log('XML-RPC: method to be wrapped is the constructor: '.$plainfuncname);\r
                                return false;\r
                        }\r
-                       if($func->isDestructor())\r
+                           // php 503 always says isdestructor = true...\r
+                if( version_compare(phpversion(), '5.0.3') != 0 && $func->isDestructor())\r
                        {\r
                                error_log('XML-RPC: method to be wrapped is the destructor: '.$plainfuncname);\r
                                return false;\r
@@ -244,7 +254,7 @@
             }\r
                        else\r
                        {\r
-                       $func =& new ReflectionFunction($funcname);\r
+                       $func = new ReflectionFunction($funcname);\r
             }\r
                        if($func->isInternal())\r
                        {\r
@@ -504,7 +514,7 @@
                if ($methodfilter == '' || preg_match($methodfilter, $mname))\r
                        {\r
                        // echo $mlist."\n";\r
-                       $func =& new ReflectionMethod($classname, $mname);\r
+                       $func = new ReflectionMethod($classname, $mname);\r
                        if(!$func->isPrivate() && !$func->isProtected() && !$func->isConstructor() && !$func->isDestructor() && !$func->isAbstract())\r
                        {\r
                                if(($func->isStatic && ($methodtype == 'all' || $methodtype == 'static' || ($methodtype == 'auto' && is_string($classname)))) ||\r
@@ -600,7 +610,7 @@
                $valclass = $prefix.'val';\r
                $decodefunc = 'php_'.$prefix.'_decode';\r
 \r
-               $msg =& new $msgclass('system.methodSignature');\r
+               $msg = new $msgclass('system.methodSignature');\r
                $msg->addparam(new $valclass($methodname));\r
                $client->setDebug($debug);\r
                $response =& $client->send($msg, $timeout, $protocol);\r
@@ -646,7 +656,7 @@
                                // in online mode, favour speed of operation\r
                                if(!$buildit)\r
                                {\r
-                                       $msg =& new $msgclass('system.methodHelp');\r
+                                       $msg = new $msgclass('system.methodHelp');\r
                                        $msg->addparam(new $valclass($methodname));\r
                                        $response =& $client->send($msg, $timeout, $protocol);\r
                                        if (!$response->faultCode())\r
@@ -715,7 +725,7 @@
                //$valclass = $prefix.'val';\r
                $decodefunc = 'php_'.$prefix.'_decode';\r
 \r
-               $msg =& new $msgclass('system.listMethods');\r
+               $msg = new $msgclass('system.listMethods');\r
                $response =& $client->send($msg, $timeout, $protocol);\r
                if($response->faultCode())\r
                {\r
@@ -835,7 +845,7 @@
                        $innercode = '';\r
                        $this_ = 'this->';\r
                }\r
-               $innercode .= "\$msg =& new {$prefix}msg('$methodname');\n";\r
+               $innercode .= "\$msg = new {$prefix}msg('$methodname');\n";\r
 \r
                if ($mdesc != '')\r
                {\r
@@ -858,7 +868,7 @@
                                $ptype == 'string' || $ptype == 'dateTime.iso8601' || $ptype == 'base64' || $ptype == 'null')\r
                        {\r
                                // only build directly xmlrpcvals when type is known and scalar\r
-                               $innercode .= "\$p$i =& new {$prefix}val(\$p$i, '$ptype');\n";\r
+                               $innercode .= "\$p$i = new {$prefix}val(\$p$i, '$ptype');\n";\r
                        }\r
                        else\r
                        {\r
@@ -920,7 +930,7 @@
        */\r
        function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc')\r
        {\r
-               $code = "\$client =& new {$prefix}_client('".str_replace("'", "\'", $client->path).\r
+               $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path).\r
                        "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n";\r
 \r
                // copy all client fields to the client that will be generated runtime\r