more namespace use

diff --git a/lib/xmlrpc.inc b/lib/xmlrpc.inc
index 0af43b5..77385af 100644 (file)
--- a/lib/xmlrpc.inc
+++ b/lib/xmlrpc.inc
@@ -44,23 +44,27 @@
  * If it is included, the library will work without any further autoloading
  *****************************************************************************/
 
+include_once(__DIR__.'/../src/Client.php');
+include_once(__DIR__.'/../src/Encoder.php');
 include_once(__DIR__.'/../src/PhpXmlRpc.php');
-include_once(__DIR__.'/../src/Value.php');
 include_once(__DIR__.'/../src/Request.php');
 include_once(__DIR__.'/../src/Response.php');
-include_once(__DIR__.'/../src/Client.php');
-include_once(__DIR__.'/../src/Encoder.php');
+include_once(__DIR__.'/../src/Value.php');
 include_once(__DIR__.'/../src/Helper/Charset.php');
 include_once(__DIR__.'/../src/Helper/Date.php');
 include_once(__DIR__.'/../src/Helper/Http.php');
 include_once(__DIR__.'/../src/Helper/Logger.php');
 include_once(__DIR__.'/../src/Helper/XMLParser.php');
 
+use PhpXmlRpc\Client;
+use PhpXmlRpc\Encoder;
+use PhpXmlRpc\Request;
+use PhpXmlRpc\Response;
+use PhpXmlRpc\Value;
 use PhpXmlRpc\Helper\Charset;
 use PhpXmlRpc\Helper\Date;
 use PhpXmlRpc\Helper\Http;
 use PhpXmlRpc\Helper\XMLParser;
-use PhpXmlRpc\Encoder;
 
 /* Expose the global variables which used to be defined */
 PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'ISO-8859-1'; // old default
@@ -84,7 +88,7 @@ $GLOBALS['xmlrpc_backslash'] = chr(92).chr(92);
 
 /* Expose with the old names the classes which have been namespaced */
 
-class xmlrpcval extends PhpXmlRpc\Value
+class xmlrpcval extends Value
 {
     /**
      * @deprecated
@@ -145,20 +149,21 @@ class xmlrpcval extends PhpXmlRpc\Value
     }
 
     /// reset functionality added by parent class: same as it would happen if no interface was declared
-    public function getIterator() {
+    public function getIterator()
+    {
         return new ArrayIterator($this);
     }
 }
 
-class xmlrpcmsg extends PhpXmlRpc\Request
+class xmlrpcmsg extends Request
 {
 }
 
-class xmlrpcresp extends PhpXmlRpc\Response
+class xmlrpcresp extends Response
 {
 }
 
-class xmlrpc_client extends PhpXmlRpc\Client
+class xmlrpc_client extends Client
 {
 }
 

diff --git a/lib/xmlrpcs.inc b/lib/xmlrpcs.inc
index 4cebd65..df6b047 100644 (file)
--- a/lib/xmlrpcs.inc
+++ b/lib/xmlrpcs.inc
@@ -44,7 +44,9 @@
 
 include_once(__DIR__.'/../src/Server.php');
 
-class xmlrpc_server extends PhpXmlRpc\Server
+use PhpXmlRpc\Server;
+
+class xmlrpc_server extends Server
 {
     /**
      * A debugging routine: just echoes back the input packet as a string value
@@ -60,17 +62,17 @@ class xmlrpc_server extends PhpXmlRpc\Server
 /* Expose as global functions the ones which are now class methods */
 
 /**
- * @see PhpXmlRpc\Server::xmlrpc_debugmsg
+ * @see Server::xmlrpc_debugmsg
  * @param string $m
  */
 function xmlrpc_debugmsg($m)
 {
-    PhpXmlRpc\Server::xmlrpc_debugmsg($m);
+    Server::xmlrpc_debugmsg($m);
 }
 
 function _xmlrpcs_getCapabilities($server, $m=null)
 {
-    return PhpXmlRpc\Server::_xmlrpcs_getCapabilities($server, $m);
+    return Server::_xmlrpcs_getCapabilities($server, $m);
 }
 
 $_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray));
@@ -78,7 +80,7 @@ $_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC se
 $_xmlrpcs_listMethods_sdoc=array(array('list of method names'));
 function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing
 {
-    return PhpXmlRpc\Server::_xmlrpcs_listMethods($server, $m);
+    return Server::_xmlrpcs_listMethods($server, $m);
 }
 
 $_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString']));
@@ -86,7 +88,7 @@ $_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of
 $_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
 function _xmlrpcs_methodSignature($server, $m)
 {
-    return PhpXmlRpc\Server::_xmlrpcs_methodSignature($server, $m);
+    return Server::_xmlrpcs_methodSignature($server, $m);
 }
 
 $_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
@@ -94,22 +96,22 @@ $_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, ot
 $_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described'));
 function _xmlrpcs_methodHelp($server, $m)
 {
-    return PhpXmlRpc\Server::_xmlrpcs_methodHelp($server, $m);
+    return Server::_xmlrpcs_methodHelp($server, $m);
 }
 
 function _xmlrpcs_multicall_error($err)
 {
-    return PhpXmlRpc\Server::_xmlrpcs_multicall_error($err);
+    return Server::_xmlrpcs_multicall_error($err);
 }
 
 function _xmlrpcs_multicall_do_call($server, $call)
 {
-    return PhpXmlRpc\Server::_xmlrpcs_multicall_do_call($server, $call);
+    return Server::_xmlrpcs_multicall_do_call($server, $call);
 }
 
 function _xmlrpcs_multicall_do_call_phpvals($server, $call)
 {
-    return PhpXmlRpc\Server::_xmlrpcs_multicall_do_call_phpvals($server, $call);
+    return Server::_xmlrpcs_multicall_do_call_phpvals($server, $call);
 }
 
 $_xmlrpcs_multicall_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, \PhpXmlRpc\Value::$xmlrpcArray));
@@ -117,5 +119,5 @@ $_xmlrpcs_multicall_doc = 'Boxcar multiple RPC calls in one request. See http://
 $_xmlrpcs_multicall_sdoc = array(array('list of response structs, where each struct has the usual members', 'list of calls, with each call being represented as a struct, with members "methodname" and "params"'));
 function _xmlrpcs_multicall($server, $m)
 {
-    return PhpXmlRpc\Server::_xmlrpcs_multicall($server, $m);
+    return Server::_xmlrpcs_multicall($server, $m);
 }