From 6ea5909e5a078a496e6b43b525cac999ced0d2b1 Mon Sep 17 00:00:00 2001
From: gggeek <giunta.gaetano@gmail.com>
Date: Sat, 2 Jan 2021 14:22:00 +0000
Subject: [PATCH] welcome 2021

---
 debugger/action.php      |  2 +-
 debugger/common.php      |  2 +-
 debugger/controller.php  |  2 +-
 demo/server/proxy.php    |  2 +-
 extras/benchmark.php     |  2 +-
 extras/verify_compat.php |  2 +-
 lib/xmlrpc.inc           | 25 +++++++++++++++----------
 src/Wrapper.php          |  2 +-
 8 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/debugger/action.php b/debugger/action.php
index 7a2b61dc..c7f88dec 100644
--- a/debugger/action.php
+++ b/debugger/action.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Gaetano Giunta
- * @copyright (C) 2005-2020 G. Giunta
+ * @copyright (C) 2005-2021 G. Giunta
  * @license code licensed under the BSD License: see file license.txt
  *
  * @todo switch params for http compression from 0,1,2 to values to be used directly
diff --git a/debugger/common.php b/debugger/common.php
index 5097a395..d6e43fe0 100644
--- a/debugger/common.php
+++ b/debugger/common.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Gaetano Giunta
- * @copyright (C) 2005-2020 G. Giunta
+ * @copyright (C) 2005-2021 G. Giunta
  * @license code licensed under the BSD License: see file license.txt
  *
  * Parses GET/POST variables
diff --git a/debugger/controller.php b/debugger/controller.php
index 8656526c..8abde78a 100644
--- a/debugger/controller.php
+++ b/debugger/controller.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Gaetano Giunta
- * @copyright (C) 2005-2020 G. Giunta
+ * @copyright (C) 2005-2021 G. Giunta
  * @license code licensed under the BSD License: see file license.txt
  *
  * @todo add links to documentation from every option caption
diff --git a/demo/server/proxy.php b/demo/server/proxy.php
index c501d608..7f7b7abc 100644
--- a/demo/server/proxy.php
+++ b/demo/server/proxy.php
@@ -5,7 +5,7 @@
  * the originating server).
  *
  * @author Gaetano Giunta
- * @copyright (C) 2006-2020 G. Giunta
+ * @copyright (C) 2006-2021 G. Giunta
  * @license code licensed under the BSD License: see file license.txt
  */
 
diff --git a/extras/benchmark.php b/extras/benchmark.php
index 623d6147..2f0f55a2 100644
--- a/extras/benchmark.php
+++ b/extras/benchmark.php
@@ -3,7 +3,7 @@
  * Benchmarking suite for the PHP-XMLRPC lib.
  *
  * @author Gaetano Giunta
- * @copyright (c) 2005-2020 G. Giunta
+ * @copyright (c) 2005-2021 G. Giunta
  * @license code licensed under the BSD License: see file license.txt
  *
  * @todo add a check for response ok in call testing
diff --git a/extras/verify_compat.php b/extras/verify_compat.php
index b1d696c8..98edae9a 100644
--- a/extras/verify_compat.php
+++ b/extras/verify_compat.php
@@ -3,7 +3,7 @@
  * Verify compatibility level of current php install with php-xmlrpc lib.
  *
  * @author Gaetano Giunta
- * @copyright (C) 2006-2020 G. Giunta
+ * @copyright (C) 2006-2021 G. Giunta
  * @license code licensed under the BSD License: see file license.txt
  *
  * @todo add a test for php output buffering?
diff --git a/lib/xmlrpc.inc b/lib/xmlrpc.inc
index 335cedfd..0af43b55 100644
--- a/lib/xmlrpc.inc
+++ b/lib/xmlrpc.inc
@@ -56,6 +56,11 @@ include_once(__DIR__.'/../src/Helper/Http.php');
 include_once(__DIR__.'/../src/Helper/Logger.php');
 include_once(__DIR__.'/../src/Helper/XMLParser.php');
 
+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
@@ -162,53 +167,53 @@ class xmlrpc_client extends PhpXmlRpc\Client
 /// Wrong speling, but we are adamant on backwards compatibility!
 function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='')
 {
-    return PhpXmlRpc\Helper\Charset::instance()->encodeEntitites($data, $srcEncoding, $destEncoding);
+    return Charset::instance()->encodeEntities($data, $srcEncoding, $destEncoding);
 }
 
 function iso8601_encode($timeT, $utc=0)
 {
-    return PhpXmlRpc\Helper\Date::iso8601Encode($timeT, $utc);
+    return Date::iso8601Encode($timeT, $utc);
 }
 
 function iso8601_decode($iDate, $utc=0)
 {
-    return PhpXmlRpc\Helper\Date::iso8601Decode($iDate, $utc);
+    return Date::iso8601Decode($iDate, $utc);
 }
 
 function decode_chunked($buffer)
 {
-    return PhpXmlRpc\Helper\Http::decodeChunked($buffer);
+    return Http::decodeChunked($buffer);
 }
 
 function php_xmlrpc_decode($xmlrpcVal, $options=array())
 {
-    $encoder = new PhpXmlRpc\Encoder();
+    $encoder = new Encoder();
     return $encoder->decode($xmlrpcVal, $options);
 }
 
 function php_xmlrpc_encode($phpVal, $options=array())
 {
-    $encoder = new PhpXmlRpc\Encoder();
+    $encoder = new Encoder();
     return $encoder->encode($phpVal, $options);
 }
 
 function php_xmlrpc_decode_xml($xmlVal, $options=array())
 {
-    $encoder = new PhpXmlRpc\Encoder();
+    $encoder = new Encoder();
     return $encoder->decodeXml($xmlVal, $options);
 }
 
 function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null)
 {
-    return PhpXmlRpc\Helper\XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs);
+    return XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs);
 }
 
 function has_encoding($xmlChunk)
 {
-    return PhpXmlRpc\Helper\XMLParser::hasEncoding($xmlChunk);
+    return XMLParser::hasEncoding($xmlChunk);
 }
 
 function is_valid_charset($encoding, $validList)
 {
-    return PhpXmlRpc\Helper\Charset::instance()->isValidCharset($encoding, $validList);
+    return Charset::instance()->isValidCharset($encoding, $validList);
 }
diff --git a/src/Wrapper.php b/src/Wrapper.php
index bf624e46..c8540231 100644
--- a/src/Wrapper.php
+++ b/src/Wrapper.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Gaetano Giunta
- * @copyright (C) 2006-2020 G. Giunta
+ * @copyright (C) 2006-2021 G. Giunta
  * @license code licensed under the BSD License: see file license.txt
  */
 
-- 
2.47.0