PHP API was changed (see readme.html for more details).

16 files changed, 17 insertions, 21 deletions

diff --git a/ext/soap/tests/schema/test_schema.inc b/ext/soap/tests/schema/test_schema.inc
index 4e1e2df9eb..3bdcd95ef7 100644
--- a/ext/soap/tests/schema/test_schema.inc
+++ b/ext/soap/tests/schema/test_schema.inc
@@ -53,13 +53,11 @@ EOF;
   $f = fopen($fname,"w");
   fwrite($f,$wsdl);
   fclose($f);
-  $x = new SoapObject($fname);
-  $y = new SoapServer("http://test-uri/");
-  $y->bind($fname);
+  $x = new SoapClient($fname, array("trace"=>1));
+  $y = new SoapServer($fname);
 	$y->addfunction("test");
   unlink($fname);
 
-  $x->__trace(1);
   $x->test($param);
   $xml = xml_parser_create();
   $req = $x->__getlastrequest();
diff --git a/ext/soap/tests/server001.phpt b/ext/soap/tests/server001.phpt
index 0ee679889b..582759f06f 100644
--- a/ext/soap/tests/server001.phpt
+++ b/ext/soap/tests/server001.phpt
@@ -8,7 +8,7 @@ function test() {
   return "Hello World";
 }
 
-$server = new soapserver("http://testuri.org");
+$server = new soapserver(null,array('uri'=>"http://testuri.org"));
 $server->addfunction("test");
 
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/server002.phpt b/ext/soap/tests/server002.phpt
index af211bc7ac..8416f4fb08 100644
--- a/ext/soap/tests/server002.phpt
+++ b/ext/soap/tests/server002.phpt
@@ -8,7 +8,7 @@ function Add($x,$y) {
   return $x+$y;
 }
 
-$server = new soapserver("http://testuri.org");
+$server = new soapserver(null,array('uri'=>"http://testuri.org"));
 $server->addfunction("Add");
 
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/server003.phpt b/ext/soap/tests/server003.phpt
index 888fe9b5d1..d4a15e0d69 100644
--- a/ext/soap/tests/server003.phpt
+++ b/ext/soap/tests/server003.phpt
@@ -4,7 +4,7 @@ SOAP Server 3: all functions
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-$server = new soapserver("http://testuri.org");
+$server = new soapserver(null,array('uri'=>"http://testuri.org"));
 $server->addfunction(SOAP_FUNCTIONS_ALL);
 
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/server004.phpt b/ext/soap/tests/server004.phpt
index c97b4ef1ad..5bfef4fcd4 100644
--- a/ext/soap/tests/server004.phpt
+++ b/ext/soap/tests/server004.phpt
@@ -11,7 +11,7 @@ function Sub($x,$y) {
   return $x-$y;
 }
 
-$server = new soapserver("http://testuri.org");
+$server = new soapserver(null,array('uri'=>"http://testuri.org"));
 $server->addfunction(array("Sub","Add"));
 
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/server005.phpt b/ext/soap/tests/server005.phpt
index a0e4afa540..4aae3b2d99 100644
--- a/ext/soap/tests/server005.phpt
+++ b/ext/soap/tests/server005.phpt
@@ -10,7 +10,7 @@ class Foo {
   }
 }
 
-$server = new soapserver("http://testuri.org");
+$server = new soapserver(null,array('uri'=>"http://testuri.org"));
 $server->setclass("Foo");
 
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/server006.phpt b/ext/soap/tests/server006.phpt
index b75482ba3a..f382d9f2f1 100644
--- a/ext/soap/tests/server006.phpt
+++ b/ext/soap/tests/server006.phpt
@@ -16,7 +16,7 @@ class Foo {
   }
 }
 
-$server = new soapserver("http://testuri.org");
+$server = new soapserver(null,array('uri'=>"http://testuri.org"));
 $server->setclass("Foo","Hello");
 
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/server007.phpt b/ext/soap/tests/server007.phpt
index 113ddac4a3..676aa56c44 100644
--- a/ext/soap/tests/server007.phpt
+++ b/ext/soap/tests/server007.phpt
@@ -11,7 +11,7 @@ function Sub($x,$y) {
   return $x-$y;
 }
 
-$server = new soapserver("http://testuri.org");
+$server = new soapserver(null,array('uri'=>"http://testuri.org"));
 $server->addfunction(array("Sub","Add"));
 var_dump($server->getfunctions());
 echo "ok\n";
