Fix class

nguyenanhung · Oct 6, 2018 · 8d95408 · 8d95408
1 parent 4857f12
commit 8d95408
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/src/nusoap_base.php b/src/nusoap_base.php
@@ -228,7 +228,7 @@ class nusoap_base
      *
      * @access    public
      */
-    function nusoap_base()
+    function __construct()
     {
         $this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
     }

diff --git a/src/nusoap_client.php b/src/nusoap_client.php
@@ -96,11 +96,11 @@ class nusoap_client extends nusoap_base
      *
      * @access   public
      */
-    function nusoap_client(
+    function __construct(
         $endpoint, $wsdl = FALSE, $proxyhost = FALSE, $proxyport = FALSE, $proxyusername = FALSE, $proxypassword = FALSE, $timeout = 0,
         $response_timeout = 30, $portName = ''
     ) {
-        parent::nusoap_base();
+        parent::__construct();
         $this->endpoint         = $endpoint;
         $this->proxyhost        = $proxyhost;
         $this->proxyport        = $proxyport;

diff --git a/src/nusoap_fault.php b/src/nusoap_fault.php
@@ -51,9 +51,9 @@ 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();
+        parent::__construct();
         $this->faultcode   = $faultcode;
         $this->faultactor  = $faultactor;
         $this->faultstring = $faultstring;

diff --git a/src/nusoap_parser.php b/src/nusoap_parser.php
@@ -59,9 +59,9 @@ class nusoap_parser extends nusoap_base
      *
      * @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();
+        parent::__construct();
         $this->xml          = $xml;
         $this->xml_encoding = $encoding;
         $this->method       = $method;

diff --git a/src/nusoap_server.php b/src/nusoap_server.php
@@ -196,9 +196,9 @@ class nusoap_server extends nusoap_base
      *
      * @access   public
      */
-    function nusoap_server($wsdl = FALSE)
+    function __construct($wsdl = FALSE)
     {
-        parent::nusoap_base();
+        parent::__construct();
         // turn on debugging?
         global $debug;
         global $HTTP_SERVER_VARS;

diff --git a/src/nusoap_wsdlcache.php b/src/nusoap_wsdlcache.php
@@ -47,7 +47,7 @@ class nusoap_wsdlcache
      *
      * @access public
      */
-    function nusoap_wsdlcache($cache_dir = '.', $cache_lifetime = 0)
+    function __construct($cache_dir = '.', $cache_lifetime = 0)
     {
         $this->fplock         = [];
         $this->cache_dir      = $cache_dir != '' ? $cache_dir : '.';

diff --git a/src/nusoap_xmlschema.php b/src/nusoap_xmlschema.php
@@ -53,9 +53,9 @@ class nusoap_xmlschema extends nusoap_base
      *
      * @access   public
      */
-    function nusoap_xmlschema($schema = '', $xml = '', $namespaces = [])
+    function __construct($schema = '', $xml = '', $namespaces = [])
     {
-        parent::nusoap_base();
+        parent::__construct();
         $this->debug('nusoap_xmlschema class instantiated, inside constructor');
         // files
         $this->schema = $schema;

diff --git a/src/soap_transport_http.php b/src/soap_transport_http.php
@@ -59,9 +59,9 @@ class soap_transport_http extends nusoap_base
      *
      * @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();
+        parent::__construct();
         $this->debug("ctor url=$url use_curl=$use_curl curl_options:");
         $this->appendDebug($this->varDump($curl_options));
         $this->setURL($url);

diff --git a/src/soapval.php b/src/soapval.php
@@ -71,9 +71,9 @@ class soapval extends nusoap_base
      *
      * @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();
+        parent::__construct();
         $this->name       = $name;
         $this->type       = $type;
         $this->value      = $value;

diff --git a/src/wsdl.php b/src/wsdl.php
@@ -71,11 +71,11 @@ class wsdl extends nusoap_base
      *
      * @access public
      */
-    function wsdl(
+    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();
+        parent::__construct();
         $this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
         $this->proxyhost        = $proxyhost;
         $this->proxyport        = $proxyport;