merge upstream phpxmlrpc

using command:
git subtree pull --prefix php/phpxmlrpc phpxmlrpc master

diff --cc php/phpxmlrpc/.editorconfig
index 0000000,677e36e..677e36e
mode 000000,100644..100644
--- /dev/null
--- 2/.editorconfig
+++ b/php/phpxmlrpc/.editorconfig

diff --cc php/phpxmlrpc/.gitattributes
index 0000000,5b0bb2d..5b0bb2d
mode 000000,100644..100644
--- /dev/null
--- 2/.gitattributes
+++ b/php/phpxmlrpc/.gitattributes

diff --cc php/phpxmlrpc/.github/workflows/ci.yml
index 0000000,5d1f245..5d1f245
mode 000000,100644..100644
--- /dev/null
--- 2/.github/workflows/ci.yml
+++ b/php/phpxmlrpc/.github/workflows/ci.yml

diff --cc php/phpxmlrpc/.gitignore
index 1305331,0000000..f589b5d
mode 100644,000000..100644
--- 1/php/phpxmlrpc/.gitignore
--- /dev/null
+++ b/php/phpxmlrpc/.gitignore
@@@ -1,6 -1,0 +1,5 @@@
- composer.phar
- composer.lock
- /vendor/*
- /tests/coverage/*
 +/.idea
 +/build/*
++/vendor/*
++/.phpunit.result.cache
++/composer.lock

diff --cc php/phpxmlrpc/INSTALL.md
Simple merge

diff --cc php/phpxmlrpc/NEWS
Simple merge

diff --cc php/phpxmlrpc/README.md
Simple merge

diff --cc php/phpxmlrpc/composer.json
Simple merge

diff --cc php/phpxmlrpc/debugger/action.php
Simple merge

diff --cc php/phpxmlrpc/debugger/common.php
Simple merge

diff --cc php/phpxmlrpc/debugger/controller.php
Simple merge

diff --cc php/phpxmlrpc/debugger/favicon.ico
index 0000000,0106e8d..0106e8d
mode 000000,100644..100644
Binary files differ

diff --cc php/phpxmlrpc/debugger/index.php
Simple merge

diff --cc php/phpxmlrpc/demo/client/_append.php
index 0000000,da249b3..da249b3
mode 000000,100644..100644
--- /dev/null
--- 2/demo/client/_append.php
+++ b/php/phpxmlrpc/demo/client/_append.php

diff --cc php/phpxmlrpc/demo/client/_prepend.php
index 0000000,710c477..710c477
mode 000000,100644..100644
--- /dev/null
--- 2/demo/client/_prepend.php
+++ b/php/phpxmlrpc/demo/client/_prepend.php

diff --cc php/phpxmlrpc/demo/client/agesort.php
Simple merge

diff --cc php/phpxmlrpc/demo/client/getstatename.php
Simple merge

diff --cc php/phpxmlrpc/demo/client/introspect.php
Simple merge

diff --cc php/phpxmlrpc/demo/client/mail.php
Simple merge

diff --cc php/phpxmlrpc/demo/client/perl/test.pl
index 0000000,8eee374..8eee374
mode 000000,100644..100644
--- /dev/null
--- 2/demo/client/perl/test.pl
+++ b/php/phpxmlrpc/demo/client/perl/test.pl

diff --cc php/phpxmlrpc/demo/client/proxy.php
Simple merge

diff --cc php/phpxmlrpc/demo/client/python/test.py
index 0000000,4b599e6..4b599e6
mode 000000,100644..100644
--- /dev/null
--- 2/demo/client/python/test.py
+++ b/php/phpxmlrpc/demo/client/python/test.py

diff --cc php/phpxmlrpc/demo/client/which.php
Simple merge

diff --cc php/phpxmlrpc/demo/client/wrap.php
Simple merge

diff --cc php/phpxmlrpc/demo/server/_append.php
index 0000000,da249b3..da249b3
mode 000000,100644..100644
--- /dev/null
--- 2/demo/client/_append.php
+++ b/php/phpxmlrpc/demo/server/_append.php

diff --cc php/phpxmlrpc/demo/server/_prepend.php
index 0000000,8dbf6cf..8dbf6cf
mode 000000,100644..100644
--- /dev/null
--- 2/demo/server/_prepend.php
+++ b/php/phpxmlrpc/demo/server/_prepend.php

diff --cc php/phpxmlrpc/demo/server/discuss.php
Simple merge

diff --cc php/phpxmlrpc/demo/server/methodProviders/functions.php
index 0000000,898965b..898965b
mode 000000,100644..100644
--- /dev/null
--- 2/demo/server/methodProviders/functions.php
+++ b/php/phpxmlrpc/demo/server/methodProviders/functions.php

diff --cc php/phpxmlrpc/demo/server/methodProviders/interop.php
index 0000000,691a7ec..691a7ec
mode 000000,100644..100644
--- /dev/null
--- 2/demo/server/methodProviders/interop.php
+++ b/php/phpxmlrpc/demo/server/methodProviders/interop.php

diff --cc php/phpxmlrpc/demo/server/methodProviders/validator1.php
index 0000000,f2f6601..f2f6601
mode 000000,100644..100644
--- /dev/null
--- 2/demo/server/methodProviders/validator1.php
+++ b/php/phpxmlrpc/demo/server/methodProviders/validator1.php

diff --cc php/phpxmlrpc/demo/server/methodProviders/wrapper.php
index 0000000,749670f..749670f
mode 000000,100644..100644
--- /dev/null
--- 2/demo/server/methodProviders/wrapper.php
+++ b/php/phpxmlrpc/demo/server/methodProviders/wrapper.php

diff --cc php/phpxmlrpc/demo/server/proxy.php
Simple merge

diff --cc php/phpxmlrpc/demo/server/server.php
Simple merge

diff --cc php/phpxmlrpc/demo/vardemo.php
Simple merge

diff --cc php/phpxmlrpc/doc/ChangeLog
Simple merge

diff --cc php/phpxmlrpc/doc/build/composer.json
index 0000000,f75f150..f75f150
mode 000000,100644..100644
--- /dev/null
--- 2/doc/build/composer.json
+++ b/php/phpxmlrpc/doc/build/composer.json

diff --cc php/phpxmlrpc/doc/build/setup_tools.sh
index 0000000,6a6bb4a..6a6bb4a
mode 000000,100644..100644
--- /dev/null
--- 2/doc/build/setup_tools.sh
+++ b/php/phpxmlrpc/doc/build/setup_tools.sh

diff --cc php/phpxmlrpc/doc/manual/phpxmlrpc_manual.adoc
Simple merge

diff --cc php/phpxmlrpc/extras/benchmark.php
Simple merge

diff --cc php/phpxmlrpc/extras/verify_compat.php
Simple merge

diff --cc php/phpxmlrpc/lib/xmlrpc.inc
Simple merge

diff --cc php/phpxmlrpc/lib/xmlrpc_wrappers.inc
Simple merge

diff --cc php/phpxmlrpc/lib/xmlrpcs.inc
Simple merge

diff --cc php/phpxmlrpc/pakefile.php
Simple merge

diff --cc php/phpxmlrpc/phpunit.xml.dist
index 0000000,a4e4a19..a4e4a19
mode 000000,100644..100644
--- /dev/null
--- 2/phpunit.xml.dist
+++ b/php/phpxmlrpc/phpunit.xml.dist

diff --cc php/phpxmlrpc/src/Client.php
Simple merge

diff --cc php/phpxmlrpc/src/Encoder.php
Simple merge

diff --cc php/phpxmlrpc/src/Exception/HttpException.php
index 0000000,5b9322e..5b9322e
mode 000000,100644..100644
--- /dev/null
--- 2/src/Exception/HttpException.php
+++ b/php/phpxmlrpc/src/Exception/HttpException.php

diff --cc php/phpxmlrpc/src/Exception/PhpXmlrpcException.php
index 0000000,e143f4e..e143f4e
mode 000000,100644..100644
--- /dev/null
--- 2/src/Exception/PhpXmlrpcException.php
+++ b/php/phpxmlrpc/src/Exception/PhpXmlrpcException.php

diff --cc php/phpxmlrpc/src/Helper/Charset.php
Simple merge

diff --cc php/phpxmlrpc/src/Helper/Date.php
Simple merge

diff --cc php/phpxmlrpc/src/Helper/Http.php
Simple merge

diff --cc php/phpxmlrpc/src/Helper/Logger.php
Simple merge

diff --cc php/phpxmlrpc/src/Helper/XMLParser.php
Simple merge

diff --cc php/phpxmlrpc/src/PhpXmlRpc.php
Simple merge

diff --cc php/phpxmlrpc/src/Request.php
Simple merge

diff --cc php/phpxmlrpc/src/Response.php
Simple merge

diff --cc php/phpxmlrpc/src/Server.php
Simple merge

diff --cc php/phpxmlrpc/src/Value.php
Simple merge

diff --cc php/phpxmlrpc/src/Wrapper.php
Simple merge

diff --cc php/phpxmlrpc/tests/0CharsetTest.php
Simple merge

diff --cc php/phpxmlrpc/tests/1ValueTest.php
index 0000000,c77432e..c77432e
mode 000000,100644..100644
--- /dev/null
--- 2/tests/1ValueTest.php
+++ b/php/phpxmlrpc/tests/1ValueTest.php

diff --cc php/phpxmlrpc/tests/2MessageTest.php
Simple merge

diff --cc php/phpxmlrpc/tests/3EncoderTest.php
index 0000000,2c41d75..2c41d75
mode 000000,100644..100644
--- /dev/null
--- 2/tests/3EncoderTest.php
+++ b/php/phpxmlrpc/tests/3EncoderTest.php

diff --cc php/phpxmlrpc/tests/4ClientTest.php
Simple merge

diff --cc php/phpxmlrpc/tests/5ServerTest.php
Simple merge

diff --cc php/phpxmlrpc/tests/6HTTPTest.php
index 0000000,3a14809..3a14809
mode 000000,100644..100644
--- /dev/null
--- 2/tests/6HTTPTest.php
+++ b/php/phpxmlrpc/tests/6HTTPTest.php

diff --cc php/phpxmlrpc/tests/7DemofilesTest.php
Simple merge

diff --cc php/phpxmlrpc/tests/8DebuggerTest.php
Simple merge

diff --cc php/phpxmlrpc/tests/9ExtraFilesTest.php
index 0000000,a88bace..a88bace
mode 000000,100644..100644
--- /dev/null
--- 2/tests/9ExtraFilesTest.php
+++ b/php/phpxmlrpc/tests/9ExtraFilesTest.php

diff --cc php/phpxmlrpc/tests/PolyfillTestCase.php
index 0000000,24957fa..24957fa
mode 000000,100644..100644
--- /dev/null
--- 2/tests/PolyfillTestCase.php
+++ b/php/phpxmlrpc/tests/PolyfillTestCase.php

diff --cc php/phpxmlrpc/tests/PolyfillTestCase7.php
index 0000000,d54d6b2..d54d6b2
mode 000000,100644..100644
--- /dev/null
--- 2/tests/PolyfillTestCase7.php
+++ b/php/phpxmlrpc/tests/PolyfillTestCase7.php

diff --cc php/phpxmlrpc/tests/PolyfillTestCase8.php
index 0000000,5c8711a..5c8711a
mode 000000,100644..100644
--- /dev/null
--- 2/tests/PolyfillTestCase8.php
+++ b/php/phpxmlrpc/tests/PolyfillTestCase8.php

diff --cc php/phpxmlrpc/tests/WebTestCase.php
Simple merge

diff --cc php/phpxmlrpc/tests/ci/Dockerfile
index 0000000,d8c4443..d8c4443
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ci/Dockerfile
+++ b/php/phpxmlrpc/tests/ci/Dockerfile

diff --cc php/phpxmlrpc/tests/ci/config/apache_phpfpm_proxyfcgi
index 0000000,8bed636..8bed636
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ci/config/apache_phpfpm_proxyfcgi
+++ b/php/phpxmlrpc/tests/ci/config/apache_phpfpm_proxyfcgi

diff --cc php/phpxmlrpc/tests/ci/config/apache_vhost
index 0000000,88307bf..88307bf
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ci/config/apache_vhost
+++ b/php/phpxmlrpc/tests/ci/config/apache_vhost

diff --cc php/phpxmlrpc/tests/ci/config/codecoverage_xdebug.ini
index 0000000,7891eb0..7891eb0
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ci/config/codecoverage_xdebug.ini
+++ b/php/phpxmlrpc/tests/ci/config/codecoverage_xdebug.ini

diff --cc php/phpxmlrpc/tests/ci/config/privoxy
Simple merge

diff --cc php/phpxmlrpc/tests/ci/docker/entrypoint.sh
index 0000000,e3565ab..e3565ab
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ci/docker/entrypoint.sh
+++ b/php/phpxmlrpc/tests/ci/docker/entrypoint.sh

diff --cc php/phpxmlrpc/tests/ci/setup/create_user.sh
index 0000000,33553d2..33553d2
mode 000000,100755..100755
--- /dev/null
--- 2/tests/ci/setup/create_user.sh
+++ b/php/phpxmlrpc/tests/ci/setup/create_user.sh

diff --cc php/phpxmlrpc/tests/ci/setup/install_packages.sh
index 0000000,b22f398..b22f398
mode 000000,100755..100755
--- /dev/null
--- 2/tests/ci/setup/install_packages.sh
+++ b/php/phpxmlrpc/tests/ci/setup/install_packages.sh

diff --cc php/phpxmlrpc/tests/ci/setup/setup_apache.sh
index 0000000,b29cde2..b29cde2
mode 000000,100755..100755
--- /dev/null
--- 2/tests/ci/setup/setup_apache.sh
+++ b/php/phpxmlrpc/tests/ci/setup/setup_apache.sh

diff --cc php/phpxmlrpc/tests/ci/setup/setup_code_coverage.sh
index 0000000,49e7af8..49e7af8
mode 000000,100755..100755
--- /dev/null
--- 2/tests/ci/setup/setup_code_coverage.sh
+++ b/php/phpxmlrpc/tests/ci/setup/setup_code_coverage.sh

diff --cc php/phpxmlrpc/tests/ci/setup/setup_composer.sh
index 0000000,cd2f81c..cd2f81c
mode 000000,100755..100755
--- /dev/null
--- 2/tests/ci/setup/setup_composer.sh
+++ b/php/phpxmlrpc/tests/ci/setup/setup_composer.sh

diff --cc php/phpxmlrpc/tests/ci/setup/setup_perl.sh
index 0000000,102f677..102f677
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ci/setup/setup_perl.sh
+++ b/php/phpxmlrpc/tests/ci/setup/setup_perl.sh

diff --cc php/phpxmlrpc/tests/ci/setup/setup_php.sh
index 0000000,038de3d..038de3d
mode 000000,100755..100755
--- /dev/null
--- 2/tests/ci/setup/setup_php.sh
+++ b/php/phpxmlrpc/tests/ci/setup/setup_php.sh

diff --cc php/phpxmlrpc/tests/ci/setup/setup_privoxy.sh
index 0000000,c39e62f..c39e62f
mode 000000,100755..100755
--- /dev/null
--- 2/tests/ci/setup/setup_privoxy.sh
+++ b/php/phpxmlrpc/tests/ci/setup/setup_privoxy.sh

diff --cc php/phpxmlrpc/tests/ci/vm.sh
index 0000000,1cef916..1cef916
mode 000000,100755..100755
--- /dev/null
--- 2/tests/ci/vm.sh
+++ b/php/phpxmlrpc/tests/ci/vm.sh

diff --cc php/phpxmlrpc/tests/parse_args.php
Simple merge

diff --cc php/phpxmlrpc/tests/phpunit_coverage.php
Simple merge