[pkg-php-pear] Bug#939080: PHP4-style constructors are deprecated

William Blough bblough at debian.org
Sun Sep 1 03:53:41 BST 2019


Source: nusoap
Severity: normal
Tags: patch

PHP4-style constructors are deprecated.  They currently produce a lot of
noisy warnings, and support for them will be removed in PHP8.

The attached patch renames the constructors to use the new convention,
and introduces wrapper functions with the old names for backwards
compatibility.


-- System Information:
Debian Release: 10.0
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.19.0-5-amd64 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-------------- next part --------------
>From 5853b33679f8012150983fef207207355b67cdce Mon Sep 17 00:00:00 2001
From: Bill Blough <devel at blough.us>
Date: Sat, 31 Aug 2019 22:39:12 -0400
Subject: [PATCH] Add new-style constructors

---
 debian/patches/add_new_constructors.patch | 636 ++++++++++++++++++++++
 debian/patches/series                     |   1 +
 2 files changed, 637 insertions(+)
 create mode 100644 debian/patches/add_new_constructors.patch

diff --git a/debian/patches/add_new_constructors.patch b/debian/patches/add_new_constructors.patch
new file mode 100644
index 0000000..abade5c
--- /dev/null
+++ b/debian/patches/add_new_constructors.patch
@@ -0,0 +1,636 @@
+Description: Add new-style constructors
+ Old-style (php4) constructors are deprecated.  They generate warnings
+ currently, and will stop working in php8.  Adding new-style constructors
+ while keeping the old ones silences the warnings and prepares for php8
+Author: Bill Blough <bblough at debian.org>
+Last-Update: 2019-08-31
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lib/class.nusoap_base.php
++++ b/lib/class.nusoap_base.php
+@@ -222,11 +222,20 @@ class nusoap_base {
+ 	*
+ 	* @access	public
+ 	*/
+-	function nusoap_base() {
++	function __construct() {
+ 		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
+ 	}
+ 
+ 	/**
++	* old constructor
++	*
++	* @access	public
++	*/
++	function nusoap_base() {
++        $self::__construct();
++	}
++
++	/**
+ 	* gets the global debug level, which applies to future instances
+ 	*
+ 	* @return	integer	Debug level 0-9, where 0 turns off
+@@ -993,4 +1002,4 @@ function usleepWindows($usec)
+ }
+ 
+ 
+-?>
+\ No newline at end of file
++?>
+--- a/lib/class.soap_fault.php
++++ b/lib/class.soap_fault.php
+@@ -45,7 +45,7 @@ class nusoap_fault extends nusoap_base {
+     * @param string $faultstring human readable error message
+     * @param mixed $faultdetail detail, typically a string or array of string
+ 	*/
+-	function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
++	function __construct($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
+ 		parent::nusoap_base();
+ 		$this->faultcode = $faultcode;
+ 		$this->faultactor = $faultactor;
+@@ -54,6 +54,18 @@ class nusoap_fault extends nusoap_base {
+ 	}
+ 
+ 	/**
++	* old constructor
++    *
++    * @param string $faultcode (SOAP-ENV:Client | SOAP-ENV:Server)
++    * @param string $faultactor only used when msg routed between multiple actors
++    * @param string $faultstring human readable error message
++    * @param mixed $faultdetail detail, typically a string or array of string
++	*/
++	function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
++        $self::__construct($faultcode,$faultactor,$faultstring,$faultdetail);
++    }
++
++	/**
+ 	* serialize a fault
+ 	*
+ 	* @return	string	The serialization of the fault instance.
+@@ -87,4 +99,4 @@ class soap_fault extends nusoap_fault {
+ }
+ 
+ 
+-?>
+\ No newline at end of file
++?>
+--- a/lib/class.soap_parser.php
++++ b/lib/class.soap_parser.php
+@@ -57,7 +57,7 @@ class nusoap_parser extends nusoap_base
+ 	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
+ 	* @access   public
+ 	*/
+-	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
++	function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
+ 		parent::nusoap_base();
+ 		$this->xml = $xml;
+ 		$this->xml_encoding = $encoding;
+@@ -144,6 +144,19 @@ class nusoap_parser extends nusoap_base
+ 	}
+ 
+ 	/**
++	* old constructor
++	*
++	* @param    string $xml SOAP message
++	* @param    string $encoding character encoding scheme of message
++	* @param    string $method method for which XML is parsed (unused?)
++	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
++	* @access   public
++	*/
++	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
++        $self::__construct($xml,$encoding,$method,$decode_utf8);
++    }
++
++	/**
+ 	* start-element handler
+ 	*
+ 	* @param    resource $parser XML parser object
+@@ -640,4 +653,4 @@ class soap_parser extends nusoap_parser
+ }
+ 
+ 
+-?>
+\ No newline at end of file
++?>
+--- a/lib/class.soap_server.php
++++ b/lib/class.soap_server.php
+@@ -170,7 +170,7 @@ class nusoap_server extends nusoap_base
+     * @param mixed $wsdl file path or URL (string), or wsdl instance (object)
+ 	* @access   public
+ 	*/
+-	function nusoap_server($wsdl=false){
++	function __construct($wsdl=false){
+ 		parent::nusoap_base();
+ 		// turn on debugging?
+ 		global $debug;
+@@ -228,6 +228,17 @@ class nusoap_server extends nusoap_base
+ 	}
+ 
+ 	/**
++	* old constructor
++    * the optional parameter is a path to a WSDL file that you'd like to bind the server instance to.
++	*
++    * @param mixed $wsdl file path or URL (string), or wsdl instance (object)
++	* @access   public
++	*/
++	function nusoap_server($wsdl=false){
++        $self::__construct($wsdl);
++    }
++
++	/**
+ 	* processes request and returns response
+ 	*
+ 	* @param    string $data usually is the value of $HTTP_RAW_POST_DATA
+@@ -1124,4 +1135,4 @@ class soap_server extends nusoap_server
+ }
+ 
+ 
+-?>
+\ No newline at end of file
++?>
+--- a/lib/class.soap_transport_http.php
++++ b/lib/class.soap_transport_http.php
+@@ -57,7 +57,7 @@ class soap_transport_http extends nusoap
+ 	* @param boolean $use_curl Whether to try to force cURL use
+ 	* @access public
+ 	*/
+-	function soap_transport_http($url, $curl_options = NULL, $use_curl = false){
++	function __construct($url, $curl_options = NULL, $use_curl = false){
+ 		parent::nusoap_base();
+ 		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
+ 		$this->appendDebug($this->varDump($curl_options));
+@@ -71,6 +71,18 @@ class soap_transport_http extends nusoap
+ 	}
+ 
+ 	/**
++	* old constructor
++	*
++	* @param string $url The URL to which to connect
++	* @param array $curl_options User-specified cURL options
++	* @param boolean $use_curl Whether to try to force cURL use
++	* @access public
++	*/
++	function soap_transport_http($url, $curl_options = NULL, $use_curl = false){
++        $self::__construct($url, $curl_options, $use_curl);
++    }
++
++	/**
+ 	* sets a cURL option
+ 	*
+ 	* @param	mixed $option The cURL option (always integer?)
+@@ -1304,4 +1316,4 @@ class soap_transport_http extends nusoap
+ }
+ 
+ 
+-?>
+\ No newline at end of file
++?>
+--- a/lib/class.soap_val.php
++++ b/lib/class.soap_val.php
+@@ -69,7 +69,7 @@ class soapval extends nusoap_base {
+ 	* @param	mixed $attributes associative array of attributes to add to element serialization
+ 	* @access   public
+ 	*/
+-  	function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
++  	function __construct($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
+ 		parent::nusoap_base();
+ 		$this->name = $name;
+ 		$this->type = $type;
+@@ -80,6 +80,21 @@ class soapval extends nusoap_base {
+     }
+ 
+ 	/**
++	* old constructor
++	*
++	* @param    string $name optional name
++	* @param    mixed $type optional type name
++	* @param	mixed $value optional value
++	* @param	mixed $element_ns optional namespace of value
++	* @param	mixed $type_ns optional namespace of type
++	* @param	mixed $attributes associative array of attributes to add to element serialization
++	* @access   public
++	*/
++  	function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
++        $self::__construct($name,$type,$value,$element_ns,$type_ns,$attributes);
++    }
++
++	/**
+ 	* return serialized value
+ 	*
+ 	* @param	string $use The WSDL use value (encoded|literal)
+@@ -104,4 +119,4 @@ class soapval extends nusoap_base {
+ 
+ 
+ 
+-?>
+\ No newline at end of file
++?>
+--- a/lib/class.soapclient.php
++++ b/lib/class.soapclient.php
+@@ -95,7 +95,7 @@ class nusoap_client extends nusoap_base
+ 	* @param	string $portName optional portName in WSDL document
+ 	* @access   public
+ 	*/
+-	function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
++	function __construct($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
+ 		parent::nusoap_base();
+ 		$this->endpoint = $endpoint;
+ 		$this->proxyhost = $proxyhost;
+@@ -130,6 +130,24 @@ class nusoap_client extends nusoap_base
+ 	}
+ 
+ 	/**
++	* old  constructor
++	*
++	* @param    mixed $endpoint SOAP server or WSDL URL (string), or wsdl instance (object)
++	* @param    mixed $wsdl optional, set to 'wsdl' or true if using WSDL
++	* @param    string $proxyhost optional
++	* @param    string $proxyport optional
++	* @param	string $proxyusername optional
++	* @param	string $proxypassword optional
++	* @param	integer $timeout set the connection timeout
++	* @param	integer $response_timeout set the response timeout
++	* @param	string $portName optional portName in WSDL document
++	* @access   public
++	*/
++	function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
++        $self::__construct($endpoint,$wsdl,$proxyhost,$proxyport,$proxyusername, $proxypassword, $timeout, $response_timeout, $portName);
++    }
++
++	/**
+ 	* calls method, returns PHP native type
+ 	*
+ 	* @param    string $operation SOAP server URL or path
+--- a/lib/class.wsdl.php
++++ b/lib/class.wsdl.php
+@@ -69,7 +69,7 @@ class wsdl extends nusoap_base {
+ 	 * @param boolean $use_curl try to use cURL
+      * @access public 
+      */
+-    function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
++    function __construct($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
+ 		parent::nusoap_base();
+ 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
+         $this->proxyhost = $proxyhost;
+@@ -84,6 +84,24 @@ class wsdl extends nusoap_base {
+ 		$this->fetchWSDL($wsdl);
+     }
+ 
++    /**
++     * old constructor
++     * 
++     * @param string $wsdl WSDL document URL
++	 * @param string $proxyhost
++	 * @param string $proxyport
++	 * @param string $proxyusername
++	 * @param string $proxypassword
++	 * @param integer $timeout set the connection timeout
++	 * @param integer $response_timeout set the response timeout
++	 * @param array $curl_options user-specified cURL options
++	 * @param boolean $use_curl try to use cURL
++     * @access public 
++     */
++    function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
++		$self::__construct($wsdl,$proxyhost,$proxyport,$proxyusername,$proxypassword,$timeout,$response_timeout,$curl_options,$use_curl);
++    }
++
+ 	/**
+ 	 * fetches the WSDL document and parses it
+ 	 *
+@@ -1935,4 +1953,4 @@ class wsdl extends nusoap_base {
+ 	} 
+ }
+ 
+-?>
+\ No newline at end of file
++?>
+--- a/lib/class.wsdlcache.php
++++ b/lib/class.wsdlcache.php
+@@ -44,13 +44,24 @@ class nusoap_wsdlcache {
+ 	* @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited
+ 	* @access public
+ 	*/
+-	function nusoap_wsdlcache($cache_dir='.', $cache_lifetime=0) {
++	function __construct($cache_dir='.', $cache_lifetime=0) {
+ 		$this->fplock = array();
+ 		$this->cache_dir = $cache_dir != '' ? $cache_dir : '.';
+ 		$this->cache_lifetime = $cache_lifetime;
+ 	}
+ 
+ 	/**
++	* old constructor
++	*
++	* @param string $cache_dir directory for cache-files
++	* @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited
++	* @access public
++	*/
++	function nusoap_wsdlcache($cache_dir='.', $cache_lifetime=0) {
++        $self::__construct($cache_dir, $cache_lifetime);
++    }
++
++	/**
+ 	* creates the filename used to cache a wsdl instance
+ 	*
+ 	* @param string $wsdl The URL of the wsdl instance
+--- a/lib/class.xmlschema.php
++++ b/lib/class.xmlschema.php
+@@ -51,7 +51,7 @@ class nusoap_xmlschema extends nusoap_ba
+ 	* @param	string $namespaces namespaces defined in enclosing XML
+ 	* @access   public
+ 	*/
+-	function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){
++	function __construct($schema='',$xml='',$namespaces=array()){
+ 		parent::nusoap_base();
+ 		$this->debug('nusoap_xmlschema class instantiated, inside constructor');
+ 		// files
+@@ -76,6 +76,18 @@ class nusoap_xmlschema extends nusoap_ba
+ 
+ 	}
+ 
++	/**
++	* old constructor
++	*
++	* @param    string $schema schema document URI
++	* @param    string $xml xml document URI
++	* @param	string $namespaces namespaces defined in enclosing XML
++	* @access   public
++	*/
++	function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){
++		$self::__construct($schema,$xml,$namespaces);
++    }
++
+     /**
+     * parse an XML file
+     *
+@@ -970,4 +982,4 @@ class XMLSchema extends nusoap_xmlschema
+ }
+ 
+ 
+-?>
+\ No newline at end of file
++?>
+--- a/lib/nusoap.php
++++ b/lib/nusoap.php
+@@ -222,11 +222,21 @@ class nusoap_base {
+ 	*
+ 	* @access	public
+ 	*/
+-	function nusoap_base() {
++	function __construct() {
+ 		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
+ 	}
+ 
+ 	/**
++	* old constructor
++	*
++	* @access	public
++	*/
++	function nusoap_base() {
++		$self::__construct();
++	}
++
++
++	/**
+ 	* gets the global debug level, which applies to future instances
+ 	*
+ 	* @return	integer	Debug level 0-9, where 0 turns off
+@@ -1038,7 +1048,7 @@ class nusoap_fault extends nusoap_base {
+     * @param string $faultstring human readable error message
+     * @param mixed $faultdetail detail, typically a string or array of string
+ 	*/
+-	function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
++	function __construct($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
+ 		parent::nusoap_base();
+ 		$this->faultcode = $faultcode;
+ 		$this->faultactor = $faultactor;
+@@ -1047,6 +1057,19 @@ class nusoap_fault extends nusoap_base {
+ 	}
+ 
+ 	/**
++	* old constructor
++    *
++    * @param string $faultcode (SOAP-ENV:Client | SOAP-ENV:Server)
++    * @param string $faultactor only used when msg routed between multiple actors
++    * @param string $faultstring human readable error message
++    * @param mixed $faultdetail detail, typically a string or array of string
++	*/
++	function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
++        $self::__construct($faultcode,$faultactor,$faultstring,$faultdetail);
++	}
++
++
++	/**
+ 	* serialize a fault
+ 	*
+ 	* @return	string	The serialization of the fault instance.
+@@ -1131,7 +1154,7 @@ class nusoap_xmlschema extends nusoap_ba
+ 	* @param	string $namespaces namespaces defined in enclosing XML
+ 	* @access   public
+ 	*/
+-	function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){
++	function __construct($schema='',$xml='',$namespaces=array()){
+ 		parent::nusoap_base();
+ 		$this->debug('nusoap_xmlschema class instantiated, inside constructor');
+ 		// files
+@@ -1156,6 +1179,18 @@ class nusoap_xmlschema extends nusoap_ba
+ 
+ 	}
+ 
++	/**
++	* old constructor
++	*
++	* @param    string $schema schema document URI
++	* @param    string $xml xml document URI
++	* @param	string $namespaces namespaces defined in enclosing XML
++	* @access   public
++	*/
++	function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){
++        $self::__construct($schema,$xml,$namespaces);
++    }
++
+     /**
+     * parse an XML file
+     *
+@@ -2119,7 +2154,7 @@ class soapval extends nusoap_base {
+ 	* @param	mixed $attributes associative array of attributes to add to element serialization
+ 	* @access   public
+ 	*/
+-  	function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
++  	function __construct($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
+ 		parent::nusoap_base();
+ 		$this->name = $name;
+ 		$this->type = $type;
+@@ -2130,6 +2165,21 @@ class soapval extends nusoap_base {
+     }
+ 
+ 	/**
++	* old constructor
++	*
++	* @param    string $name optional name
++	* @param    mixed $type optional type name
++	* @param	mixed $value optional value
++	* @param	mixed $element_ns optional namespace of value
++	* @param	mixed $type_ns optional namespace of type
++	* @param	mixed $attributes associative array of attributes to add to element serialization
++	* @access   public
++	*/
++  	function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
++        $self::__construct($name,$type,$value,$element_ns,$type_ns,$attributes);
++    }
++
++	/**
+ 	* return serialized value
+ 	*
+ 	* @param	string $use The WSDL use value (encoded|literal)
+@@ -2211,7 +2261,7 @@ class soap_transport_http extends nusoap
+ 	* @param boolean $use_curl Whether to try to force cURL use
+ 	* @access public
+ 	*/
+-	function soap_transport_http($url, $curl_options = NULL, $use_curl = false){
++	function __construct($url, $curl_options = NULL, $use_curl = false){
+ 		parent::nusoap_base();
+ 		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
+ 		$this->appendDebug($this->varDump($curl_options));
+@@ -2225,6 +2275,18 @@ class soap_transport_http extends nusoap
+ 	}
+ 
+ 	/**
++	* old constructor
++	*
++	* @param string $url The URL to which to connect
++	* @param array $curl_options User-specified cURL options
++	* @param boolean $use_curl Whether to try to force cURL use
++	* @access public
++	*/
++	function soap_transport_http($url, $curl_options = NULL, $use_curl = false){
++        $self::__construct($url, $curl_options, $use_curl);
++    }
++
++	/**
+ 	* sets a cURL option
+ 	*
+ 	* @param	mixed $option The cURL option (always integer?)
+@@ -3628,7 +3690,7 @@ class nusoap_server extends nusoap_base
+     * @param mixed $wsdl file path or URL (string), or wsdl instance (object)
+ 	* @access   public
+ 	*/
+-	function nusoap_server($wsdl=false){
++	function __construct($wsdl=false){
+ 		parent::nusoap_base();
+ 		// turn on debugging?
+ 		global $debug;
+@@ -3686,6 +3748,17 @@ class nusoap_server extends nusoap_base
+ 	}
+ 
+ 	/**
++	* old constructor
++    * the optional parameter is a path to a WSDL file that you'd like to bind the server instance to.
++	*
++    * @param mixed $wsdl file path or URL (string), or wsdl instance (object)
++	* @access   public
++	*/
++	function nusoap_server($wsdl=false){
++        $self::__construct($wsdl);
++    }
++
++	/**
+ 	* processes request and returns response
+ 	*
+ 	* @param    string $data usually is the value of $HTTP_RAW_POST_DATA
+@@ -4651,7 +4724,7 @@ class wsdl extends nusoap_base {
+ 	 * @param boolean $use_curl try to use cURL
+      * @access public 
+      */
+-    function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
++    function __construct($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
+ 		parent::nusoap_base();
+ 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
+         $this->proxyhost = $proxyhost;
+@@ -4666,6 +4739,24 @@ class wsdl extends nusoap_base {
+ 		$this->fetchWSDL($wsdl);
+     }
+ 
++    /**
++     * old constructor
++     * 
++     * @param string $wsdl WSDL document URL
++	 * @param string $proxyhost
++	 * @param string $proxyport
++	 * @param string $proxyusername
++	 * @param string $proxypassword
++	 * @param integer $timeout set the connection timeout
++	 * @param integer $response_timeout set the response timeout
++	 * @param array $curl_options user-specified cURL options
++	 * @param boolean $use_curl try to use cURL
++     * @access public 
++     */
++    function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
++        $self::__construct($wsdl,$proxyhost,$proxyport,$proxyusername,$proxypassword,$timeout,$response_timeout,$curl_options,$use_curl);
++    }
++
+ 	/**
+ 	 * fetches the WSDL document and parses it
+ 	 *
+@@ -6574,7 +6665,7 @@ class nusoap_parser extends nusoap_base
+ 	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
+ 	* @access   public
+ 	*/
+-	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
++	function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
+ 		parent::nusoap_base();
+ 		$this->xml = $xml;
+ 		$this->xml_encoding = $encoding;
+@@ -6661,6 +6752,19 @@ class nusoap_parser extends nusoap_base
+ 	}
+ 
+ 	/**
++	* old constructor
++	*
++	* @param    string $xml SOAP message
++	* @param    string $encoding character encoding scheme of message
++	* @param    string $method method for which XML is parsed (unused?)
++	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
++	* @access   public
++	*/
++	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
++        $self::__construct($xml,$encoding,$method,$decode_utf8);
++    }
++
++	/**
+ 	* start-element handler
+ 	*
+ 	* @param    resource $parser XML parser object
+@@ -7252,7 +7356,7 @@ class nusoap_client extends nusoap_base
+ 	* @param	string $portName optional portName in WSDL document
+ 	* @access   public
+ 	*/
+-	function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
++	function __construct($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
+ 		parent::nusoap_base();
+ 		$this->endpoint = $endpoint;
+ 		$this->proxyhost = $proxyhost;
+@@ -7287,6 +7391,24 @@ class nusoap_client extends nusoap_base
+ 	}
+ 
+ 	/**
++	* old constructor
++	*
++	* @param    mixed $endpoint SOAP server or WSDL URL (string), or wsdl instance (object)
++	* @param    mixed $wsdl optional, set to 'wsdl' or true if using WSDL
++	* @param    string $proxyhost optional
++	* @param    string $proxyport optional
++	* @param	string $proxyusername optional
++	* @param	string $proxypassword optional
++	* @param	integer $timeout set the connection timeout
++	* @param	integer $response_timeout set the response timeout
++	* @param	string $portName optional portName in WSDL document
++	* @access   public
++	*/
++	function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
++        $self::__construct($endpoint,$wsdl,$proxyhost,$proxyport,$proxyusername, $proxypassword, $timeout, $response_timeout, $portName);
++    }
++
++	/**
+ 	* calls method, returns PHP native type
+ 	*
+ 	* @param    string $operation SOAP server URL or path
diff --git a/debian/patches/series b/debian/patches/series
index af83507..f15d3b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 do-not-use-PHP_SELF-to-avoid-xss.patch
 0002-Adapt-lib-path-in-examples.patch
+add_new_constructors.patch
-- 
2.20.1



More information about the pkg-php-pear mailing list