From 29fddbc6b33b742c79fc142c4743c00d15ec9465 Mon Sep 17 00:00:00 2001 From: gggeek Date: Mon, 27 May 2019 07:42:53 +0000 Subject: [PATCH] remove one more warning with php 7.2 --- .travis.yml | 14 ++++---------- NEWS | 14 ++++++++++---- lib/xmlrpc.inc | 15 ++++++++------- lib/xmlrpcs.inc | 2 +- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index c35c7c8..01f7d05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,6 @@ language: php # the current Travis VMs are based on Ubuntu Trusty. Alas, those do not have php 5.3 available. So we keep using Precise... dist: precise -# NB: we need to use the Trusty images if we want to test on hhvm -#dist: trusty - php: - 5.3 - 5.4 @@ -14,8 +11,7 @@ php: - 7.0 - 7.1 - 7.2 - # hhvm is not available any more on Precise images - #- hhvm + - 7.3 before_install: # This is mandatory or the 'apt-get install' calls following will fail @@ -28,13 +24,11 @@ install: - composer self-update && composer install before_script: - # Disable xdebug. NB: this should NOT be done for hhvm... - - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-rm xdebug.ini; fi - + # Disable xdebug + - phpenv config-rm xdebug.ini # Set up Apache and Privoxy instances inside the Travis VM and use them for testing against - - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./test/ci/travis/setup_php_fpm.sh; ./test/ci/travis/setup_apache.sh; fi - - if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then ./test/ci/travis/setup_hhvm.sh; ./test/ci/travis/setup_apache_hhvm.sh; fi + - ./test/ci/travis/setup_php_fpm.sh; ./test/ci/travis/setup_apache.sh - ./test/ci/travis/setup_privoxy.sh script: diff --git a/NEWS b/NEWS index 5716d29..e64c020 100644 --- a/NEWS +++ b/NEWS @@ -1,15 +1,22 @@ +XML-RPC for PHP version 3.1.2 - 2019/5/27 + +This release makes the library compatible with php 7.2 by removing one more deprecation warning. +*NB* moving to version 4 of the library is the recommended option unless you absolutely can not upgrade, as it comes +with many improvements and is fully API compatible with version 3. + + XML-RPC for PHP version 3.1.1 - 2018/4/7 -This release makes the library compatible with php 7.2 by removing the deprecation warnings. +This release makes the library compatible with php 7.2 by removing some deprecation warnings. *NB* moving to version 4 of the library is the recommended option unless you absolutely can not upgrade, as it comes -with many improvements. +with many improvements and is fully API compatible with version 3. XML-RPC for PHP version 3.1.0 - 2017/7/1 This release makes the library compatible with php 7 by removing the deprecation warnings. *NB* moving to version 4 of the library is the recommended option unless you absolutely can not upgrade, as it comes -with many improvements. +with many improvements and is fully API compatible with version 3. The only other changes are: @@ -18,7 +25,6 @@ The only other changes are: XML-RPC for PHP version 3.0.1 - 2015/4/18 -3 This release corrects all bugs that have been reported and successfully reproduced since version 3.0.0: diff --git a/lib/xmlrpc.inc b/lib/xmlrpc.inc index 829a92d..13bcdfc 100644 --- a/lib/xmlrpc.inc +++ b/lib/xmlrpc.inc @@ -208,7 +208,7 @@ $GLOBALS['xmlrpc_internalencoding']='ISO-8859-1'; $GLOBALS['xmlrpcName']='XML-RPC for PHP'; - $GLOBALS['xmlrpcVersion']='3.1.1'; + $GLOBALS['xmlrpcVersion']='3.1.2'; // let user errors start at 800 $GLOBALS['xmlrpcerruser']=800; @@ -2165,7 +2165,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha } } - /** + /** * @deprecated */ function xmlrpcmsg($meth, $pars=0) @@ -2968,7 +2968,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha } // poor man's version of print_r ??? - // DEPRECATED! + /// @deprecated function dump($ar) { foreach($ar as $key => $val) @@ -3128,7 +3128,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha //} } - // DEPRECATED + /// @deprecated function serializeval($o) { // add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals... @@ -3177,19 +3177,20 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha * Return next member element for xmlrpcvals of type struct. * @return xmlrpcval * @access public + * @deprecated this will be removed in future versions */ function structeach() { - return each($this->me['struct']); + return @each($this->me['struct']); } - // DEPRECATED! this code looks like it is very fragile and has not been fixed + // this code looks like it is very fragile and has not been fixed // for a long long time. Shall we remove it for 2.0? + /// @deprecated function getval() { // UNSTABLE $b = reset($this->me); - $a = key($this->me); // contributed by I Sofer, 2001-03-24 // add support for nested arrays to scalarval // i've created a new method here, so as to diff --git a/lib/xmlrpcs.inc b/lib/xmlrpcs.inc index 24cba8c..a623adb 100644 --- a/lib/xmlrpcs.inc +++ b/lib/xmlrpcs.inc @@ -1237,7 +1237,7 @@ /** * A debugging routine: just echoes back the input packet as a string value - * DEPRECATED! + * @deprecated */ function echoInput() { -- 2.43.0