remove one more warning with php 7.2

diff --git a/.travis.yml b/.travis.yml
index c35c7c8..01f7d05 100644 (file)
--- 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 (file)
--- 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 (file)
--- a/lib/xmlrpc.inc
+++ b/lib/xmlrpc.inc
@@ -208,7 +208,7 @@
        $GLOBALS['xmlrpc_internalencoding']='ISO-8859-1';\r
 \r
        $GLOBALS['xmlrpcName']='XML-RPC for PHP';\r
-       $GLOBALS['xmlrpcVersion']='3.1.1';\r
+       $GLOBALS['xmlrpcVersion']='3.1.2';\r
 \r
        // let user errors start at 800\r
        $GLOBALS['xmlrpcerruser']=800;\r
@@ -2165,7 +2165,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                        }\r
                }\r
 \r
-                               /**\r
+               /**\r
                * @deprecated\r
                */\r
                function xmlrpcmsg($meth, $pars=0)\r
@@ -2968,7 +2968,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                }\r
 \r
                // poor man's version of print_r ???\r
-               // DEPRECATED!\r
+               /// @deprecated\r
                function dump($ar)\r
                {\r
                        foreach($ar as $key => $val)\r
@@ -3128,7 +3128,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                        //}\r
                }\r
 \r
-               // DEPRECATED\r
+               /// @deprecated\r
                function serializeval($o)\r
                {\r
                        // add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...\r
@@ -3177,19 +3177,20 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                * Return next member element for xmlrpcvals of type struct.\r
                * @return xmlrpcval\r
                * @access public\r
+               * @deprecated this will be removed in future versions\r
                */\r
                function structeach()\r
                {\r
-                       return each($this->me['struct']);\r
+                       return @each($this->me['struct']);\r
                }\r
 \r
-               // DEPRECATED! this code looks like it is very fragile and has not been fixed\r
+               // this code looks like it is very fragile and has not been fixed\r
                // for a long long time. Shall we remove it for 2.0?\r
+               /// @deprecated\r
                function getval()\r
                {\r
                        // UNSTABLE\r
                        $b = reset($this->me);\r
-                       $a = key($this->me);\r
                        // contributed by I Sofer, 2001-03-24\r
                        // add support for nested arrays to scalarval\r
                        // i've created a new method here, so as to\r

diff --git a/lib/xmlrpcs.inc b/lib/xmlrpcs.inc
index 24cba8c..a623adb 100644 (file)
--- a/lib/xmlrpcs.inc
+++ b/lib/xmlrpcs.inc
@@ -1237,7 +1237,7 @@
 \r
                /**\r
                * A debugging routine: just echoes back the input packet as a string value\r
-               * DEPRECATED!\r
+               * @deprecated\r
                */\r
                function echoInput()\r
                {\r