diff --git a/ext/soap/tests/server008.phpt b/ext/soap/tests/server008.phpt
index 73f91f3891..87fb69d25f 100644
--- a/ext/soap/tests/server008.phpt
+++ b/ext/soap/tests/server008.phpt
@@ -14,7 +14,7 @@ class Foo {
   }
 }
 
-$server = new soapserver("http://testuri.org");
+$server = new soapserver(null,array('uri'=>"http://testuri.org"));
 $server->setclass("Foo");
 var_dump($server->getfunctions());
 echo "ok\n";
diff --git a/ext/soap/tests/server009.phpt b/ext/soap/tests/server009.phpt
index 9e338450da..0a7b30f40c 100644
--- a/ext/soap/tests/server009.phpt
+++ b/ext/soap/tests/server009.phpt
@@ -17,7 +17,7 @@ class foo {
   }
 }
 
-$server = new soapserver("http://testuri.org");
+$server = new soapserver(null,array('uri'=>"http://testuri.org"));
 $server->setclass("foo");
 $server->setpersistence(SOAP_PERSISTENCE_SESSION);
 
diff --git a/ext/soap/tests/server010.phpt b/ext/soap/tests/server010.phpt
index 8cbdc4af46..76cc1e6949 100644
--- a/ext/soap/tests/server010.phpt
+++ b/ext/soap/tests/server010.phpt
@@ -12,7 +12,7 @@ class foo {
   }
 }
 
-$server = new soapserver("http://testuri.org");
+$server = new soapserver(null,array('uri'=>"http://testuri.org"));
 $server->setclass("foo");
 $server->setpersistence(SOAP_PERSISTENCE_REQUEST);
 
diff --git a/ext/soap/tests/server011.phpt b/ext/soap/tests/server011.phpt
index d5f6d3703d..fb9aabe89c 100644
--- a/ext/soap/tests/server011.phpt
+++ b/ext/soap/tests/server011.phpt
@@ -10,8 +10,7 @@ function Add($x,$y) {
   return $x+$y;
 }
 
-$server = new soapserver("http://testuri.org");
-$server->bind(dirname(__FILE__)."/test.wsdl");
+$server = new soapserver(dirname(__FILE__)."/test.wsdl");
 ob_start();
 $server->handle();
 $wsdl = ob_get_contents();
diff --git a/ext/soap/tests/server012.phpt b/ext/soap/tests/server012.phpt
index 5739f5beae..9a41de9d50 100644
--- a/ext/soap/tests/server012.phpt
+++ b/ext/soap/tests/server012.phpt
@@ -10,7 +10,7 @@ function Add($x,$y) {
   return $x+$y;
 }
 
-$server = new soapserver("http://testuri.org");
+$server = new soapserver(null,array('uri'=>"http://testuri.org"));
 $server->addfunction("Add");
 $server->handle();
 echo "ok\n";
diff --git a/ext/soap/tests/server013.phpt b/ext/soap/tests/server013.phpt
index ca7efbfeeb..4bb94c79c4 100644
--- a/ext/soap/tests/server013.phpt
+++ b/ext/soap/tests/server013.phpt
@@ -14,7 +14,7 @@ function Sum($a) {
   return $sum;
 }
 
-$server = new soapserver("http://testuri.org");
+$server = new soapserver(null,array('uri'=>"http://testuri.org"));
 $server->addfunction("Sum");
 
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/server014.phpt b/ext/soap/tests/server014.phpt
index 01a05d772e..7375264872 100644
--- a/ext/soap/tests/server014.phpt
+++ b/ext/soap/tests/server014.phpt
@@ -9,7 +9,7 @@ function Add($x,$y) {
   return $x+$y;
 }
 
-$server = new soapserver("http://testuri.org");
+$server = new soapserver(null,array('uri'=>"http://testuri.org"));
 $server->addfunction("Add");
 
 $HTTP_RAW_POST_DATA = <<<EOF
diff --git a/ext/soap/tests/soap12/soap12-test.inc b/ext/soap/tests/soap12/soap12-test.inc
index c38bbb1cb2..03da1f65b6 100644
--- a/ext/soap/tests/soap12/soap12-test.inc
+++ b/ext/soap/tests/soap12/soap12-test.inc
@@ -113,8 +113,7 @@ class Soap12test {
 	}
 }
 
-$server = new soapserver("http://example.org/ts-tests", SOAP_1_2, "http://example.org/ts-tests/C");
-$server->bind(dirname(__FILE__)."/soap12-test.wsdl");
+$server = new soapserver(dirname(__FILE__)."/soap12-test.wsdl", array('soap_version'=>SOAP_1_2,'actor'=>"http://example.org/ts-tests/C"));
 $server->setClass("Soap12test");
 
 $server->handle();