diff options
Diffstat (limited to 'ext/soap/tests')
240 files changed, 1719 insertions, 1733 deletions
diff --git a/ext/soap/tests/any.phpt b/ext/soap/tests/any.phpt index d84443b06f..af9696bf51 100644 --- a/ext/soap/tests/any.phpt +++ b/ext/soap/tests/any.phpt @@ -17,15 +17,15 @@ class SOAPComplexType { $struct = new SOAPComplexType('arg',34,325.325); function echoAnyElement($x) { - global $g; + global $g; - $g = $x; - $struct = $x->inputAny->any["SOAPComplexType"]; - if ($struct instanceof SOAPComplexType) { - return array("return" => array("any" => array("SOAPComplexType"=>new SoapVar($struct, SOAP_ENC_OBJECT, "SOAPComplexType", "http://soapinterop.org/xsd", "SOAPComplexType", "http://soapinterop.org/")))); - } else { - return "?"; - } + $g = $x; + $struct = $x->inputAny->any["SOAPComplexType"]; + if ($struct instanceof SOAPComplexType) { + return array("return" => array("any" => array("SOAPComplexType"=>new SoapVar($struct, SOAP_ENC_OBJECT, "SOAPComplexType", "http://soapinterop.org/xsd", "SOAPComplexType", "http://soapinterop.org/")))); + } else { + return "?"; + } } class TestSoapClient extends SoapClient { diff --git a/ext/soap/tests/bug46760.phpt b/ext/soap/tests/bug46760.phpt index 95cb58867f..f591e1b3d6 100644 --- a/ext/soap/tests/bug46760.phpt +++ b/ext/soap/tests/bug46760.phpt @@ -8,9 +8,9 @@ Bug #46760 (SoapClient doRequest fails when proxy is used) $client = new SoapClient(null, array('proxy_host' => "localhost", 'proxy_port' => '8080', 'login' => "user", - 'password' => "test", - 'uri' => 'mo:http://www.w3.org/', - 'location' => 'http://some.url')); + 'password' => "test", + 'uri' => 'mo:http://www.w3.org/', + 'location' => 'http://some.url')); var_dump($client->_proxy_port); ?> diff --git a/ext/soap/tests/bug48557.phpt b/ext/soap/tests/bug48557.phpt index aa20c14610..e4c4e89342 100644 --- a/ext/soap/tests/bug48557.phpt +++ b/ext/soap/tests/bug48557.phpt @@ -9,7 +9,7 @@ ini_set('display_errors', 1); ini_set("soap.wsdl_cache_enabled", 0); function test($map) { - var_dump($map, $map[1], $map[2]);die; + var_dump($map, $map[1], $map[2]);die; } $y = new SoapServer(__DIR__ . '/bug48557.wsdl'); @@ -17,36 +17,36 @@ $y->addfunction("test"); $request = <<<XML <?xml version="1.0"?> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns2="http://xml.apache.org/xml-soap" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> - <SOAP-ENV:Body> - <ns1:test> - <testParam xsi:type="ns2:Map"> - <item> - <key xsi:type="xsd:int">1</key> - <value xsi:type="xsd:int">123</value> - </item> - <item> - <key xsi:type="xsd:int">-1000</key> - <value xsi:type="xsd:string">123</value> - </item> - <item> - <key xsi:type="xsd:string">2</key> - <value xsi:type="xsd:float">123.5</value> - </item> - <item> - <key xsi:type="xsd:string">-2000</key> - <value xsi:type="xsd:float">123.5</value> - </item> - <item> - <key xsi:type="xsd:string">011</key> - <value xsi:type="xsd:float">123.5</value> - </item> - <item> - <key xsi:type="xsd:int">012</key> - <value xsi:type="xsd:float">123.5</value> - </item> - </testParam> - </ns1:test> - </SOAP-ENV:Body> + <SOAP-ENV:Body> + <ns1:test> + <testParam xsi:type="ns2:Map"> + <item> + <key xsi:type="xsd:int">1</key> + <value xsi:type="xsd:int">123</value> + </item> + <item> + <key xsi:type="xsd:int">-1000</key> + <value xsi:type="xsd:string">123</value> + </item> + <item> + <key xsi:type="xsd:string">2</key> + <value xsi:type="xsd:float">123.5</value> + </item> + <item> + <key xsi:type="xsd:string">-2000</key> + <value xsi:type="xsd:float">123.5</value> + </item> + <item> + <key xsi:type="xsd:string">011</key> + <value xsi:type="xsd:float">123.5</value> + </item> + <item> + <key xsi:type="xsd:int">012</key> + <value xsi:type="xsd:float">123.5</value> + </item> + </testParam> + </ns1:test> + </SOAP-ENV:Body> </SOAP-ENV:Envelope> XML; diff --git a/ext/soap/tests/bug69137.phpt b/ext/soap/tests/bug69137.phpt index 9160b91c25..d34ba13e3e 100644 --- a/ext/soap/tests/bug69137.phpt +++ b/ext/soap/tests/bug69137.phpt @@ -26,9 +26,9 @@ $client = new SoapClient($testServiceWsdl); unset($client); $parameters = [ - 'proxy_host' => $proxyHost, - 'proxy_port' => $proxyPort, - 'trace' => 1, + 'proxy_host' => $proxyHost, + 'proxy_port' => $proxyPort, + 'trace' => 1, ]; $client = new SoapClient($testServiceWsdl, $parameters); @@ -39,7 +39,7 @@ $lookup->ipAddress = '72.52.91.14'; $result = $client->ResolveIP($lookup); if ($result && is_object($result) && $result->ResolveIPResult && is_object($result->ResolveIPResult)) { - print "successful lookup"; + print "successful lookup"; } ?> --EXPECT-- diff --git a/ext/soap/tests/bug70388.phpt b/ext/soap/tests/bug70388.phpt index 6c0d1081de..fc67de1142 100644 --- a/ext/soap/tests/bug70388.phpt +++ b/ext/soap/tests/bug70388.phpt @@ -6,10 +6,10 @@ Bug #70388 (SOAP serialize_function_call() type confusion / RCE) <?php $dummy = unserialize('O:10:"SoapClient":3:{s:3:"uri";s:1:"X";s:8:"location";s:22:"http://localhost/a.xml";s:17:"__default_headers";a:1:{i:1;s:1337:"'.str_repeat("X", 1337).'";}}'); try { - var_dump($dummy->notexisting()); + var_dump($dummy->notexisting()); } catch(Exception $e) { - var_dump($e->getMessage()); - var_dump(get_class($e)); + var_dump($e->getMessage()); + var_dump(get_class($e)); } ?> --EXPECTF-- diff --git a/ext/soap/tests/bug70875.phpt b/ext/soap/tests/bug70875.phpt index 6f10462bfc..86a16697ce 100644 --- a/ext/soap/tests/bug70875.phpt +++ b/ext/soap/tests/bug70875.phpt @@ -9,19 +9,19 @@ soap.wsdl_cache_enabled=0 class bug70875 extends SOAPClient { - public function __doRequest($request, $location, $action, $version, $one_way = 0) - { - die("no SIGSEGV"); - } + public function __doRequest($request, $location, $action, $version, $one_way = 0) + { + die("no SIGSEGV"); + } } $c = new bug70875(__DIR__.'/bug70875.wsdl', [ - 'trace' => 1, - 'classmap' => [ - 'TestService' => 'TestService', - 'TestServiceRQ' => 'TestServiceRQ', - 'RqHeader' => 'RqHeader', - ], + 'trace' => 1, + 'classmap' => [ + 'TestService' => 'TestService', + 'TestServiceRQ' => 'TestServiceRQ', + 'RqHeader' => 'RqHeader', + ], ]); @@ -32,7 +32,7 @@ class TestService class TestServiceRQ { - public $RqHeader; + public $RqHeader; } class RqHeader diff --git a/ext/soap/tests/bug71610.phpt b/ext/soap/tests/bug71610.phpt index f00d57700a..f88124d50c 100644 --- a/ext/soap/tests/bug71610.phpt +++ b/ext/soap/tests/bug71610.phpt @@ -11,7 +11,7 @@ $exploit = unserialize('O:10:"SoapClient":3:{s:3:"uri";s:1:"a";s:8:"location";s: try { $exploit->blahblah(); } catch(SoapFault $e) { - echo $e->getMessage()."\n"; + echo $e->getMessage()."\n"; } ?> --EXPECT-- diff --git a/ext/soap/tests/bug73037.phpt b/ext/soap/tests/bug73037.phpt index 897aec89d0..d835f2a280 100644 --- a/ext/soap/tests/bug73037.phpt +++ b/ext/soap/tests/bug73037.phpt @@ -20,46 +20,46 @@ include __DIR__ . "/../../../sapi/cli/tests/php_cli_server.inc"; function get_data($max) { - $piece = "<CD> - <TITLE>Empire Burlesque</TITLE> - <ARTIST>Bob Dylan</ARTIST> - <COUNTRY>USA</COUNTRY> - <COMPANY>Columbia</COMPANY> - <PRICE>10.90</PRICE> - <YEAR>1985</YEAR> - </CD>"; - - $begin = '<?xml version="1.0" encoding="UTF-8"?><soapenv:Envelope xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soapenv:Body><CATALOG>'; - $end = '</CATALOG></soapenv:Body></soapenv:Envelope>'; - - $min = strlen($begin) + strlen($piece) + strlen($end); - $max = $max < $min ? $min : $max; - - $data = $begin; - $data .= $piece; - while (strlen($data) + strlen($end) < $max) { - /* Randomize a bit, taking gzip in account. */ - $tmp = str_replace( - array( - "Empire Burlesque", - "Bob Dylan", - ), - array( - md5(uniqid()), - sha1(uniqid()), - ), - $piece - ); - - if (strlen($begin) + strlen($tmp) + strlen($end) > $max) { - break; - } - - $data .= $tmp; - } - $data .= $end; - - return $data; + $piece = "<CD> + <TITLE>Empire Burlesque</TITLE> + <ARTIST>Bob Dylan</ARTIST> + <COUNTRY>USA</COUNTRY> + <COMPANY>Columbia</COMPANY> + <PRICE>10.90</PRICE> + <YEAR>1985</YEAR> + </CD>"; + + $begin = '<?xml version="1.0" encoding="UTF-8"?><soapenv:Envelope xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soapenv:Body><CATALOG>'; + $end = '</CATALOG></soapenv:Body></soapenv:Envelope>'; + + $min = strlen($begin) + strlen($piece) + strlen($end); + $max = $max < $min ? $min : $max; + + $data = $begin; + $data .= $piece; + while (strlen($data) + strlen($end) < $max) { + /* Randomize a bit, taking gzip in account. */ + $tmp = str_replace( + array( + "Empire Burlesque", + "Bob Dylan", + ), + array( + md5(uniqid()), + sha1(uniqid()), + ), + $piece + ); + + if (strlen($begin) + strlen($tmp) + strlen($end) > $max) { + break; + } + + $data .= $tmp; + } + $data .= $end; + + return $data; } $router = "bug73037_server.php"; @@ -74,19 +74,19 @@ PHP; php_cli_server_start($code, $router, $args); foreach (array(1024-1, 1024*8-3, 1024*9+1, 1024*16-1, 1024*32-5, 1024*64+3, 1024*128-7) as $k => $i) { - echo "Iteration $k\n\n"; + echo "Iteration $k\n\n"; - /* with and without compression */ - foreach (array(false, true) as $b) { - $data = get_data($i); - if ($b) { - $data = gzencode($data); - } - $len = strlen($data); + /* with and without compression */ + foreach (array(false, true) as $b) { + $data = get_data($i); + if ($b) { + $data = gzencode($data); + } + $len = strlen($data); - //echo "len=$len\n"; + //echo "len=$len\n"; - $hdrs = <<<HDRS + $hdrs = <<<HDRS POST /bug73037_server.php HTTP/1.1 Content-Type: application/soap+xml; charset=UTF-8 Accept: application/soap+xml, application/dime, multipart/related, text/* @@ -94,45 +94,44 @@ SOAPAction: "urn:adressen#adressen#SetAda" Expect: 100-continue Content-Length: ${len} HDRS; - if ($b) { - $hdrs .="\nContent-Encoding: gzip"; - } - //echo "Headers sent:\n$hdrs\n\n"; - $fp = fsockopen(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT, $errno, $errstr, 5); - if (!$fp) { - die("connect failed"); - } - - if(fwrite($fp, "$hdrs\n\n$data")) { - $out = ""; - while (!feof($fp)) { - $out .= fread($fp, 1024); - } - - $pos = strpos($out, "<env:Text>"); - if (false === $pos) { - echo $out; - goto cleanup; - } - $pos0 = $pos + strlen("<env:Text>"); - $pos = strpos($out, "</env:Text>"); - if (false === $pos) { - echo $out; - goto cleanup; - } - $len = $pos - $pos0; - echo substr($out, $pos0, $len); - } + if ($b) { + $hdrs .="\nContent-Encoding: gzip"; + } + //echo "Headers sent:\n$hdrs\n\n"; + $fp = fsockopen(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT, $errno, $errstr, 5); + if (!$fp) { + die("connect failed"); + } + + if(fwrite($fp, "$hdrs\n\n$data")) { + $out = ""; + while (!feof($fp)) { + $out .= fread($fp, 1024); + } + + $pos = strpos($out, "<env:Text>"); + if (false === $pos) { + echo $out; + goto cleanup; + } + $pos0 = $pos + strlen("<env:Text>"); + $pos = strpos($out, "</env:Text>"); + if (false === $pos) { + echo $out; + goto cleanup; + } + $len = $pos - $pos0; + echo substr($out, $pos0, $len); + } cleanup: - fclose($fp); + fclose($fp); - echo "\n\n"; - } + echo "\n\n"; + } } ?> -==DONE== --CLEAN-- <?php unlink(__DIR__ . DIRECTORY_SEPARATOR . "bug73037_server.php"); @@ -180,4 +179,3 @@ Function 'CATALOG' doesn't exist Function 'CATALOG' doesn't exist -==DONE== diff --git a/ext/soap/tests/bug77088.phpt b/ext/soap/tests/bug77088.phpt index 0c1a604f2e..17945e136f 100644 --- a/ext/soap/tests/bug77088.phpt +++ b/ext/soap/tests/bug77088.phpt @@ -11,19 +11,18 @@ try { $options = NULL; $sClient = new SoapClient("test.wsdl", $options); -} -catch(SoapFault $e) +} +catch(TypeError $e) { var_dump($e); } ?> --EXPECTF-- -Warning: SoapClient::SoapClient() expects parameter 2 to be array, null given in %sbug77088.php on line %d -object(SoapFault)#%d (%d) { +object(TypeError)#%d (%d) { ["message":protected]=> - string(44) "SoapClient::SoapClient(): Invalid parameters" - ["string":"Exception":private]=> + string(%d) "SoapClient::__construct() expects parameter 2 to be array, null given" + ["string":"Error":private]=> string(0) "" ["code":protected]=> int(0) @@ -31,7 +30,7 @@ object(SoapFault)#%d (%d) { string(%d) "%sbug77088.php" ["line":protected]=> int(6) - ["trace":"Exception":private]=> + ["trace":"Error":private]=> array(1) { [0]=> array(6) { @@ -40,7 +39,7 @@ object(SoapFault)#%d (%d) { ["line"]=> int(6) ["function"]=> - string(10) "SoapClient" + string(11) "__construct" ["class"]=> string(10) "SoapClient" ["type"]=> @@ -54,12 +53,6 @@ object(SoapFault)#%d (%d) { } } } - ["previous":"Exception":private]=> + ["previous":"Error":private]=> NULL - ["faultstring"]=> - string(44) "SoapClient::SoapClient(): Invalid parameters" - ["faultcode"]=> - string(6) "Client" - ["faultcodens"]=> - string(41) "http://schemas.xmlsoap.org/soap/envelope/" } diff --git a/ext/soap/tests/bug77410.phpt b/ext/soap/tests/bug77410.phpt index 2b74102523..4c36e6e9da 100644 --- a/ext/soap/tests/bug77410.phpt +++ b/ext/soap/tests/bug77410.phpt @@ -11,7 +11,7 @@ $client = new class(__DIR__ . '/bug77410.wsdl', [ ]) extends SoapClient { public function __doRequest($request, $location, $action, $version, $one_way = 0) { echo $request, "\n"; - return ''; + return ''; } }; diff --git a/ext/soap/tests/bugs/bug28751.phpt b/ext/soap/tests/bugs/bug28751.phpt index 88187eb109..4b64b62a06 100644 --- a/ext/soap/tests/bugs/bug28751.phpt +++ b/ext/soap/tests/bugs/bug28751.phpt @@ -5,11 +5,11 @@ Bug #28751 (SoapServer does not call _autoload()) --FILE-- <?php spl_autoload_register(function ($className) { - class SoapServerActions { + class SoapServerActions { function test() { return "Hello World"; } - } + } }); $server = new SoapServer(NULL, array('uri'=>"http://testuri.org")); diff --git a/ext/soap/tests/bugs/bug29795.phpt b/ext/soap/tests/bugs/bug29795.phpt index fce064ef43..38d4da3a8d 100644 --- a/ext/soap/tests/bugs/bug29795.phpt +++ b/ext/soap/tests/bugs/bug29795.phpt @@ -14,9 +14,9 @@ class LocalSoapClient extends SoapClient { function __doRequest($request, $location, $action, $version, $one_way = 0) { return <<<EOF -<?xml version="1.0" encoding="UTF-8"?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" -xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<?xml version="1.0" encoding="UTF-8"?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" +xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><SOAP-ENV:Body><Price><Amount>3995</Amount><CurrencyCode>USD</CurrencyCode></Price></SOAP-ENV:Body></SOAP-ENV:Envelope> EOF; } diff --git a/ext/soap/tests/bugs/bug30045.phpt b/ext/soap/tests/bugs/bug30045.phpt index 21889c2fd1..63fbadc639 100644 --- a/ext/soap/tests/bugs/bug30045.phpt +++ b/ext/soap/tests/bugs/bug30045.phpt @@ -42,12 +42,12 @@ $soap = new LocalSoapClient(NULL, array("uri"=>"http://test-uri", "location"=>"t function test($type, $num) { global $soap; try { - printf(" %0.0f\n ", $num); - $ret = $soap->foo($type, new SoapVar($num, $type)); - printf(" %0.0f\n", $ret); - } catch (SoapFault $ex) { - var_dump($ex); - } + printf(" %0.0f\n ", $num); + $ret = $soap->foo($type, new SoapVar($num, $type)); + printf(" %0.0f\n", $ret); + } catch (SoapFault $ex) { + var_dump($ex); + } } /* echo "byte\n"; diff --git a/ext/soap/tests/bugs/bug30106.phpt b/ext/soap/tests/bugs/bug30106.phpt index b02b1bded2..96709d6aa3 100644 --- a/ext/soap/tests/bugs/bug30106.phpt +++ b/ext/soap/tests/bugs/bug30106.phpt @@ -7,25 +7,25 @@ Bug #30106 (SOAP cannot not parse 'ref' element. Causes Uncaught SoapFault excep ini_set("soap.wsdl_cache_enabled", 0); function getContinentList() { - return array("getContinentListResult"=>array( - "schema"=>"<xsd:schema><element name=\"test\" type=\"xsd:string\"/></xsd:schema>", - "any"=>"<test>Hello World!</test><test>Bye World!</test>")); + return array("getContinentListResult"=>array( + "schema"=>"<xsd:schema><element name=\"test\" type=\"xsd:string\"/></xsd:schema>", + "any"=>"<test>Hello World!</test><test>Bye World!</test>")); } class LocalSoapClient extends SoapClient { function __construct($wsdl, $options=array()) { parent::__construct($wsdl, $options); $this->server = new SoapServer($wsdl, $options); - $this->server->addFunction("getContinentList"); + $this->server->addFunction("getContinentList"); } function __doRequest($request, $location, $action, $version, $one_way = 0) { - echo $request; + echo $request; ob_start(); $this->server->handle($request); $response = ob_get_contents(); ob_end_clean(); - echo $response; + echo $response; return $response; } } diff --git a/ext/soap/tests/bugs/bug30799.phpt b/ext/soap/tests/bugs/bug30799.phpt index 92fd40f452..81079efbb7 100644 --- a/ext/soap/tests/bugs/bug30799.phpt +++ b/ext/soap/tests/bugs/bug30799.phpt @@ -5,9 +5,9 @@ Bug #30799 (SoapServer doesn't handle private or protected properties) --FILE-- <?php class foo { - public $a="a"; - private $b="b"; - protected $c="c"; + public $a="a"; + private $b="b"; + protected $c="c"; } diff --git a/ext/soap/tests/bugs/bug30928.phpt b/ext/soap/tests/bugs/bug30928.phpt index ace71764f9..89b61cc019 100644 --- a/ext/soap/tests/bugs/bug30928.phpt +++ b/ext/soap/tests/bugs/bug30928.phpt @@ -7,9 +7,9 @@ Bug #30928 (When Using WSDL, SoapServer doesn't handle private or protected prop ini_set("soap.wsdl_cache_enabled", 0); class foo { - public $a="a"; - private $b="b"; - protected $c="c"; + public $a="a"; + private $b="b"; + protected $c="c"; } function test($x) { diff --git a/ext/soap/tests/bugs/bug30994.phpt b/ext/soap/tests/bugs/bug30994.phpt index afd5018a38..d91783cfd0 100644 --- a/ext/soap/tests/bugs/bug30994.phpt +++ b/ext/soap/tests/bugs/bug30994.phpt @@ -7,28 +7,28 @@ Bug #30994 (SOAP server unable to handle request with references) $HTTP_RAW_POST_DATA = <<<EOF <?xml version="1.0" encoding="utf-8"?> <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://spock/kunta/kunta" - xmlns:types="http://spock/kunta/kunta/encodedTypes" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:tns="http://spock/kunta/kunta" + xmlns:types="http://spock/kunta/kunta/encodedTypes" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <soap:Body soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> - <q1:bassCall xmlns:q1="http://spock/bass/types/kunta"> - <system xsi:type="xsd:string">XXX</system> - <function xsi:type="xsd:string">TASKTEST</function> - <parameter href="#id1" /> - </q1:bassCall> + <q1:bassCall xmlns:q1="http://spock/bass/types/kunta"> + <system xsi:type="xsd:string">XXX</system> + <function xsi:type="xsd:string">TASKTEST</function> + <parameter href="#id1" /> + </q1:bassCall> - <soapenc:Array id="id1" soapenc:arrayType="tns:Item[1]"> - <Item href="#id2" /> - </soapenc:Array> + <soapenc:Array id="id1" soapenc:arrayType="tns:Item[1]"> + <Item href="#id2" /> + </soapenc:Array> - <tns:Item id="id2" xsi:type="tns:Item"> - <key xsi:type="xsd:string">ABCabc123</key> - <val xsi:type="xsd:string">123456</val> - </tns:Item> + <tns:Item id="id2" xsi:type="tns:Item"> + <key xsi:type="xsd:string">ABCabc123</key> + <val xsi:type="xsd:string">123456</val> + </tns:Item> </soap:Body> </soap:Envelope> diff --git a/ext/soap/tests/bugs/bug31422.phpt b/ext/soap/tests/bugs/bug31422.phpt index 4889b10d8e..c653d5e2f3 100644 --- a/ext/soap/tests/bugs/bug31422.phpt +++ b/ext/soap/tests/bugs/bug31422.phpt @@ -10,8 +10,8 @@ error_log= --FILE-- <?php function Add($x,$y) { - fopen(); - user_error("Hello", E_USER_ERROR); + fopen(); + user_error("Hello", E_USER_ERROR); return $x+$y; } @@ -39,7 +39,6 @@ $server->handle($HTTP_RAW_POST_DATA); echo "ok\n"; ?> --EXPECTF-- -PHP Warning: fopen() expects at least 2 parameters, 0 given in %sbug31422.php on line %d -PHP Fatal error: Hello in %sbug31422.php on line %d <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Hello</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope> +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>fopen() expects at least 2 parameters, 0 given</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope> +ok diff --git a/ext/soap/tests/bugs/bug31695.phpt b/ext/soap/tests/bugs/bug31695.phpt index 708d489a0d..abf4168c30 100644 --- a/ext/soap/tests/bugs/bug31695.phpt +++ b/ext/soap/tests/bugs/bug31695.phpt @@ -7,18 +7,18 @@ Bug #31695 (Cannot redefine endpoint when using WSDL) ini_set("soap.wsdl_cache_enabled", 0); function Test($x) { - return $x; + return $x; } class LocalSoapClient extends SoapClient { function __construct($wsdl, $options=array()) { parent::__construct($wsdl, $options); $this->server = new SoapServer($wsdl, $options); - $this->server->addFunction("Test"); + $this->server->addFunction("Test"); } function __doRequest($request, $location, $action, $version, $one_way = 0) { - echo "$location\n"; + echo "$location\n"; ob_start(); $this->server->handle($request); $response = ob_get_contents(); diff --git a/ext/soap/tests/bugs/bug31755.phpt b/ext/soap/tests/bugs/bug31755.phpt index 1d65b3a42b..600fd43058 100644 --- a/ext/soap/tests/bugs/bug31755.phpt +++ b/ext/soap/tests/bugs/bug31755.phpt @@ -14,6 +14,6 @@ $response= $client->__call('function', array(), null, $header); print $client->__getLastRequest(); ?> --EXPECTF-- -Warning: SoapHeader::SoapHeader(): Invalid namespace in %s on line %d +Warning: SoapHeader::__construct(): Invalid namespace in %s on line %d <?xml version="1.0" encoding="UTF-8"?> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="myNS" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Header/><SOAP-ENV:Body><ns1:function/></SOAP-ENV:Body></SOAP-ENV:Envelope> diff --git a/ext/soap/tests/bugs/bug32776.phpt b/ext/soap/tests/bugs/bug32776.phpt index 316b0e15ed..978dce877d 100644 --- a/ext/soap/tests/bugs/bug32776.phpt +++ b/ext/soap/tests/bugs/bug32776.phpt @@ -10,8 +10,8 @@ soap.wsdl_cache_enabled=0 $d = null; function test($x) { - global $d; - $d = $x; + global $d; + $d = $x; } class LocalSoapClient extends SoapClient { diff --git a/ext/soap/tests/bugs/bug32941.phpt b/ext/soap/tests/bugs/bug32941.phpt index cbab7008d7..59bd06992b 100644 --- a/ext/soap/tests/bugs/bug32941.phpt +++ b/ext/soap/tests/bugs/bug32941.phpt @@ -6,28 +6,28 @@ Bug #32941 (Sending structured exception kills a php) <?php class TestSoapClient extends SoapClient { function __doRequest($request, $location, $action, $version, $one_way = 0) { - return <<<EOF + return <<<EOF <?xml version="1.0" encoding="UTF-8"?> <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <soapenv:Body> - <soapenv:Fault> - <faultcode>soapenv:Server.userException</faultcode> - <faultstring>service.EchoServiceException</faultstring> - <detail> - <service.EchoServiceException xsi:type="ns1:EchoServiceException" xmlns:ns1="urn:service.EchoService"> - <intParameter xsi:type="xsd:int">105</intParameter> - <parameter xsi:type="soapenc:string" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">string param</parameter> - </service.EchoServiceException> - <ns2:hostname xmlns:ns2="http://xml.apache.org/axis/">steckovic</ns2:hostname> - </detail> - </soapenv:Fault> - </soapenv:Body> + <soapenv:Body> + <soapenv:Fault> + <faultcode>soapenv:Server.userException</faultcode> + <faultstring>service.EchoServiceException</faultstring> + <detail> + <service.EchoServiceException xsi:type="ns1:EchoServiceException" xmlns:ns1="urn:service.EchoService"> + <intParameter xsi:type="xsd:int">105</intParameter> + <parameter xsi:type="soapenc:string" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">string param</parameter> + </service.EchoServiceException> + <ns2:hostname xmlns:ns2="http://xml.apache.org/axis/">steckovic</ns2:hostname> + </detail> + </soapenv:Fault> + </soapenv:Body> </soapenv:Envelope> EOF; - } + } } ini_set("soap.wsdl_cache_enabled", 1); diff --git a/ext/soap/tests/bugs/bug34449.phpt b/ext/soap/tests/bugs/bug34449.phpt index f5766e29bc..f4aa222477 100644 --- a/ext/soap/tests/bugs/bug34449.phpt +++ b/ext/soap/tests/bugs/bug34449.phpt @@ -6,8 +6,8 @@ Bug #34449 (ext/soap: XSD_ANYXML functionality not exposed) <?php class TestSoapClient extends SoapClient { function __doRequest($request, $location, $action, $version, $one_way = 0) { - echo "$request\n"; - exit; + echo "$request\n"; + exit; } } diff --git a/ext/soap/tests/bugs/bug34643.phpt b/ext/soap/tests/bugs/bug34643.phpt index 7430b34474..a4acfa35d6 100644 --- a/ext/soap/tests/bugs/bug34643.phpt +++ b/ext/soap/tests/bugs/bug34643.phpt @@ -9,9 +9,9 @@ soap.wsdl_cache_enabled=0 ini_set("soap.wsdl_cache_enabled", 0); class fp { - public function get_it($opt="zzz") { - return $opt; - } + public function get_it($opt="zzz") { + return $opt; + } } class LocalSoapClient extends SoapClient { diff --git a/ext/soap/tests/bugs/bug34657.phpt b/ext/soap/tests/bugs/bug34657.phpt index 8c182ad7d4..ddf5d2fee0 100644 --- a/ext/soap/tests/bugs/bug34657.phpt +++ b/ext/soap/tests/bugs/bug34657.phpt @@ -7,14 +7,14 @@ require_once('skipif.inc'); --FILE-- <?php try { - $client = new SoapClient('http://i_dont_exist.com/some.wsdl'); - echo "?\n"; + $client = new SoapClient('http://i_dont_exist.com/some.wsdl'); + echo "?\n"; } catch (SoapFault $e) { - echo get_class($e)."\n"; - echo $e->faultstring."\n"; - echo "ok\n"; + echo get_class($e)."\n"; + echo $e->faultstring."\n"; + echo "ok\n"; } catch (Exception $e) { - echo get_class($e)."\n"; + echo get_class($e)."\n"; } ?> --EXPECTF-- diff --git a/ext/soap/tests/bugs/bug35142.phpt b/ext/soap/tests/bugs/bug35142.phpt index f10885767c..840dc8e9a8 100644 --- a/ext/soap/tests/bugs/bug35142.phpt +++ b/ext/soap/tests/bugs/bug35142.phpt @@ -11,8 +11,8 @@ $timestamp = "2005-11-08T11:22:07+03:00"; $wsdl = __DIR__."/bug35142.wsdl"; function PostEvents($x) { - var_dump($x); - exit(); + var_dump($x); + exit(); return $x; } @@ -25,7 +25,7 @@ class TestSoapClient extends SoapClient { } function __doRequest($request, $location, $action, $version, $one_way = 0) { - echo "$request\n"; + echo "$request\n"; $this->server->handle($request); return $response; } @@ -33,10 +33,10 @@ class TestSoapClient extends SoapClient { } $soapClient = new TestSoapClient($wsdl, - array('trace' => 1, 'exceptions' => 0, - 'classmap' => array('logOnEvent' => 'LogOnEvent', - 'logOffEvent' => 'LogOffEvent', - 'events' => 'IVREvents'))); + array('trace' => 1, 'exceptions' => 0, + 'classmap' => array('logOnEvent' => 'LogOnEvent', + 'logOffEvent' => 'LogOffEvent', + 'events' => 'IVREvents'))); $logOnEvent = new LogOnEvent(34567, $timestamp); $logOffEvents[] = new LogOffEvent(34567, $timestamp, "Smoked"); diff --git a/ext/soap/tests/bugs/bug35273.phpt b/ext/soap/tests/bugs/bug35273.phpt index f04dc68646..72c44adbb3 100644 --- a/ext/soap/tests/bugs/bug35273.phpt +++ b/ext/soap/tests/bugs/bug35273.phpt @@ -8,9 +8,9 @@ soap.wsdl_cache_enabled=0 <?php class TestSoapClient extends SoapClient { function __doRequest($request, $location, $action, $version, $one_way = 0) { - echo $request; - exit; - } + echo $request; + exit; + } } ini_set("soap.wsdl_cache_enabled", 0); diff --git a/ext/soap/tests/bugs/bug36226.phpt b/ext/soap/tests/bugs/bug36226.phpt index a54b687f95..5bb3db9fe7 100644 --- a/ext/soap/tests/bugs/bug36226.phpt +++ b/ext/soap/tests/bugs/bug36226.phpt @@ -11,8 +11,8 @@ $timestamp = "2005-11-08T11:22:07+03:00"; $wsdl = __DIR__."/bug35142.wsdl"; function PostEvents($x) { - var_dump($x); - exit(); + var_dump($x); + exit(); return $x; } @@ -25,7 +25,7 @@ class TestSoapClient extends SoapClient { } function __doRequest($request, $location, $action, $version, $one_way = 0) { - echo "$request\n"; + echo "$request\n"; $this->server->handle($request); return $response; } @@ -33,11 +33,11 @@ class TestSoapClient extends SoapClient { } $soapClient = new TestSoapClient($wsdl, - array('trace' => 1, 'exceptions' => 0, - 'classmap' => array('logOnEvent' => 'LogOnEvent', - 'logOffEvent' => 'LogOffEvent', - 'events' => 'IVREvents'), - 'features' => SOAP_SINGLE_ELEMENT_ARRAYS)); + array('trace' => 1, 'exceptions' => 0, + 'classmap' => array('logOnEvent' => 'LogOnEvent', + 'logOffEvent' => 'LogOffEvent', + 'events' => 'IVREvents'), + 'features' => SOAP_SINGLE_ELEMENT_ARRAYS)); $logOnEvent = new LogOnEvent(34567, $timestamp); $logOffEvents[] = new LogOffEvent(34567, $timestamp, "Smoked"); diff --git a/ext/soap/tests/bugs/bug36575.phpt b/ext/soap/tests/bugs/bug36575.phpt index 8e5f469546..dd5a5d99f1 100644 --- a/ext/soap/tests/bugs/bug36575.phpt +++ b/ext/soap/tests/bugs/bug36575.phpt @@ -7,24 +7,24 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php abstract class CT_A1 { - public $var1; + public $var1; } class CT_A2 extends CT_A1 { - public $var2; + public $var2; } class CT_A3 extends CT_A2 { - public $var3; + public $var3; } // returns A2 in WSDL function test( $a1 ) { - $a3 = new CT_A3(); - $a3->var1 = $a1->var1; - $a3->var2 = "var two"; - $a3->var3 = "var three"; - return $a3; + $a3 = new CT_A3(); + $a3->var1 = $a1->var1; + $a3->var2 = "var two"; + $a3->var3 = "var three"; + return $a3; } $classMap = array("A1" => "CT_A1", "A2" => "CT_A2", "A3" => "CT_A3"); diff --git a/ext/soap/tests/bugs/bug36999.phpt b/ext/soap/tests/bugs/bug36999.phpt index 443e90418f..c9d03f57bd 100644 --- a/ext/soap/tests/bugs/bug36999.phpt +++ b/ext/soap/tests/bugs/bug36999.phpt @@ -36,12 +36,12 @@ $soap = new LocalSoapClient(__DIR__."/bug36999.wsdl"); function test($num) { global $soap; try { - printf("%s %0.0f\n", gettype($num), $num); - $ret = $soap->echoLong($num); - printf("%s %0.0f\n", gettype($ret), $ret); - } catch (SoapFault $ex) { - var_dump($ex); - } + printf("%s %0.0f\n", gettype($num), $num); + $ret = $soap->echoLong($num); + printf("%s %0.0f\n", gettype($ret), $ret); + } catch (SoapFault $ex) { + var_dump($ex); + } } test(3706790240); ?> diff --git a/ext/soap/tests/bugs/bug37083.phpt b/ext/soap/tests/bugs/bug37083.phpt index cfd698e4be..89b808eaa1 100644 --- a/ext/soap/tests/bugs/bug37083.phpt +++ b/ext/soap/tests/bugs/bug37083.phpt @@ -7,8 +7,8 @@ soap.wsdl_cache=3 --FILE-- <?php class TestSoapClient extends SoapClient { - function __doRequest($request, $location, $action, $version, $one_way = 0) { - return <<<EOF + function __doRequest($request, $location, $action, $version, $one_way = 0) { + return <<<EOF <?xml version="1.0" encoding="utf-8"?> <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <soapenv:Body> @@ -38,19 +38,19 @@ class TestSoapClient extends SoapClient { <multiRef id="id12" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns22:Map" xmlns:ns22="http://xml.apache.org/xml-soap" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"><item><key xsi:type="soapenc:string">maxDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2038-12-31T22:59:59.000Z</value></value></item><item><key xsi:type="soapenc:string">minDateTime</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="xsd:dateTime">2004-11-01T16:58:00.000Z</value></value></item><item><key xsi:type="soapenc:string">minLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">108.11</value></value></item><item><key xsi:type="soapenc:string">maxLongitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">113.383</value></value></item><item><key xsi:type="soapenc:string">maxLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-31.666</value></value></item><item><key xsi:type="soapenc:string">minLatitude</key><value soapenc:arrayType="xsd:anyType[1]" xsi:type="soapenc:Array"><value xsi:type="soapenc:double">-35.075</value></value></item></multiRef> </soapenv:Body></soapenv:Envelope> EOF; - } + } } for ($i = 0; $i < 10; $i++) { - $ws=new TestSoapClient(__DIR__.'/bug37083.wsdl', + $ws=new TestSoapClient(__DIR__.'/bug37083.wsdl', array('encoding'=>'ISO-8859-1', 'cache_wsdl'=>WSDL_CACHE_BOTH)); - $search=new stdClass(); - $search->queryString='argo'; - $search->ranges[]=$r=new stdClass(); - $r->field='maxDateTime'; - $r->min='2003-04-01'; - $search->index='all'; - $res=$ws->search($search,0,10); + $search=new stdClass(); + $search->queryString='argo'; + $search->ranges[]=$r=new stdClass(); + $r->field='maxDateTime'; + $r->min='2003-04-01'; + $search->index='all'; + $res=$ws->search($search,0,10); } echo "ok\n"; ?> diff --git a/ext/soap/tests/bugs/bug38004.phpt b/ext/soap/tests/bugs/bug38004.phpt index 43d3e86d02..81b8ffc503 100644 --- a/ext/soap/tests/bugs/bug38004.phpt +++ b/ext/soap/tests/bugs/bug38004.phpt @@ -7,9 +7,9 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php function Test($param) { - global $g; - $g = $param->strA."\n".$param->strB."\n"; - return $g; + global $g; + $g = $param->strA."\n".$param->strB."\n"; + return $g; } class TestSoapClient extends SoapClient { diff --git a/ext/soap/tests/bugs/bug38005.phpt b/ext/soap/tests/bugs/bug38005.phpt index 6557867277..6219141ab9 100644 --- a/ext/soap/tests/bugs/bug38005.phpt +++ b/ext/soap/tests/bugs/bug38005.phpt @@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php function Test($param=NULL) { - return new SoapFault('Test', 'This is our fault: Ä'); + return new SoapFault('Test', 'This is our fault: Ä'); } class TestSoapClient extends SoapClient { @@ -28,11 +28,11 @@ class TestSoapClient extends SoapClient { $client = new TestSoapClient(NULL, array( 'encoding' => 'ISO-8859-1', - 'uri' => "test://", - 'location' => "test://", - 'soap_version'=>SOAP_1_2, - 'trace'=>1, - 'exceptions'=>0)); + 'uri' => "test://", + 'location' => "test://", + 'soap_version'=>SOAP_1_2, + 'trace'=>1, + 'exceptions'=>0)); $res = $client->Test(); echo($res->faultstring."\n"); echo($client->__getLastResponse()); diff --git a/ext/soap/tests/bugs/bug38055.phpt b/ext/soap/tests/bugs/bug38055.phpt index 7b5ed49a27..df97e1034d 100644 --- a/ext/soap/tests/bugs/bug38055.phpt +++ b/ext/soap/tests/bugs/bug38055.phpt @@ -7,10 +7,10 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php function Test($param) { - global $g1, $g2; - $g1 = $param->boolA; - $g2 = $param->boolB; - return 1; + global $g1, $g2; + $g1 = $param->boolA; + $g2 = $param->boolB; + return 1; } class TestSoapClient extends SoapClient { diff --git a/ext/soap/tests/bugs/bug38067.phpt b/ext/soap/tests/bugs/bug38067.phpt index 7664135de3..0b935f30c2 100644 --- a/ext/soap/tests/bugs/bug38067.phpt +++ b/ext/soap/tests/bugs/bug38067.phpt @@ -7,9 +7,9 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php function Test($param) { - global $g; - $g = $param->str; - return $g; + global $g; + $g = $param->str; + return $g; } class TestSoapClient extends SoapClient { @@ -29,7 +29,7 @@ class TestSoapClient extends SoapClient { } $client = new TestSoapClient(__DIR__.'/bug38067.wsdl', - array('encoding' => 'ISO-8859-1')); + array('encoding' => 'ISO-8859-1')); $str = 'test: Ä'; $res = $client->Test(array('str'=>$str)); echo $str."\n"; diff --git a/ext/soap/tests/bugs/bug41004.phpt b/ext/soap/tests/bugs/bug41004.phpt index c38bf0d62b..442e147bbc 100644 --- a/ext/soap/tests/bugs/bug41004.phpt +++ b/ext/soap/tests/bugs/bug41004.phpt @@ -7,17 +7,17 @@ Bug #41004 (minOccurs="0" and null class member variable) ini_set('soap.wsdl_cache_enabled', false); class EchoBean{ - public $mandatoryElement; - public $optionalElement; + public $mandatoryElement; + public $optionalElement; } class EchoRequest{ - public $in; + public $in; } class EchoResponse{ - public $out; + public $out; } $wsdl = __DIR__."/bug41004.wsdl"; diff --git a/ext/soap/tests/bugs/bug41566.phpt b/ext/soap/tests/bugs/bug41566.phpt index 03ecdde043..557c61780a 100644 --- a/ext/soap/tests/bugs/bug41566.phpt +++ b/ext/soap/tests/bugs/bug41566.phpt @@ -44,8 +44,8 @@ echo "ok\n"; $HTTP_RAW_POST_DATA = <<<EOF <?xml version="1.0" encoding="UTF-8"?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" - xmlns:ns1="http://testuri.org" +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" + xmlns:ns1="http://testuri.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"> <env:Body> diff --git a/ext/soap/tests/bugs/bug42086.phpt b/ext/soap/tests/bugs/bug42086.phpt index bdaf55ac83..0d4d30486f 100644 --- a/ext/soap/tests/bugs/bug42086.phpt +++ b/ext/soap/tests/bugs/bug42086.phpt @@ -12,17 +12,17 @@ $request = <<<EOF EOF; class firstFunctionWithoutParamResponse { - public $param; + public $param; } function firstFunctionWithoutParam() { - $ret = new firstFunctionWithoutParamResponse(); - $ret->param = "firstFunctionWithoutParam"; - return $ret; + $ret = new firstFunctionWithoutParamResponse(); + $ret->param = "firstFunctionWithoutParam"; + return $ret; } $server = new SoapServer(__DIR__.'/bug42086.wsdl', - array('features'=>SOAP_SINGLE_ELEMENT_ARRAYS)); + array('features'=>SOAP_SINGLE_ELEMENT_ARRAYS)); $server->addFunction('firstFunctionWithoutParam'); $server->handle($request); ?> diff --git a/ext/soap/tests/bugs/bug42151.phpt b/ext/soap/tests/bugs/bug42151.phpt index ee53e6d525..f945a8753e 100644 --- a/ext/soap/tests/bugs/bug42151.phpt +++ b/ext/soap/tests/bugs/bug42151.phpt @@ -5,23 +5,23 @@ Bug #42151 (__destruct functions not called after catching a SoapFault exception --FILE-- <?php class foo { - function __construct(){ - $foo = @ new SoapClient('httpx://'); - } - function __destruct(){ - echo 'I never get executed.' . "\n"; - } + function __construct(){ + $foo = @ new SoapClient('httpx://'); + } + function __destruct(){ + echo 'I never get executed.' . "\n"; + } } class bar { - function __destruct(){ - echo 'I don\'t get executed either.' . "\n"; - } + function __destruct(){ + echo 'I don\'t get executed either.' . "\n"; + } } try { - $bar = new bar(); - $foo = new foo(); + $bar = new bar(); + $foo = new foo(); } catch (Exception $e){ - echo $e->getMessage() . "\n"; + echo $e->getMessage() . "\n"; } echo "ok\n"; ?> diff --git a/ext/soap/tests/bugs/bug42183.phpt b/ext/soap/tests/bugs/bug42183.phpt index 043487c964..0fed7f1d54 100644 --- a/ext/soap/tests/bugs/bug42183.phpt +++ b/ext/soap/tests/bugs/bug42183.phpt @@ -13,11 +13,11 @@ $req = <<<EOF EOF; function test() { - return new PHPObject(); + return new PHPObject(); } $server = new SoapServer(NULL, array('uri' => 'http://ws.sit.com', - 'classmap' => array('Object' => 'PHPObject'))); + 'classmap' => array('Object' => 'PHPObject'))); $server->addFunction("test"); ob_start(); $server->handle($req); diff --git a/ext/soap/tests/bugs/bug42214.phpt b/ext/soap/tests/bugs/bug42214.phpt index a31f16dcb4..64cd631bc7 100644 --- a/ext/soap/tests/bugs/bug42214.phpt +++ b/ext/soap/tests/bugs/bug42214.phpt @@ -10,12 +10,12 @@ $request = <<<EOF EOF; function test() { - $a = $b; - obvious_error(); // will cause an error + $a = $b; + obvious_error(); // will cause an error } $server = new SoapServer(NULL, array('uri' =>'http://localhost/server.php', - 'send_errors'=>0)); + 'send_errors'=>0)); $server->addFunction('test'); $server->handle($request); ?> diff --git a/ext/soap/tests/bugs/bug42692.phpt b/ext/soap/tests/bugs/bug42692.phpt index b221a3a862..0a1310ab9e 100644 --- a/ext/soap/tests/bugs/bug42692.phpt +++ b/ext/soap/tests/bugs/bug42692.phpt @@ -7,32 +7,32 @@ Bug #42692 (Procedure 'int1' not present with doc/lit SoapServer) ini_set('soap.wsdl_cache_enabled','0'); function checkAuth($peid,$auth) { - return $peid; + return $peid; } class TestSoap extends SoapClient { - function __construct($wsdl, $options) { - parent::__construct($wsdl, $options); - $this->server = new SoapServer($wsdl, $options); - $this->server->addFunction("checkAuth"); - } + function __construct($wsdl, $options) { + parent::__construct($wsdl, $options); + $this->server = new SoapServer($wsdl, $options); + $this->server->addFunction("checkAuth"); + } - function __doRequest($request, $location, $action, $version, $one_way = 0) { - ob_start(); - $this->server->handle($request); - $response = ob_get_contents(); - ob_end_clean(); - return $response; - } + function __doRequest($request, $location, $action, $version, $one_way = 0) { + ob_start(); + $this->server->handle($request); + $response = ob_get_contents(); + ob_end_clean(); + return $response; + } } $client = new TestSoap(__DIR__ . "/bug42692.wsdl", array("trace"=>1)); try { - $result = $client->checkAuth(1,"two"); - echo "Auth for 1 is $result\n"; + $result = $client->checkAuth(1,"two"); + echo "Auth for 1 is $result\n"; } catch (Exception $e) { - echo $e->getMessage(); + echo $e->getMessage(); } ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug43045.phpt b/ext/soap/tests/bugs/bug43045.phpt index f4f3983800..9c2139276d 100644 --- a/ext/soap/tests/bugs/bug43045.phpt +++ b/ext/soap/tests/bugs/bug43045.phpt @@ -36,11 +36,11 @@ xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"> } } $client = new TestSoapClient(NULL, array( - "location" => "test://", - "uri" => 'urn:TestSOAP', - "style" => SOAP_RPC, - "use" => SOAP_ENCODED - )); + "location" => "test://", + "uri" => 'urn:TestSOAP', + "style" => SOAP_RPC, + "use" => SOAP_ENCODED + )); var_dump($client->test(0.1)); var_dump($client->test(NAN)); var_dump($response = $client->test(INF)); diff --git a/ext/soap/tests/bugs/bug44882.phpt b/ext/soap/tests/bugs/bug44882.phpt index 128011722f..8357b0c979 100644 --- a/ext/soap/tests/bugs/bug44882.phpt +++ b/ext/soap/tests/bugs/bug44882.phpt @@ -9,10 +9,10 @@ soap.wsdl_cache_enabled=0 class TestSoapClient extends SoapClient { public function __doRequest($req, $loc, $act, $ver, $one_way = 0) - { - return <<<XML + { + return <<<XML <?xml version="1.0" encoding="UTF-8"?> -<SOAP-ENV:Envelope +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns="urn:ebay:api:PayPalAPI"> @@ -35,7 +35,7 @@ class TestSoapClient extends SoapClient </SOAP-ENV:Body> </SOAP-ENV:Envelope> XML; - } + } } $client = new TestSoapClient(__DIR__.'/bug44882.wsdl'); diff --git a/ext/soap/tests/bugs/bug46427.phpt b/ext/soap/tests/bugs/bug46427.phpt index 38d53518b8..3d0b1a4d51 100644 --- a/ext/soap/tests/bugs/bug46427.phpt +++ b/ext/soap/tests/bugs/bug46427.phpt @@ -8,10 +8,10 @@ Bug #46427 (SoapClient() stumbles over its "stream_context" parameter) function getSoapClient_1() { $ctx = stream_context_create(); return new SoapClient(NULL, array( - 'stream_context' => $ctx, - 'location' => 'test://', - 'uri' => 'test://', - 'exceptions' => false)); + 'stream_context' => $ctx, + 'location' => 'test://', + 'uri' => 'test://', + 'exceptions' => false)); } getSoapClient_1()->__soapCall('Help', array()); diff --git a/ext/soap/tests/bugs/bug47049.phpt b/ext/soap/tests/bugs/bug47049.phpt index 467df2b901..7ffc15d0cd 100644 --- a/ext/soap/tests/bugs/bug47049.phpt +++ b/ext/soap/tests/bugs/bug47049.phpt @@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $client = new SoapClient(__DIR__ . '/bug47049.wsdl', - array('trace' => 1 , 'exceptions' => 0)); + array('trace' => 1 , 'exceptions' => 0)); $host = array('uuid' => 'foo'); $software_list = array(array('name' => 'package', 'version' => '1.2.3', 'state' => 'installed')); $updates = array(); diff --git a/ext/soap/tests/bugs/bug47273.phpt b/ext/soap/tests/bugs/bug47273.phpt index c23bb5a592..a393b701ab 100644 --- a/ext/soap/tests/bugs/bug47273.phpt +++ b/ext/soap/tests/bugs/bug47273.phpt @@ -16,12 +16,12 @@ EOF; class SoapFaultTest { public function test1() { - // Test #1 + // Test #1 return 'Test #1 exception with some special chars: Äßö'; } public function test2() { // Test #2 - //throw new SoapFault('Server', 'Test #2 exception with some special chars: Äßö'); + //throw new SoapFault('Server', 'Test #2 exception with some special chars: Äßö'); throw new Exception('Test #2 exception with some special chars: Äßö'); } } @@ -32,9 +32,9 @@ $server = new SoapServer(null, array( $server->setClass('SoapFaultTest'); try { - $server->handle($request1); + $server->handle($request1); } catch (Exception $e) { - $server->fault("Sender", $e->getMessage()); + $server->fault("Sender", $e->getMessage()); } try { $server->handle($request2); diff --git a/ext/soap/tests/bugs/bug50675.phpt b/ext/soap/tests/bugs/bug50675.phpt index 017671620b..00350b1000 100644 --- a/ext/soap/tests/bugs/bug50675.phpt +++ b/ext/soap/tests/bugs/bug50675.phpt @@ -13,29 +13,29 @@ class TestSoapClient extends SoapClient { xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <soapenv:Body> - <soapenv:Fault> - <faultcode>soapenv:Server.userException</faultcode> - <faultstring>service.EchoServiceException</faultstring> - <detail> - <service.EchoServiceException xsi:type="ns1:EchoServiceException" xmlns:ns1="urn:service.EchoService"> - <intParameter xsi:type="xsd:int">105</intParameter> - <parameter xsi:type="soapenc:string" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">string param</parameter> - </service.EchoServiceException> - <ns2:hostname xmlns:ns2="http://xml.apache.org/axis/">steckovic</ns2:hostname> - </detail> - </soapenv:Fault> - </soapenv:Body> + <soapenv:Body> + <soapenv:Fault> + <faultcode>soapenv:Server.userException</faultcode> + <faultstring>service.EchoServiceException</faultstring> + <detail> + <service.EchoServiceException xsi:type="ns1:EchoServiceException" xmlns:ns1="urn:service.EchoService"> + <intParameter xsi:type="xsd:int">105</intParameter> + <parameter xsi:type="soapenc:string" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">string param</parameter> + </service.EchoServiceException> + <ns2:hostname xmlns:ns2="http://xml.apache.org/axis/">steckovic</ns2:hostname> + </detail> + </soapenv:Fault> + </soapenv:Body> </soapenv:Envelope> EOF; - } + } } ini_set('soap.wsdl_cache_enabled', 0); $parameters = [ - 'trace' => 1, - 'exceptions' => 0, + 'trace' => 1, + 'exceptions' => 0, ]; $client = new TestSoapClient(__DIR__ . '/bug50675.wsdl', $parameters); diff --git a/ext/soap/tests/bugs/bug50698_1.phpt b/ext/soap/tests/bugs/bug50698_1.phpt index 6f97b62e06..064ef1eea8 100644 --- a/ext/soap/tests/bugs/bug50698_1.phpt +++ b/ext/soap/tests/bugs/bug50698_1.phpt @@ -1,5 +1,5 @@ --TEST-- -Request #50698_1 (SoapClient should handle wsdls with some incompatiable endpoints) +Request #50698_1 (SoapClient should handle wsdls with some incompatible endpoints) --SKIPIF-- <?php require_once('skipif.inc'); ?> --INI-- diff --git a/ext/soap/tests/bugs/bug50698_2.phpt b/ext/soap/tests/bugs/bug50698_2.phpt index 994d78dce9..ac2214e830 100644 --- a/ext/soap/tests/bugs/bug50698_2.phpt +++ b/ext/soap/tests/bugs/bug50698_2.phpt @@ -1,5 +1,5 @@ --TEST-- -Request #50698_2 (SoapClient should handle wsdls with some incompatiable endpoints -- EDGECASE: Large mix of compatible and incompatiable endpoints.) +Request #50698_2 (SoapClient should handle wsdls with some incompatible endpoints -- EDGECASE: Large mix of compatible and incompatible endpoints.) --SKIPIF-- <?php require_once('skipif.inc'); ?> --INI-- diff --git a/ext/soap/tests/bugs/bug50698_3.phpt b/ext/soap/tests/bugs/bug50698_3.phpt index c2f66a1618..b29ab2b9c8 100644 --- a/ext/soap/tests/bugs/bug50698_3.phpt +++ b/ext/soap/tests/bugs/bug50698_3.phpt @@ -1,5 +1,5 @@ --TEST-- -Request #50698_3 (SoapClient should handle wsdls with some incompatiable endpoints -- EDGECASE: Large set of endpoints all incompatiable.) +Request #50698_3 (SoapClient should handle wsdls with some incompatible endpoints -- EDGECASE: Large set of endpoints all incompatible.) --SKIPIF-- <?php require_once('skipif.inc'); ?> --INI-- diff --git a/ext/soap/tests/bugs/bug50698_4.phpt b/ext/soap/tests/bugs/bug50698_4.phpt index 6240d11892..aea3204661 100644 --- a/ext/soap/tests/bugs/bug50698_4.phpt +++ b/ext/soap/tests/bugs/bug50698_4.phpt @@ -1,5 +1,5 @@ --TEST-- -Request #50698_4 (SoapClient should handle wsdls with some incompatiable endpoints) +Request #50698_4 (SoapClient should handle wsdls with some incompatible endpoints) --SKIPIF-- <?php require_once('skipif.inc'); ?> --INI-- diff --git a/ext/soap/tests/bugs/bug50762.phpt b/ext/soap/tests/bugs/bug50762.phpt index c48c761ea2..d8ed9ce544 100644 --- a/ext/soap/tests/bugs/bug50762.phpt +++ b/ext/soap/tests/bugs/bug50762.phpt @@ -5,13 +5,13 @@ Bug #50762 (in WSDL mode Soap Header handler function only being called if defin --FILE-- <?php class testSoap { - private $auth; - public function authToken($token){ - $this->auth=true; - } - public function testHeader($param){ - return 'header handler ' . ($this->auth ? 'called' : 'not called'); - } + private $auth; + public function authToken($token){ + $this->auth=true; + } + public function testHeader($param){ + return 'header handler ' . ($this->auth ? 'called' : 'not called'); + } } class LocalSoapClient extends SoapClient { @@ -19,7 +19,7 @@ class LocalSoapClient extends SoapClient { function __construct($wsdl, $options) { parent::__construct($wsdl, $options); $this->server = new SoapServer($wsdl, $options); - $this->server->setObject(new testSoap()); + $this->server->setObject(new testSoap()); } function __doRequest($request, $location, $action, $version, $one_way = 0) { @@ -35,9 +35,9 @@ class LocalSoapClient extends SoapClient { $cl = new LocalSoapClient(__DIR__.'/bug50762.wsdl', array('cache_wsdl'=>WSDL_CACHE_NONE, 'trace'=>true)); class authToken{ - public function __construct($token){ - $this->authToken=$token; - } + public function __construct($token){ + $this->authToken=$token; + } } $cl->__setSoapHeaders(array(new SoapHeader('http://sova.pronto.ru/', 'authToken', new authToken('tokendata')))); diff --git a/ext/soap/tests/bugs/bug65018.phpt b/ext/soap/tests/bugs/bug65018.phpt index bbb9b5e42d..762f4f6ec4 100644 --- a/ext/soap/tests/bugs/bug65018.phpt +++ b/ext/soap/tests/bugs/bug65018.phpt @@ -4,24 +4,24 @@ Bug #65018 (SoapHeader problems with SoapServer) <?php require_once('skipif.inc'); ?> --FILE-- <?php - class Tool{ - public function TOKEN($id){ - return new SoapHeader('namespace1', 'TOKEN', $id, true); - } - public function Method(){} - } + class Tool{ + public function TOKEN($id){ + return new SoapHeader('namespace1', 'TOKEN', $id, true); + } + public function Method(){} + } - $input = $input = - '<?xml version="1.0"?>'.PHP_EOL. - '<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="namespace1"'. - ' xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'. - ' xmlns:xsd="http://www.w3.org/2001/XMLSchema">'. - '<SOAP-ENV:Header><ns1:TOKEN soapenv:mustUnderstand="1">abc</ns1:TOKEN></SOAP-ENV:Header>'. - '<SOAP-ENV:Body><ns1:Method /></SOAP-ENV:Body></SOAP-ENV:Envelope>'; + $input = $input = + '<?xml version="1.0"?>'.PHP_EOL. + '<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="namespace1"'. + ' xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'. + ' xmlns:xsd="http://www.w3.org/2001/XMLSchema">'. + '<SOAP-ENV:Header><ns1:TOKEN soapenv:mustUnderstand="1">abc</ns1:TOKEN></SOAP-ENV:Header>'. + '<SOAP-ENV:Body><ns1:Method /></SOAP-ENV:Body></SOAP-ENV:Envelope>'; - $soap = new SoapServer(null, array('uri' => '127.0.0.1')); - $soap->setClass('Tool'); - $soap->handle($input); + $soap = new SoapServer(null, array('uri' => '127.0.0.1')); + $soap->setClass('Tool'); + $soap->handle($input); ?> --EXPECT-- <?xml version="1.0" encoding="UTF-8"?> diff --git a/ext/soap/tests/bugs/bug66112.phpt b/ext/soap/tests/bugs/bug66112.phpt index 743297ac23..7dd067d614 100644 --- a/ext/soap/tests/bugs/bug66112.phpt +++ b/ext/soap/tests/bugs/bug66112.phpt @@ -8,12 +8,12 @@ soap.wsdl_cache_enabled=0 <?php define('WSDL', __DIR__."/bug66112.wsdl"); function Mist($p) { - $client=new soapclient(WSDL, array('typemap'=>array(array("type_ns"=>"uri:mist", "type_name"=>"A")))); - try{ - $client->Mist(array("XX"=>"xx")); - }catch(SoapFault $x){ - } - return array("A"=>"ABC","B"=>"sss"); + $client=new soapclient(WSDL, array('typemap'=>array(array("type_ns"=>"uri:mist", "type_name"=>"A")))); + try{ + $client->Mist(array("XX"=>"xx")); + }catch(SoapFault $x){ + } + return array("A"=>"ABC","B"=>"sss"); } $s = new SoapServer(WSDL, array('typemap'=>array(array("type_ns"=>"uri:mist", "type_name"=>"A")))); $s->addFunction("Mist"); diff --git a/ext/soap/tests/bugs/bug69085.phpt b/ext/soap/tests/bugs/bug69085.phpt index cb27cfd89e..7d7f36e9bd 100644 --- a/ext/soap/tests/bugs/bug69085.phpt +++ b/ext/soap/tests/bugs/bug69085.phpt @@ -9,9 +9,9 @@ soap.wsdl_cache_enabled=0 $dummy = unserialize('O:10:"SoapClient":5:{s:3:"uri";s:1:"a";s:8:"location";s:22:"http://localhost/a.xml";s:17:"__default_headers";i:1337;s:15:"__last_response";s:1:"a";s:5:"trace";s:1:"x";}'); try { - $dummy->whatever(); + $dummy->whatever(); } catch (Exception $e) { - echo "okey"; + echo "okey"; } --EXPECT-- okey diff --git a/ext/soap/tests/bugs/bug69462.phpt b/ext/soap/tests/bugs/bug69462.phpt index eecd8d6749..003d62e495 100644 --- a/ext/soap/tests/bugs/bug69462.phpt +++ b/ext/soap/tests/bugs/bug69462.phpt @@ -9,18 +9,18 @@ $namespace = "http://example.com/ns"; $client = new SoapClient(null, [ 'exceptions' => 1, 'location' => "", 'uri' => $namespace ]); $soapvar = new SoapVar( - array( - new SoapVar('value', XSD_STRING, null, null, null, $namespace) - ), - SOAP_ENC_OBJECT, null, null, 'name', $namespace + array( + new SoapVar('value', XSD_STRING, null, null, null, $namespace) + ), + SOAP_ENC_OBJECT, null, null, 'name', $namespace ); try { - $client->__soapCall('method', array($soapvar)); + $client->__soapCall('method', array($soapvar)); } catch (Exception $e) { - /* ignore any errors, we're testing for segmentation fault anyway */ - echo "good"; + /* ignore any errors, we're testing for segmentation fault anyway */ + echo "good"; } ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug70469.phpt b/ext/soap/tests/bugs/bug70469.phpt index 1186cc003f..b3f4ba01a7 100644 --- a/ext/soap/tests/bugs/bug70469.phpt +++ b/ext/soap/tests/bugs/bug70469.phpt @@ -7,7 +7,7 @@ Bug #70469 (SoapClient should not generate E_ERROR if exceptions enabled) try { $x = new SoapClient('http://i_dont_exist.com/some.wsdl'); } catch (SoapFault $e) { - echo "catched\n"; + echo "caught\n"; } $error = error_get_last(); @@ -16,5 +16,5 @@ if ($error === null) { } ?> --EXPECT-- -catched +caught ok diff --git a/ext/soap/tests/bugs/bug77141.phpt b/ext/soap/tests/bugs/bug77141.phpt index fa38cc6959..268e3e049c 100644 --- a/ext/soap/tests/bugs/bug77141.phpt +++ b/ext/soap/tests/bugs/bug77141.phpt @@ -20,8 +20,6 @@ ini_set('precision', -1); $soap->call(1.1); echo $soap->__getLastRequest(); ?> -===DONE=== --EXPECT-- <?xml version="1.0" encoding="UTF-8"?> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://localhost/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:call><param0 xsi:type="xsd:float">1.1</param0></ns1:call></SOAP-ENV:Body></SOAP-ENV:Envelope> -===DONE=== diff --git a/ext/soap/tests/bugs/multiport.phpt b/ext/soap/tests/bugs/multiport.phpt index 53e281130f..549a5b3c72 100644 --- a/ext/soap/tests/bugs/multiport.phpt +++ b/ext/soap/tests/bugs/multiport.phpt @@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $client = new SoapClient(__DIR__.'/multiport.wsdl', - array('trace' => true, 'exceptions' => false)); + array('trace' => true, 'exceptions' => false)); $response = $client->GetSessionId(array('userId'=>'user', 'password'=>'password')); echo $client->__getLastRequest(); ?> diff --git a/ext/soap/tests/classmap001.phpt b/ext/soap/tests/classmap001.phpt index 1a3a472c27..c3f5301f46 100644 --- a/ext/soap/tests/classmap001.phpt +++ b/ext/soap/tests/classmap001.phpt @@ -7,11 +7,11 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $GLOBALS['HTTP_RAW_POST_DATA']=" -<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" - xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" - xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" - xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" - xmlns:ns1=\"http://schemas.nothing.com\" +<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" + xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" + xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" + xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" + xmlns:ns1=\"http://schemas.nothing.com\" > <env:Body> <dotest> @@ -25,21 +25,21 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </env:Envelope>"; class test{ - function dotest(book $book){ - $classname=get_class($book); - return "Classname: ".$classname; - } + function dotest(book $book){ + $classname=get_class($book); + return "Classname: ".$classname; + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } $options=Array( - 'actor' =>'http://schema.nothing.com', - 'classmap' => array('book'=>'book', 'wsdltype2'=>'classname2') - ); + 'actor' =>'http://schema.nothing.com', + 'classmap' => array('book'=>'book', 'wsdltype2'=>'classname2') + ); $server = new SoapServer(__DIR__."/classmap.wsdl",$options); $server->setClass("test"); diff --git a/ext/soap/tests/classmap002.phpt b/ext/soap/tests/classmap002.phpt index 2f16cf506a..cf3dd78e3f 100644 --- a/ext/soap/tests/classmap002.phpt +++ b/ext/soap/tests/classmap002.phpt @@ -8,7 +8,7 @@ soap.wsdl_cache_enabled=0 <?php class TestSoapClient extends SoapClient{ function __doRequest($request, $location, $action, $version, $one_way = 0) { - return <<<EOF + return <<<EOF <?xml version="1.0" encoding="UTF-8"?> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body> <ns1:dotest2Response><res xsi:type="ns1:book"> @@ -17,19 +17,19 @@ class TestSoapClient extends SoapClient{ </res> </ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope> EOF; - } + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } $options=Array( - 'actor' =>'http://schema.nothing.com', - 'classmap' => array('book'=>'book', 'wsdltype2'=>'classname2') - ); + 'actor' =>'http://schema.nothing.com', + 'classmap' => array('book'=>'book', 'wsdltype2'=>'classname2') + ); $client = new TestSoapClient(__DIR__."/classmap.wsdl",$options); $ret = $client->dotest2("???"); diff --git a/ext/soap/tests/custom_content_type.phpt b/ext/soap/tests/custom_content_type.phpt index ef95be4ffc..7a92a76607 100644 --- a/ext/soap/tests/custom_content_type.phpt +++ b/ext/soap/tests/custom_content_type.phpt @@ -73,8 +73,6 @@ if (strpos($headers, 'Content-Type: application/soap+xml; charset=utf-8; action= else printf("Content-Type Default OK" . PHP_EOL); ?> -==DONE== --EXPECT-- Content-Type OK Content-Type Default OK -==DONE== diff --git a/ext/soap/tests/fault_warning.phpt b/ext/soap/tests/fault_warning.phpt index 98d2d269ea..f92cc81b2e 100644 --- a/ext/soap/tests/fault_warning.phpt +++ b/ext/soap/tests/fault_warning.phpt @@ -11,18 +11,18 @@ echo get_class($fault) . "\n"; $fault = new SoapFault(null, "message"); echo get_class($fault) . "\n"; $fault = new SoapFault(["more"], "message"); // two elements in array required -$fault = new SoapFault(["m", "more", "superflous"], "message"); // two required +$fault = new SoapFault(["m", "more", "superfluous"], "message"); // two required $fault = new SoapFault(["more-ns", "Sender"], "message"); // two given echo get_class($fault); ?> --EXPECTF-- -Warning: SoapFault::SoapFault(): Invalid fault code in %s on line %d +Warning: SoapFault::__construct(): Invalid fault code in %s on line %d -Warning: SoapFault::SoapFault(): Invalid fault code in %s on line %d +Warning: SoapFault::__construct(): Invalid fault code in %s on line %d SoapFault SoapFault -Warning: SoapFault::SoapFault(): Invalid fault code in %s on line %d +Warning: SoapFault::__construct(): Invalid fault code in %s on line %d -Warning: SoapFault::SoapFault(): Invalid fault code in %s on line %d +Warning: SoapFault::__construct(): Invalid fault code in %s on line %d SoapFault diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt index 681f604e6a..f81a0c13f4 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_014s.phpt @@ -7,9 +7,9 @@ precision=14 --FILE-- <?php $param = new SoapParam(new SoapVar(array( - new SoapVar('arg', XSD_STRING, null, null, 'varString'), - new SoapVar('34', XSD_INT, null, null, 'varInt'), - new SoapVar('325.325', XSD_FLOAT, null, null, 'varFloat') + new SoapVar('arg', XSD_STRING, null, null, 'varString'), + new SoapVar('34', XSD_INT, null, null, 'varInt'), + new SoapVar('325.325', XSD_FLOAT, null, null, 'varFloat') ),SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd"), "inputStruct"); $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0)); $client->__soapCall("echoStruct", array($param), array("soapaction"=>"http://soapinterop.org/","uri"=>"http://soapinterop.org/")); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt index efbad5a121..c167556f12 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_015s.phpt @@ -15,14 +15,14 @@ class SOAPStruct { } $struct1 = new SoapVar(array( - new SoapVar('arg', XSD_STRING, null, null, 'varString'), - new SoapVar('34', XSD_INT, null, null, 'varInt'), - new SoapVar('325.325', XSD_FLOAT, null, null, 'varFloat') + new SoapVar('arg', XSD_STRING, null, null, 'varString'), + new SoapVar('34', XSD_INT, null, null, 'varInt'), + new SoapVar('325.325', XSD_FLOAT, null, null, 'varFloat') ),SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd"); $struct2 = new SoapVar(array( - new SoapVar('arg', XSD_STRING, null, null, 'varString'), - new SoapVar('34', XSD_INT, null, null, 'varInt'), - new SoapVar('325.325', XSD_FLOAT, null, null, 'varFloat') + new SoapVar('arg', XSD_STRING, null, null, 'varString'), + new SoapVar('34', XSD_INT, null, null, 'varInt'), + new SoapVar('325.325', XSD_FLOAT, null, null, 'varFloat') ),SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd"); $param = new SoapParam(new SoapVar(array( diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt index 126bdff26d..fe9d90c509 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004s.phpt @@ -11,7 +11,7 @@ $param = new SoapParam(new SoapVar(array( new SoapVar(34, XSD_INT, null, null, "varInt"), new SoapVar(123.45, XSD_FLOAT, null, null, "varFloat"), new SoapVar(array( - new SoapVar("arg2", XSD_STRING, null, null, "varString"), + new SoapVar("arg2", XSD_STRING, null, null, "varString"), new SoapVar(342, XSD_INT, null, null, "varInt"), new SoapVar(123.452, XSD_FLOAT, null, null, "varFloat") ), SOAP_ENC_OBJECT, "SOAPStruct", "http://soapinterop.org/xsd", 'varStruct') diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt index e8cacfacbb..20d1d1426b 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005s.phpt @@ -11,9 +11,9 @@ $param = new SoapParam(new SoapVar(array( new SoapVar(34, XSD_INT, null, null, "varInt"), new SoapVar(325.325, XSD_FLOAT, null, null, "varFloat"), new SoapVar(array( - new SoapVar("red", XSD_STRING), - new SoapVar("blue", XSD_STRING), - new SoapVar("green", XSD_STRING), + new SoapVar("red", XSD_STRING), + new SoapVar("blue", XSD_STRING), + new SoapVar("green", XSD_STRING), ), SOAP_ENC_ARRAY, "ArrayOfString", "http://soapinterop.org/xsd", 'varArray') ), SOAP_ENC_OBJECT, "SOAPArrayStruct", "http://soapinterop.org/xsd"), "inputStruct"); $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0)); diff --git a/ext/soap/tests/interop/Round2/GroupB/round2_groupB.inc b/ext/soap/tests/interop/Round2/GroupB/round2_groupB.inc index 77b81271c9..c8fc93aaa3 100644 --- a/ext/soap/tests/interop/Round2/GroupB/round2_groupB.inc +++ b/ext/soap/tests/interop/Round2/GroupB/round2_groupB.inc @@ -11,8 +11,8 @@ class SOAP_Interop_GroupB { function echoSimpleTypesAsStruct($string, $int, $float) { return (object)array("varString" => $string, - "varInt" => $int, - "varFloat" => $float); + "varInt" => $int, + "varFloat" => $float); } function echoNestedStruct($struct) diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_doclit.inc b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_doclit.inc index a27f96e279..845d96d644 100644 --- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_doclit.inc +++ b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_doclit.inc @@ -14,21 +14,21 @@ class SOAP_Interop_GroupH { } function echoMultipleFaults1($input) { - if ($input->whichFault == 2) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $input->param2, "ComplexFault2"); - } else { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, array("soapStruct"=>$input->param1), "ComplexFault1"); - } + if ($input->whichFault == 2) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $input->param2, "ComplexFault2"); + } else { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, array("soapStruct"=>$input->param1), "ComplexFault1"); + } } function echoMultipleFaults2($input) { - if ($input->whichFault == 2) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param2, "ComplexFault2"); - } else if ($input->whichFault == 3) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param3, "ComplexFault3"); - } else { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param1, "ComplexFault1"); - } + if ($input->whichFault == 2) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param2, "ComplexFault2"); + } else if ($input->whichFault == 3) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param3, "ComplexFault3"); + } else { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param1, "ComplexFault1"); + } } } diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_rpcenc.inc b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_rpcenc.inc index 52165ba56e..1e403e4488 100644 --- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_rpcenc.inc +++ b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_complex_rpcenc.inc @@ -14,21 +14,21 @@ class SOAP_Interop_GroupH { } function echoMultipleFaults1($which, $s1, $s2) { - if ($which == 2) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $s2, "ComplexFault2"); - } else { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, array("soapStruct"=>$s1), "ComplexFault1"); - } + if ($which == 2) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $s2, "ComplexFault2"); + } else { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, array("soapStruct"=>$s1), "ComplexFault1"); + } } function echoMultipleFaults2($which, $s1, $s2, $s3) { - if ($which == 2) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $s2, "ComplexFault2"); - } else if ($which == 3) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $s3, "ComplexFault3"); - } else { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $s1, "ComplexFault1"); - } + if ($which == 2) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $s2, "ComplexFault2"); + } else if ($which == 3) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $s3, "ComplexFault3"); + } else { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $s1, "ComplexFault1"); + } } } diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_doclit.inc b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_doclit.inc index e0e35f1821..17bcd9c41d 100644 --- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_doclit.inc +++ b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_doclit.inc @@ -14,39 +14,39 @@ class SOAP_Interop_GroupH { } function echoMultipleFaults1($input) { - if ($input->whichFault == 2) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $input->param1, "SimpleFault2"); - } else if ($input->whichFault == 3) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $input->param2, "SimpleFault3"); - } else { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, null, "SimpleFault1"); - } + if ($input->whichFault == 2) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $input->param1, "SimpleFault2"); + } else if ($input->whichFault == 3) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $input->param2, "SimpleFault3"); + } else { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, null, "SimpleFault1"); + } } function echoMultipleFaults2($input) { - if ($input->whichFault == 2) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param1, "SimpleFault1"); - } else if ($input->whichFault == 3) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param3, "SimpleFault3"); - } else { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param2, "SimpleFault2"); - } + if ($input->whichFault == 2) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param1, "SimpleFault1"); + } else if ($input->whichFault == 3) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param3, "SimpleFault3"); + } else { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $input->param2, "SimpleFault2"); + } } function echoMultipleFaults3($input) { - if ($input->whichFault == 2) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults3'.", null, $input->param2, "SimpleFault2"); - } else { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults3'.", null, $input->param1, "SimpleFault1"); - } + if ($input->whichFault == 2) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults3'.", null, $input->param2, "SimpleFault2"); + } else { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults3'.", null, $input->param1, "SimpleFault1"); + } } function echoMultipleFaults4($input) { - if ($input->whichFault == 2) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults4'.", null, $input->param2, "SimpleFault2"); - } else { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults4'.", null, $input->param1, "SimpleFault1"); - } + if ($input->whichFault == 2) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults4'.", null, $input->param2, "SimpleFault2"); + } else { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults4'.", null, $input->param1, "SimpleFault1"); + } } } diff --git a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_rpcenc.inc b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_rpcenc.inc index d39f060963..01b9870a1a 100644 --- a/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_rpcenc.inc +++ b/ext/soap/tests/interop/Round4/GroupH/round4_groupH_simple_rpcenc.inc @@ -14,39 +14,39 @@ class SOAP_Interop_GroupH { } function echoMultipleFaults1($param, $string, $floats) { - if ($param == 2) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $string, "SimpleFault2"); - } else if ($param == 3) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $floats, "SimpleFault3"); - } else { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, null, "SimpleFault1"); - } + if ($param == 2) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $string, "SimpleFault2"); + } else if ($param == 3) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, $floats, "SimpleFault3"); + } else { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults1'.", null, null, "SimpleFault1"); + } } function echoMultipleFaults2($param, $string, $float, $strings) { - if ($param == 2) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $string, "SimpleFault1"); - } else if ($param == 3) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $strings, "SimpleFault3"); - } else { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $float, "SimpleFault2"); - } + if ($param == 2) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $string, "SimpleFault1"); + } else if ($param == 3) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $strings, "SimpleFault3"); + } else { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults2'.", null, $float, "SimpleFault2"); + } } function echoMultipleFaults3($param, $param1, $param2) { - if ($param == 2) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults3'.", null, $param2, "SimpleFault2"); - } else { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults3'.", null, $param1, "SimpleFault1"); - } + if ($param == 2) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults3'.", null, $param2, "SimpleFault2"); + } else { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults3'.", null, $param1, "SimpleFault1"); + } } function echoMultipleFaults4($param, $int, $enum) { - if ($param == 2) { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults4'.", null, $enum, "SimpleFault2"); - } else { - return new SoapFault("Server", "Fault in response to 'echoMultipleFaults4'.", null, $int, "SimpleFault1"); - } + if ($param == 2) { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults4'.", null, $enum, "SimpleFault2"); + } else { + return new SoapFault("Server", "Fault in response to 'echoMultipleFaults4'.", null, $int, "SimpleFault1"); + } } } diff --git a/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.inc b/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.inc index af74db7c74..c736bcde4b 100644 --- a/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.inc +++ b/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.inc @@ -3,11 +3,11 @@ class SOAP_Interop_GroupI { function echoString($inputString) { - if (isset($inputString->inputString)) { - return array("return"=>$inputString->inputString); - } else { - return $inputString; - } + if (isset($inputString->inputString)) { + return array("return"=>$inputString->inputString); + } else { + return $inputString; + } } function echoInteger($inputInteger) @@ -26,11 +26,11 @@ class SOAP_Interop_GroupI { function echoBase64($inputBase64) { - if (isset($inputBase64->inputBase64)) { - return array("return"=>$inputBase64->inputBase64); - } else { - return $inputBase64; - } + if (isset($inputBase64->inputBase64)) { + return array("return"=>$inputBase64->inputBase64); + } else { + return $inputBase64; + } } function echoDate($timeInstant) @@ -40,56 +40,56 @@ class SOAP_Interop_GroupI { function echoComplexType($inputComplexType) { - if (isset($inputComplexType->inputComplexType)) { - return array("return"=>$inputComplexType->inputComplexType); - } else { - return $inputComplexType; - } + if (isset($inputComplexType->inputComplexType)) { + return array("return"=>$inputComplexType->inputComplexType); + } else { + return $inputComplexType; + } } function echoIntegerMultiOccurs($input) { - if (isset($input->inputIntegerMultiOccurs->int)) { - return array("return"=>$input->inputIntegerMultiOccurs->int); - } else { - return array(); - } + if (isset($input->inputIntegerMultiOccurs->int)) { + return array("return"=>$input->inputIntegerMultiOccurs->int); + } else { + return array(); + } } function echoFloatMultiOccurs($input) { - if (isset($input->inputFloatMultiOccurs->float)) { - return array("return"=>$input->inputFloatMultiOccurs->float); - } else { - return array(); - } + if (isset($input->inputFloatMultiOccurs->float)) { + return array("return"=>$input->inputFloatMultiOccurs->float); + } else { + return array(); + } } function echoStringMultiOccurs($input) { - if (isset($input->inputStringMultiOccurs->string)) { - return array("return"=>$input->inputStringMultiOccurs->string); - } else { - return array(); - } + if (isset($input->inputStringMultiOccurs->string)) { + return array("return"=>$input->inputStringMultiOccurs->string); + } else { + return array(); + } } function echoComplexTypeMultiOccurs($input) { - if (isset($input->inputComplexTypeMultiOccurs->SOAPComplexType)) { - return array("return"=>$input->inputComplexTypeMultiOccurs->SOAPComplexType); - } else { - return array(); - } + if (isset($input->inputComplexTypeMultiOccurs->SOAPComplexType)) { + return array("return"=>$input->inputComplexTypeMultiOccurs->SOAPComplexType); + } else { + return array(); + } } function echoHexBinary($hb) { - if (isset($hb->inputHexBinary)) { - return array("return"=>$hb->inputHexBinary); - } else { - return $hb; - } + if (isset($hb->inputHexBinary)) { + return array("return"=>$hb->inputHexBinary); + } else { + return $hb; + } } function echoDecimal($dec) @@ -104,53 +104,53 @@ class SOAP_Interop_GroupI { function echoComplexTypeAsSimpleTypes($input) { - if (isset($input->inputComplexType)) { - $ret = array("outputInteger" => $input->inputComplexType->varInt, - "outputFloat" => $input->inputComplexType->varFloat); - if (isset($input->inputComplexType->varString)) { - $ret["outputString"] = $input->inputComplexType->varString; - } - return $ret; - } else { - return array(); - } - } + if (isset($input->inputComplexType)) { + $ret = array("outputInteger" => $input->inputComplexType->varInt, + "outputFloat" => $input->inputComplexType->varFloat); + if (isset($input->inputComplexType->varString)) { + $ret["outputString"] = $input->inputComplexType->varString; + } + return $ret; + } else { + return array(); + } + } function echoSimpleTypesAsComplexType($input) { - $ret = array("varInt" => $input->inputInteger, - "varFloat" => $input->inputFloat); - if (isset($input->inputString)) { - $ret["varString"] = $input->inputString; - } - return array("return"=>$ret); + $ret = array("varInt" => $input->inputInteger, + "varFloat" => $input->inputFloat); + if (isset($input->inputString)) { + $ret["varString"] = $input->inputString; + } + return array("return"=>$ret); } function echoNestedComplexType($inputComplexType) { - if (isset($inputComplexType->inputComplexType)) { - return array("return"=>$inputComplexType->inputComplexType); - } else { - return $inputComplexType; - } + if (isset($inputComplexType->inputComplexType)) { + return array("return"=>$inputComplexType->inputComplexType); + } else { + return $inputComplexType; + } } function echoNestedMultiOccurs($inputComplexType) { - if (isset($inputComplexType->inputComplexType)) { - return array("return"=>$inputComplexType->inputComplexType); - } else { - return $inputComplexType; - } + if (isset($inputComplexType->inputComplexType)) { + return array("return"=>$inputComplexType->inputComplexType); + } else { + return $inputComplexType; + } } function echoChoice($input) { - if (isset($input->inputChoice)) { - return array("return"=>$input->inputChoice); - } else { - return $input; - } + if (isset($input->inputChoice)) { + return array("return"=>$input->inputChoice); + } else { + return $input; + } } function echoEnum($input) @@ -160,20 +160,20 @@ class SOAP_Interop_GroupI { function echoAnyType($input) { - if (isset($input->inputAnyType)) { - return array("return"=>$input->inputAnyType); - } else { - return $input; - } + if (isset($input->inputAnyType)) { + return array("return"=>$input->inputAnyType); + } else { + return $input; + } } function echoAnyElement($input) { - if (isset($input->inputAny)) { - return array("return"=>$input->inputAny); - } else { - return $input; - } + if (isset($input->inputAny)) { + return array("return"=>$input->inputAny); + } else { + return $input; + } } function echoVoidSoapHeader() diff --git a/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.wsdl b/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.wsdl index 454f879fd3..908a49789e 100644 --- a/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.wsdl +++ b/ext/soap/tests/interop/Round4/GroupI/round4_groupI_xsd.wsdl @@ -1102,7 +1102,7 @@ </operation> </binding> <service name="Round4XSDTest"> - <documentation>These operations implement DOC/LIT SOAP operations, for interop testing. Please email johnko@microsoft.com with any questions/coments.</documentation> + <documentation>These operations implement DOC/LIT SOAP operations, for interop testing. Please email johnko@microsoft.com with any questions/comments.</documentation> <port name="Round4XSDTestSoap" binding="s0:Round4XSDTestSoap"> <soap:address location="test://" /> </port> diff --git a/ext/soap/tests/schema/schema001.phpt b/ext/soap/tests/schema/schema001.phpt index 9f2b7e5235..cb031e6ac6 100644 --- a/ext/soap/tests/schema/schema001.phpt +++ b/ext/soap/tests/schema/schema001.phpt @@ -6,9 +6,9 @@ SOAP XML Schema 1: simpleType/restriction <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <restriction base="xsd:int"/> - </simpleType> + <simpleType name="testType"> + <restriction base="xsd:int"/> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',123.5); echo "ok"; diff --git a/ext/soap/tests/schema/schema002.phpt b/ext/soap/tests/schema/schema002.phpt index 41f3bbe3fa..66485aa205 100644 --- a/ext/soap/tests/schema/schema002.phpt +++ b/ext/soap/tests/schema/schema002.phpt @@ -6,12 +6,12 @@ SOAP XML Schema 2: simpleType/restriction (reference to type) <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType2"> - <restriction base="xsd:int"/> - </simpleType> - <simpleType name="testType"> - <restriction base="tns:testType2"/> - </simpleType> + <simpleType name="testType2"> + <restriction base="xsd:int"/> + </simpleType> + <simpleType name="testType"> + <restriction base="tns:testType2"/> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',123.5); echo "ok"; diff --git a/ext/soap/tests/schema/schema003.phpt b/ext/soap/tests/schema/schema003.phpt index 75991001e0..d32dd2434e 100644 --- a/ext/soap/tests/schema/schema003.phpt +++ b/ext/soap/tests/schema/schema003.phpt @@ -6,12 +6,12 @@ SOAP XML Schema 3: simpleType/restriction (reference to type, that is not define <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <restriction base="tns:testType2"/> - </simpleType> - <simpleType name="testType2"> - <restriction base="xsd:int"/> - </simpleType> + <simpleType name="testType"> + <restriction base="tns:testType2"/> + </simpleType> + <simpleType name="testType2"> + <restriction base="xsd:int"/> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',123.5); echo "ok"; diff --git a/ext/soap/tests/schema/schema004.phpt b/ext/soap/tests/schema/schema004.phpt index 93ed1d17f1..b930e40b4c 100644 --- a/ext/soap/tests/schema/schema004.phpt +++ b/ext/soap/tests/schema/schema004.phpt @@ -8,9 +8,9 @@ precision=14 <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <restriction base="tns:testType2"/> - </simpleType> + <simpleType name="testType"> + <restriction base="tns:testType2"/> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',123.5); echo "ok"; diff --git a/ext/soap/tests/schema/schema005.phpt b/ext/soap/tests/schema/schema005.phpt index 1db0c62f99..ddfa92555b 100644 --- a/ext/soap/tests/schema/schema005.phpt +++ b/ext/soap/tests/schema/schema005.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 5: simpleType/restriction (inline type) <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <restriction> - <simpleType name="testType2"> - <restriction base="xsd:int"/> - </simpleType> - </restriction> - </simpleType> + <simpleType name="testType"> + <restriction> + <simpleType name="testType2"> + <restriction base="xsd:int"/> + </simpleType> + </restriction> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',123.5); echo "ok"; diff --git a/ext/soap/tests/schema/schema006.phpt b/ext/soap/tests/schema/schema006.phpt index e41f27545b..9255626581 100644 --- a/ext/soap/tests/schema/schema006.phpt +++ b/ext/soap/tests/schema/schema006.phpt @@ -6,14 +6,14 @@ SOAP XML Schema 6: simpleType/restriction (referenced by ellement) <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <restriction> - <simpleType name="testType2"> - <restriction base="xsd:int"/> - </simpleType> - </restriction> - </simpleType> - <element name="testElement" type="tns:testType"/> + <simpleType name="testType"> + <restriction> + <simpleType name="testType2"> + <restriction base="xsd:int"/> + </simpleType> + </restriction> + </simpleType> + <element name="testElement" type="tns:testType"/> EOF; test_schema($schema,'element="tns:testElement"',123.5); echo "ok"; diff --git a/ext/soap/tests/schema/schema007.phpt b/ext/soap/tests/schema/schema007.phpt index fd93c7aa8e..bf088e7b2d 100644 --- a/ext/soap/tests/schema/schema007.phpt +++ b/ext/soap/tests/schema/schema007.phpt @@ -6,14 +6,14 @@ SOAP XML Schema 7: simpleType/restriction (referenced by ellement) <?php include "test_schema.inc"; $schema = <<<EOF - <element name="testElement" type="tns:testType"/> - <simpleType name="testType"> - <restriction> - <simpleType name="testType2"> - <restriction base="xsd:int"/> - </simpleType> - </restriction> - </simpleType> + <element name="testElement" type="tns:testType"/> + <simpleType name="testType"> + <restriction> + <simpleType name="testType2"> + <restriction base="xsd:int"/> + </simpleType> + </restriction> + </simpleType> EOF; test_schema($schema,'element="tns:testElement"',123.5); echo "ok"; diff --git a/ext/soap/tests/schema/schema008.phpt b/ext/soap/tests/schema/schema008.phpt index 7d8a440dd9..3a9b998580 100644 --- a/ext/soap/tests/schema/schema008.phpt +++ b/ext/soap/tests/schema/schema008.phpt @@ -7,13 +7,13 @@ SOAP XML Schema 8: simpleType/restriction (anonymous, inside an ellement) include "test_schema.inc"; $schema = <<<EOF <element name="testElement"> - <simpleType> - <restriction> - <simpleType name="testType2"> - <restriction base="xsd:int"/> - </simpleType> - </restriction> - </simpleType> + <simpleType> + <restriction> + <simpleType name="testType2"> + <restriction base="xsd:int"/> + </simpleType> + </restriction> + </simpleType> </element> EOF; test_schema($schema,'element="tns:testElement"',123.5); diff --git a/ext/soap/tests/schema/schema009.phpt b/ext/soap/tests/schema/schema009.phpt index f7d10242cc..2de815f455 100644 --- a/ext/soap/tests/schema/schema009.phpt +++ b/ext/soap/tests/schema/schema009.phpt @@ -6,9 +6,9 @@ SOAP XML Schema 9: simpleType/list (as string) <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <list itemType="token"/> - </simpleType> + <simpleType name="testType"> + <list itemType="token"/> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',"one two"); echo "ok"; diff --git a/ext/soap/tests/schema/schema010.phpt b/ext/soap/tests/schema/schema010.phpt index 49136b9fe4..b50a5eeb97 100644 --- a/ext/soap/tests/schema/schema010.phpt +++ b/ext/soap/tests/schema/schema010.phpt @@ -6,9 +6,9 @@ SOAP XML Schema 10: simpleType/list (as array) <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <list itemType="token"/> - </simpleType> + <simpleType name="testType"> + <list itemType="token"/> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',array("one","two")); echo "ok"; diff --git a/ext/soap/tests/schema/schema011.phpt b/ext/soap/tests/schema/schema011.phpt index 8296311a46..fca39291f3 100644 --- a/ext/soap/tests/schema/schema011.phpt +++ b/ext/soap/tests/schema/schema011.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 11: simpleType/list (inline type) (as string) <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <list> - <simpleType> - <restriction base="int"/> - </simpleType> - </list> - </simpleType> + <simpleType name="testType"> + <list> + <simpleType> + <restriction base="int"/> + </simpleType> + </list> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',"123 456.7"); echo "ok"; diff --git a/ext/soap/tests/schema/schema012.phpt b/ext/soap/tests/schema/schema012.phpt index 1d542d81d8..d947980c00 100644 --- a/ext/soap/tests/schema/schema012.phpt +++ b/ext/soap/tests/schema/schema012.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 12: simpleType/list (inline type) (as array) <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <list> - <simpleType> - <restriction base="int"/> - </simpleType> - </list> - </simpleType> + <simpleType name="testType"> + <list> + <simpleType> + <restriction base="int"/> + </simpleType> + </list> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',array(123,456.7)); echo "ok"; diff --git a/ext/soap/tests/schema/schema013.phpt b/ext/soap/tests/schema/schema013.phpt index 4794d2d0f1..9c93ae4d2e 100644 --- a/ext/soap/tests/schema/schema013.phpt +++ b/ext/soap/tests/schema/schema013.phpt @@ -6,9 +6,9 @@ SOAP XML Schema 13: simpleType/union <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <union memberTypes="string int float"/> - </simpleType> + <simpleType name="testType"> + <union memberTypes="string int float"/> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',"str"); echo "ok"; diff --git a/ext/soap/tests/schema/schema014.phpt b/ext/soap/tests/schema/schema014.phpt index 3dab5f350b..b2639fc1e2 100644 --- a/ext/soap/tests/schema/schema014.phpt +++ b/ext/soap/tests/schema/schema014.phpt @@ -8,9 +8,9 @@ precision=14 <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <union memberTypes="string int float"/> - </simpleType> + <simpleType name="testType"> + <union memberTypes="string int float"/> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',123.5); echo "ok"; diff --git a/ext/soap/tests/schema/schema015.phpt b/ext/soap/tests/schema/schema015.phpt index fe9b96b8cf..6f280e78a9 100644 --- a/ext/soap/tests/schema/schema015.phpt +++ b/ext/soap/tests/schema/schema015.phpt @@ -6,19 +6,19 @@ SOAP XML Schema 15: simpleType/union (inline type) <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <union> - <simpleType> - <restriction base="string"/> - </simpleType> - <simpleType> - <restriction base="int"/> - </simpleType> - <simpleType> - <restriction base="float"/> - </simpleType> - </union> - </simpleType> + <simpleType name="testType"> + <union> + <simpleType> + <restriction base="string"/> + </simpleType> + <simpleType> + <restriction base="int"/> + </simpleType> + <simpleType> + <restriction base="float"/> + </simpleType> + </union> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',"str"); echo "ok"; diff --git a/ext/soap/tests/schema/schema016.phpt b/ext/soap/tests/schema/schema016.phpt index 11e9436bcb..4878b710c5 100644 --- a/ext/soap/tests/schema/schema016.phpt +++ b/ext/soap/tests/schema/schema016.phpt @@ -8,19 +8,19 @@ precision=14 <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <union> - <simpleType> - <restriction base="string"/> - </simpleType> - <simpleType> - <restriction base="int"/> - </simpleType> - <simpleType> - <restriction base="float"/> - </simpleType> - </union> - </simpleType> + <simpleType name="testType"> + <union> + <simpleType> + <restriction base="string"/> + </simpleType> + <simpleType> + <restriction base="int"/> + </simpleType> + <simpleType> + <restriction base="float"/> + </simpleType> + </union> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',123.5); echo "ok"; diff --git a/ext/soap/tests/schema/schema017.phpt b/ext/soap/tests/schema/schema017.phpt index 6689c363ed..25a1da054a 100644 --- a/ext/soap/tests/schema/schema017.phpt +++ b/ext/soap/tests/schema/schema017.phpt @@ -8,16 +8,16 @@ precision=14 <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <union> - <simpleType> - <restriction base="float"/> - </simpleType> - <simpleType> - <list itemType="int"/> - </simpleType> - </union> - </simpleType> + <simpleType name="testType"> + <union> + <simpleType> + <restriction base="float"/> + </simpleType> + <simpleType> + <list itemType="int"/> + </simpleType> + </union> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',123.5); echo "ok"; diff --git a/ext/soap/tests/schema/schema018.phpt b/ext/soap/tests/schema/schema018.phpt index 0f3e8b84ac..8b85ea8af3 100644 --- a/ext/soap/tests/schema/schema018.phpt +++ b/ext/soap/tests/schema/schema018.phpt @@ -6,16 +6,16 @@ SOAP XML Schema 18: union with list <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <union> - <simpleType> - <restriction base="float"/> - </simpleType> - <simpleType> - <list itemType="int"/> - </simpleType> - </union> - </simpleType> + <simpleType name="testType"> + <union> + <simpleType> + <restriction base="float"/> + </simpleType> + <simpleType> + <list itemType="int"/> + </simpleType> + </union> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',"123.5"); echo "ok"; diff --git a/ext/soap/tests/schema/schema019.phpt b/ext/soap/tests/schema/schema019.phpt index 0d2d753764..afcae9b1b6 100644 --- a/ext/soap/tests/schema/schema019.phpt +++ b/ext/soap/tests/schema/schema019.phpt @@ -6,16 +6,16 @@ SOAP XML Schema 19: union with list <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <union> - <simpleType> - <restriction base="float"/> - </simpleType> - <simpleType> - <list itemType="int"/> - </simpleType> - </union> - </simpleType> + <simpleType name="testType"> + <union> + <simpleType> + <restriction base="float"/> + </simpleType> + <simpleType> + <list itemType="int"/> + </simpleType> + </union> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',"123.5 456.7"); echo "ok"; diff --git a/ext/soap/tests/schema/schema020.phpt b/ext/soap/tests/schema/schema020.phpt index 344757a327..e8ebf500e1 100644 --- a/ext/soap/tests/schema/schema020.phpt +++ b/ext/soap/tests/schema/schema020.phpt @@ -8,16 +8,16 @@ precision=14 <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <union> - <simpleType> - <restriction base="float"/> - </simpleType> - <simpleType> - <list itemType="int"/> - </simpleType> - </union> - </simpleType> + <simpleType name="testType"> + <union> + <simpleType> + <restriction base="float"/> + </simpleType> + <simpleType> + <list itemType="int"/> + </simpleType> + </union> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',array(123.5,456.7)); echo "ok"; diff --git a/ext/soap/tests/schema/schema021.phpt b/ext/soap/tests/schema/schema021.phpt index 0628c6b3b8..18e1394775 100644 --- a/ext/soap/tests/schema/schema021.phpt +++ b/ext/soap/tests/schema/schema021.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 21: list of unions <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <list> - <simpleType> - <union memberTypes="int float str"/> - </simpleType> - </list> - </simpleType> + <simpleType name="testType"> + <list> + <simpleType> + <union memberTypes="int float str"/> + </simpleType> + </list> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',"123 123.5 456.7 str"); echo "ok"; diff --git a/ext/soap/tests/schema/schema022.phpt b/ext/soap/tests/schema/schema022.phpt index a8f5bb9cad..45bcd29c6e 100644 --- a/ext/soap/tests/schema/schema022.phpt +++ b/ext/soap/tests/schema/schema022.phpt @@ -8,13 +8,13 @@ precision=14 <?php include "test_schema.inc"; $schema = <<<EOF - <simpleType name="testType"> - <list> - <simpleType> - <union memberTypes="int float str"/> - </simpleType> - </list> - </simpleType> + <simpleType name="testType"> + <list> + <simpleType> + <union memberTypes="int float str"/> + </simpleType> + </list> + </simpleType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5,'str')); echo "ok"; diff --git a/ext/soap/tests/schema/schema023.phpt b/ext/soap/tests/schema/schema023.phpt index 550bacfe84..31bfe9ae6f 100644 --- a/ext/soap/tests/schema/schema023.phpt +++ b/ext/soap/tests/schema/schema023.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 23: SOAP 1.1 Array <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="SOAP-ENC:Array"> + <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema024.phpt b/ext/soap/tests/schema/schema024.phpt index af836d1ffb..cd58f7efb5 100644 --- a/ext/soap/tests/schema/schema024.phpt +++ b/ext/soap/tests/schema/schema024.phpt @@ -6,15 +6,15 @@ SOAP XML Schema 24: SOAP 1.1 Array (second way) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <all> - <element name="x_item" type="int" maxOccurs="unbounded"/> - </all> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="SOAP-ENC:Array"> + <all> + <element name="x_item" type="int" maxOccurs="unbounded"/> + </all> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema025.phpt b/ext/soap/tests/schema/schema025.phpt index 748e45804d..5237e8979e 100644 --- a/ext/soap/tests/schema/schema025.phpt +++ b/ext/soap/tests/schema/schema025.phpt @@ -6,14 +6,14 @@ SOAP XML Schema 25: SOAP 1.2 Array <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> - <attribute ref="enc12:itemType" wsdl:itemType="int"/> - <attribute ref="enc12:arraySize" wsdl:arraySize="*"/> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> + <attribute ref="enc12:itemType" wsdl:itemType="int"/> + <attribute ref="enc12:arraySize" wsdl:arraySize="*"/> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema026.phpt b/ext/soap/tests/schema/schema026.phpt index e17b5ac60b..983ee8e5ef 100644 --- a/ext/soap/tests/schema/schema026.phpt +++ b/ext/soap/tests/schema/schema026.phpt @@ -6,15 +6,15 @@ SOAP XML Schema 26: SOAP 1.2 Array (second way) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> - <all> - <element name="x_item" type="int" maxOccurs="unbounded"/> - </all> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> + <all> + <element name="x_item" type="int" maxOccurs="unbounded"/> + </all> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema027.phpt b/ext/soap/tests/schema/schema027.phpt index e3b382ebe9..39ca3dc3cd 100644 --- a/ext/soap/tests/schema/schema027.phpt +++ b/ext/soap/tests/schema/schema027.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 27: SOAP 1.1 Multidimensional array <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[,]"/> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="SOAP-ENC:Array"> + <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[,]"/> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(array(123),array(123.5))); echo "ok"; diff --git a/ext/soap/tests/schema/schema028.phpt b/ext/soap/tests/schema/schema028.phpt index 7cc4ba568a..84a059b602 100644 --- a/ext/soap/tests/schema/schema028.phpt +++ b/ext/soap/tests/schema/schema028.phpt @@ -6,14 +6,14 @@ SOAP XML Schema 28: SOAP 1.2 Multidimensional array <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> - <attribute ref="enc12:itemType" wsdl:itemType="int"/> - <attribute ref="enc12:arraySize" wsdl:arraySize="* 1"/> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> + <attribute ref="enc12:itemType" wsdl:itemType="int"/> + <attribute ref="enc12:arraySize" wsdl:arraySize="* 1"/> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(array(123),array(123.5))); echo "ok"; diff --git a/ext/soap/tests/schema/schema029.phpt b/ext/soap/tests/schema/schema029.phpt index 2081affc6d..70f1b21e91 100644 --- a/ext/soap/tests/schema/schema029.phpt +++ b/ext/soap/tests/schema/schema029.phpt @@ -6,16 +6,16 @@ SOAP XML Schema 29: SOAP 1.2 Multidimensional array (second way) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> - <all> - <element name="x_item" type="int" maxOccurs="unbounded"/> - </all> - <attribute ref="enc12:arraySize" wsdl:arraySize="* 1"/> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> + <all> + <element name="x_item" type="int" maxOccurs="unbounded"/> + </all> + <attribute ref="enc12:arraySize" wsdl:arraySize="* 1"/> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(array(123),array(123.5))); echo "ok"; diff --git a/ext/soap/tests/schema/schema030.phpt b/ext/soap/tests/schema/schema030.phpt index e468613916..1047119295 100644 --- a/ext/soap/tests/schema/schema030.phpt +++ b/ext/soap/tests/schema/schema030.phpt @@ -6,12 +6,12 @@ SOAP XML Schema 30: Structure (sequence) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="int" type="int"/> - <element name="str" type="string"/> - </sequence> - </complexType> + <complexType name="testType"> + <sequence> + <element name="int" type="int"/> + <element name="str" type="string"/> + </sequence> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema031.phpt b/ext/soap/tests/schema/schema031.phpt index 479abfee9d..4b03358372 100644 --- a/ext/soap/tests/schema/schema031.phpt +++ b/ext/soap/tests/schema/schema031.phpt @@ -6,12 +6,12 @@ SOAP XML Schema 31: Structure (all) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <all> - <element name="int" type="int"/> - <element name="str" type="string"/> - </all> - </complexType> + <complexType name="testType"> + <all> + <element name="int" type="int"/> + <element name="str" type="string"/> + </all> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema032.phpt b/ext/soap/tests/schema/schema032.phpt index 47b4af121c..397636083c 100644 --- a/ext/soap/tests/schema/schema032.phpt +++ b/ext/soap/tests/schema/schema032.phpt @@ -6,12 +6,12 @@ SOAP XML Schema 32: Structure (choice) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <choice> - <element name="int" type="int"/> - <element name="str" type="string"/> - </choice> - </complexType> + <complexType name="testType"> + <choice> + <element name="int" type="int"/> + <element name="str" type="string"/> + </choice> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema033.phpt b/ext/soap/tests/schema/schema033.phpt index b504bc077a..7c1ce0fc8a 100644 --- a/ext/soap/tests/schema/schema033.phpt +++ b/ext/soap/tests/schema/schema033.phpt @@ -6,17 +6,17 @@ SOAP XML Schema 33: Nested complex types <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType2"> - <sequence> - <element name="int" type="int"/> - </sequence> - </complexType> - <complexType name="testType"> - <sequence> - <element name="int" type="int"/> - <element name="nest" type="tns:testType2"/> - </sequence> - </complexType> + <complexType name="testType2"> + <sequence> + <element name="int" type="int"/> + </sequence> + </complexType> + <complexType name="testType"> + <sequence> + <element name="int" type="int"/> + <element name="nest" type="tns:testType2"/> + </sequence> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"nest"=>array("int"=>123.5))); echo "ok"; diff --git a/ext/soap/tests/schema/schema034.phpt b/ext/soap/tests/schema/schema034.phpt index a83d6ea846..42536d89c3 100644 --- a/ext/soap/tests/schema/schema034.phpt +++ b/ext/soap/tests/schema/schema034.phpt @@ -6,18 +6,18 @@ SOAP XML Schema 34: Nested complex types (element ref) <?php include "test_schema.inc"; $schema = <<<EOF - <element name="testType2" type="tns:testType2"/> - <complexType name="testType2"> - <sequence> - <element name="int" type="int"/> - </sequence> - </complexType> - <complexType name="testType"> - <sequence> - <element name="int" type="int"/> - <element ref="tns:testType2"/> - </sequence> - </complexType> + <element name="testType2" type="tns:testType2"/> + <complexType name="testType2"> + <sequence> + <element name="int" type="int"/> + </sequence> + </complexType> + <complexType name="testType"> + <sequence> + <element name="int" type="int"/> + <element ref="tns:testType2"/> + </sequence> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"testType2"=>array("int"=>123.5))); echo "ok"; diff --git a/ext/soap/tests/schema/schema035.phpt b/ext/soap/tests/schema/schema035.phpt index 8974ed00c5..d62dfbc98e 100644 --- a/ext/soap/tests/schema/schema035.phpt +++ b/ext/soap/tests/schema/schema035.phpt @@ -6,19 +6,19 @@ SOAP XML Schema 35: Nested complex types (element ref + anonymous type) <?php include "test_schema.inc"; $schema = <<<EOF - <element name="testType2"> - <complexType> - <sequence> - <element name="int" type="int"/> - </sequence> - </complexType> - </element> - <complexType name="testType"> - <sequence> - <element name="int" type="int"/> - <element ref="tns:testType2"/> - </sequence> - </complexType> + <element name="testType2"> + <complexType> + <sequence> + <element name="int" type="int"/> + </sequence> + </complexType> + </element> + <complexType name="testType"> + <sequence> + <element name="int" type="int"/> + <element ref="tns:testType2"/> + </sequence> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"testType2"=>array("int"=>123.5))); echo "ok"; diff --git a/ext/soap/tests/schema/schema036.phpt b/ext/soap/tests/schema/schema036.phpt index 9d6dac4534..12c5c40e0b 100644 --- a/ext/soap/tests/schema/schema036.phpt +++ b/ext/soap/tests/schema/schema036.phpt @@ -6,18 +6,18 @@ SOAP XML Schema 36: Nested complex types (inline) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="int" type="int"/> - <element name="testType2"> - <complexType> - <sequence> - <element name="int" type="int"/> - </sequence> - </complexType> - </element> - </sequence> - </complexType> + <complexType name="testType"> + <sequence> + <element name="int" type="int"/> + <element name="testType2"> + <complexType> + <sequence> + <element name="int" type="int"/> + </sequence> + </complexType> + </element> + </sequence> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"testType2"=>array("int"=>123.5))); echo "ok"; diff --git a/ext/soap/tests/schema/schema037.phpt b/ext/soap/tests/schema/schema037.phpt index 4e59981fc9..dbc5dc38c8 100644 --- a/ext/soap/tests/schema/schema037.phpt +++ b/ext/soap/tests/schema/schema037.phpt @@ -6,12 +6,12 @@ SOAP XML Schema 37: Structure with attributes <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="str" type="string"/> - </sequence> - <attribute name="int" type="int"/> - </complexType> + <complexType name="testType"> + <sequence> + <element name="str" type="string"/> + </sequence> + <attribute name="int" type="int"/> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema038.phpt b/ext/soap/tests/schema/schema038.phpt index 2d37e89e0b..70b5b207ee 100644 --- a/ext/soap/tests/schema/schema038.phpt +++ b/ext/soap/tests/schema/schema038.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 38: Structure with attributes (ref) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="str" type="string"/> - </sequence> - <attribute ref="tns:int"/> - </complexType> - <attribute name="int" type="int"/> + <complexType name="testType"> + <sequence> + <element name="str" type="string"/> + </sequence> + <attribute ref="tns:int"/> + </complexType> + <attribute name="int" type="int"/> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema039.phpt b/ext/soap/tests/schema/schema039.phpt index 0b7ef5afc4..5b3f454bf9 100644 --- a/ext/soap/tests/schema/schema039.phpt +++ b/ext/soap/tests/schema/schema039.phpt @@ -6,15 +6,15 @@ SOAP XML Schema 39: Structure with attributes (attributeGroup) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="str" type="string"/> - </sequence> - <attributeGroup ref="tns:intGroup"/> - </complexType> - <attributeGroup name="intGroup"> - <attribute name="int" type="int"/> - </attributeGroup> + <complexType name="testType"> + <sequence> + <element name="str" type="string"/> + </sequence> + <attributeGroup ref="tns:intGroup"/> + </complexType> + <attributeGroup name="intGroup"> + <attribute name="int" type="int"/> + </attributeGroup> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema040.phpt b/ext/soap/tests/schema/schema040.phpt index f7ddc04546..51bcd776e1 100644 --- a/ext/soap/tests/schema/schema040.phpt +++ b/ext/soap/tests/schema/schema040.phpt @@ -6,16 +6,16 @@ SOAP XML Schema 40: Structure with attributes (inline types) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="str" type="string"/> - </sequence> - <attribute name="int"> - <simpleType> - <restriction base="int"/> - </simpleType> - </attribute> - </complexType> + <complexType name="testType"> + <sequence> + <element name="str" type="string"/> + </sequence> + <attribute name="int"> + <simpleType> + <restriction base="int"/> + </simpleType> + </attribute> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema041.phpt b/ext/soap/tests/schema/schema041.phpt index 1264cf5c90..4613f15729 100644 --- a/ext/soap/tests/schema/schema041.phpt +++ b/ext/soap/tests/schema/schema041.phpt @@ -6,15 +6,15 @@ SOAP XML Schema 41: Structure (group) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <group ref="tns:testGroup"/> - </complexType> - <group name="testGroup"> - <sequence> - <element name="int" type="int"/> - <element name="str" type="string"/> - </sequence> - </group> + <complexType name="testType"> + <group ref="tns:testGroup"/> + </complexType> + <group name="testGroup"> + <sequence> + <element name="int" type="int"/> + <element name="str" type="string"/> + </sequence> + </group> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema042.phpt b/ext/soap/tests/schema/schema042.phpt index a8aa8857d9..c0a938aa27 100644 --- a/ext/soap/tests/schema/schema042.phpt +++ b/ext/soap/tests/schema/schema042.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 42: Extension of simple type <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <simpleContent> - <extension base="int"> - <attribute name="int" type="int"/> - </extension> - </simpleContent> - </complexType> + <complexType name="testType"> + <simpleContent> + <extension base="int"> + <attribute name="int" type="int"/> + </extension> + </simpleContent> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema043.phpt b/ext/soap/tests/schema/schema043.phpt index 08c2996363..cc628eefea 100644 --- a/ext/soap/tests/schema/schema043.phpt +++ b/ext/soap/tests/schema/schema043.phpt @@ -6,20 +6,20 @@ SOAP XML Schema 43: Extension of simple type (2) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType2"> - <simpleContent> - <extension base="int"> - <attribute name="int" type="int"/> - </extension> - </simpleContent> - </complexType> - <complexType name="testType"> - <simpleContent> - <extension base="tns:testType2"> - <attribute name="int2" type="int"/> - </extension> - </simpleContent> - </complexType> + <complexType name="testType2"> + <simpleContent> + <extension base="int"> + <attribute name="int" type="int"/> + </extension> + </simpleContent> + </complexType> + <complexType name="testType"> + <simpleContent> + <extension base="tns:testType2"> + <attribute name="int2" type="int"/> + </extension> + </simpleContent> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema044.phpt b/ext/soap/tests/schema/schema044.phpt index 8fc0705518..3158d46049 100644 --- a/ext/soap/tests/schema/schema044.phpt +++ b/ext/soap/tests/schema/schema044.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 44: Restriction of simple type <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <simpleContent> - <restriction base="int"> - <attribute name="int" type="int"/> - </restriction> - </simpleContent> - </complexType> + <complexType name="testType"> + <simpleContent> + <restriction base="int"> + <attribute name="int" type="int"/> + </restriction> + </simpleContent> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema045.phpt b/ext/soap/tests/schema/schema045.phpt index 346a929d85..8055b39914 100644 --- a/ext/soap/tests/schema/schema045.phpt +++ b/ext/soap/tests/schema/schema045.phpt @@ -6,20 +6,20 @@ SOAP XML Schema 45: Restriction of simple type (2) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType2"> - <simpleContent> - <extension base="int"> - <attribute name="int" type="int"/> - </extension> - </simpleContent> - </complexType> - <complexType name="testType"> - <simpleContent> - <restriction base="tns:testType2"> - <attribute name="int2" type="int"/> - </restriction> - </simpleContent> - </complexType> + <complexType name="testType2"> + <simpleContent> + <extension base="int"> + <attribute name="int" type="int"/> + </extension> + </simpleContent> + </complexType> + <complexType name="testType"> + <simpleContent> + <restriction base="tns:testType2"> + <attribute name="int2" type="int"/> + </restriction> + </simpleContent> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema046.phpt b/ext/soap/tests/schema/schema046.phpt index 3f9d03afad..9f3efd79ca 100644 --- a/ext/soap/tests/schema/schema046.phpt +++ b/ext/soap/tests/schema/schema046.phpt @@ -6,20 +6,20 @@ SOAP XML Schema 46: Extension of complex type <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType2"> - <simpleContent> - <extension base="int"> - <attribute name="int" type="int"/> - </extension> - </simpleContent> - </complexType> - <complexType name="testType"> - <complexContent> - <extension base="tns:testType2"> - <attribute name="int2" type="int"/> - </extension> - </complexContent> - </complexType> + <complexType name="testType2"> + <simpleContent> + <extension base="int"> + <attribute name="int" type="int"/> + </extension> + </simpleContent> + </complexType> + <complexType name="testType"> + <complexContent> + <extension base="tns:testType2"> + <attribute name="int2" type="int"/> + </extension> + </complexContent> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema047.phpt b/ext/soap/tests/schema/schema047.phpt index 1265cfd3a3..a67973eeb0 100644 --- a/ext/soap/tests/schema/schema047.phpt +++ b/ext/soap/tests/schema/schema047.phpt @@ -6,18 +6,18 @@ SOAP XML Schema 47: Extension of complex type (2) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType2"> - <sequence> - <element name="int" type="int"/> - </sequence> - </complexType> - <complexType name="testType"> - <complexContent> - <extension base="tns:testType2"> - <attribute name="int2" type="int"/> - </extension> - </complexContent> - </complexType> + <complexType name="testType2"> + <sequence> + <element name="int" type="int"/> + </sequence> + </complexType> + <complexType name="testType"> + <complexContent> + <extension base="tns:testType2"> + <attribute name="int2" type="int"/> + </extension> + </complexContent> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema048.phpt b/ext/soap/tests/schema/schema048.phpt index 98d4d4be44..c2a372e1d1 100644 --- a/ext/soap/tests/schema/schema048.phpt +++ b/ext/soap/tests/schema/schema048.phpt @@ -6,20 +6,20 @@ SOAP XML Schema 48: Restriction of complex type <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType2"> - <simpleContent> - <extension base="int"> - <attribute name="int" type="int"/> - </extension> - </simpleContent> - </complexType> - <complexType name="testType"> - <complexContent> - <restriction base="tns:testType2"> - <attribute name="int2" type="int"/> - </restriction> - </complexContent> - </complexType> + <complexType name="testType2"> + <simpleContent> + <extension base="int"> + <attribute name="int" type="int"/> + </extension> + </simpleContent> + </complexType> + <complexType name="testType"> + <complexContent> + <restriction base="tns:testType2"> + <attribute name="int2" type="int"/> + </restriction> + </complexContent> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema049.phpt b/ext/soap/tests/schema/schema049.phpt index 7268a4b67a..84b22fe5e7 100644 --- a/ext/soap/tests/schema/schema049.phpt +++ b/ext/soap/tests/schema/schema049.phpt @@ -6,21 +6,21 @@ SOAP XML Schema 49: Restriction of complex type (2) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType2"> - <sequence> - <element name="int" type="int"/> - <element name="int2" type="int"/> - </sequence> - </complexType> - <complexType name="testType"> - <complexContent> - <restriction base="tns:testType2"> - <sequence> - <element name="int2" type="int"/> - </sequence> - </restriction> - </complexContent> - </complexType> + <complexType name="testType2"> + <sequence> + <element name="int" type="int"/> + <element name="int2" type="int"/> + </sequence> + </complexType> + <complexType name="testType"> + <complexContent> + <restriction base="tns:testType2"> + <sequence> + <element name="int2" type="int"/> + </sequence> + </restriction> + </complexContent> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("_"=>123.5,"int"=>123.5,"int2"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema050.phpt b/ext/soap/tests/schema/schema050.phpt index 6c735125b7..0bb3d35dc9 100644 --- a/ext/soap/tests/schema/schema050.phpt +++ b/ext/soap/tests/schema/schema050.phpt @@ -6,12 +6,12 @@ SOAP XML Schema 50: Array in complex type (maxOccurs > 1, one value) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="int" type="int"/> - <element name="int2" type="int" maxOccurs="unbounded"/> - </sequence> - </complexType> + <complexType name="testType"> + <sequence> + <element name="int" type="int"/> + <element name="int2" type="int" maxOccurs="unbounded"/> + </sequence> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"int2"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema051.phpt b/ext/soap/tests/schema/schema051.phpt index 9636399814..0f5ad8b718 100644 --- a/ext/soap/tests/schema/schema051.phpt +++ b/ext/soap/tests/schema/schema051.phpt @@ -6,12 +6,12 @@ SOAP XML Schema 51: Array in complex type (maxOccurs > 1, array) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="int" type="int"/> - <element name="int2" type="int" maxOccurs="unbounded"/> - </sequence> - </complexType> + <complexType name="testType"> + <sequence> + <element name="int" type="int"/> + <element name="int2" type="int" maxOccurs="unbounded"/> + </sequence> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"int2"=>array(123.5,456.7))); echo "ok"; diff --git a/ext/soap/tests/schema/schema052.phpt b/ext/soap/tests/schema/schema052.phpt index 8e7121ae2d..5e30c8287e 100644 --- a/ext/soap/tests/schema/schema052.phpt +++ b/ext/soap/tests/schema/schema052.phpt @@ -6,12 +6,12 @@ SOAP XML Schema 52: Array in complex type (maxOccurs > 1, array with one value) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="int" type="int"/> - <element name="int2" type="int" maxOccurs="unbounded"/> - </sequence> - </complexType> + <complexType name="testType"> + <sequence> + <element name="int" type="int"/> + <element name="int2" type="int" maxOccurs="unbounded"/> + </sequence> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"int2"=>array(123.5))); echo "ok"; diff --git a/ext/soap/tests/schema/schema053.phpt b/ext/soap/tests/schema/schema053.phpt index 8893bf5df3..f276978a4c 100644 --- a/ext/soap/tests/schema/schema053.phpt +++ b/ext/soap/tests/schema/schema053.phpt @@ -6,12 +6,12 @@ SOAP XML Schema 52: Array in complex type (maxOccurs > 1, empty array) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="int" type="int"/> - <element name="int2" type="int" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> + <complexType name="testType"> + <sequence> + <element name="int" type="int"/> + <element name="int2" type="int" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int"=>123.5,"int2"=>array())); echo "ok"; diff --git a/ext/soap/tests/schema/schema055.phpt b/ext/soap/tests/schema/schema055.phpt index 14dbdb7c1d..1a23e2fa6e 100644 --- a/ext/soap/tests/schema/schema055.phpt +++ b/ext/soap/tests/schema/schema055.phpt @@ -8,12 +8,12 @@ precision=14 <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <extension base="apache:Map" xmlns:apache="http://xml.apache.org/xml-soap"> - </extension> + <complexType name="testType"> + <complexContent> + <extension base="apache:Map" xmlns:apache="http://xml.apache.org/xml-soap"> + </extension> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="testType"',array('a'=>123,'b'=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema056.phpt b/ext/soap/tests/schema/schema056.phpt index 1ada78ea2a..d2aac098d0 100644 --- a/ext/soap/tests/schema/schema056.phpt +++ b/ext/soap/tests/schema/schema056.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 56: SOAP 1.1 Array (literal encoding) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="SOAP-ENC:Array"> + <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5),'rpc','literal'); echo "ok"; diff --git a/ext/soap/tests/schema/schema057.phpt b/ext/soap/tests/schema/schema057.phpt index 1848b9c24a..13521b2a60 100644 --- a/ext/soap/tests/schema/schema057.phpt +++ b/ext/soap/tests/schema/schema057.phpt @@ -6,15 +6,15 @@ SOAP XML Schema 57: SOAP 1.1 Array (second way, literal encoding) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <all> - <element name="x_item" type="int" maxOccurs="unbounded"/> - </all> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="SOAP-ENC:Array"> + <all> + <element name="x_item" type="int" maxOccurs="unbounded"/> + </all> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5),'rpc','literal'); echo "ok"; diff --git a/ext/soap/tests/schema/schema058.phpt b/ext/soap/tests/schema/schema058.phpt index b96fc9fcca..aee0a96111 100644 --- a/ext/soap/tests/schema/schema058.phpt +++ b/ext/soap/tests/schema/schema058.phpt @@ -6,14 +6,14 @@ SOAP XML Schema 58: SOAP 1.2 Array (literal encoding) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> - <attribute ref="enc12:itemType" wsdl:itemType="int"/> - <attribute ref="enc12:arraySize" wsdl:arraySize="*"/> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> + <attribute ref="enc12:itemType" wsdl:itemType="int"/> + <attribute ref="enc12:arraySize" wsdl:arraySize="*"/> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5),'rpc','literal'); echo "ok"; diff --git a/ext/soap/tests/schema/schema059.phpt b/ext/soap/tests/schema/schema059.phpt index 875bae9868..bbed854fbb 100644 --- a/ext/soap/tests/schema/schema059.phpt +++ b/ext/soap/tests/schema/schema059.phpt @@ -6,15 +6,15 @@ SOAP XML Schema 59: SOAP 1.2 Array (second way, literal encoding) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> - <all> - <element name="x_item" type="int" maxOccurs="unbounded"/> - </all> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> + <all> + <element name="x_item" type="int" maxOccurs="unbounded"/> + </all> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5),'rpc','literal'); echo "ok"; diff --git a/ext/soap/tests/schema/schema060.phpt b/ext/soap/tests/schema/schema060.phpt index 4daa83c191..9029a470e4 100644 --- a/ext/soap/tests/schema/schema060.phpt +++ b/ext/soap/tests/schema/schema060.phpt @@ -6,14 +6,14 @@ SOAP XML Schema 60: SOAP 1.2 Multidimensional array (literal encoding) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> - <attribute ref="enc12:itemType" wsdl:itemType="int"/> - <attribute ref="enc12:arraySize" wsdl:arraySize="* 1"/> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> + <attribute ref="enc12:itemType" wsdl:itemType="int"/> + <attribute ref="enc12:arraySize" wsdl:arraySize="* 1"/> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(array(123),array(123.5)),'rpc','literal'); echo "ok"; diff --git a/ext/soap/tests/schema/schema061.phpt b/ext/soap/tests/schema/schema061.phpt index bbd2aa6579..73cf1546d9 100644 --- a/ext/soap/tests/schema/schema061.phpt +++ b/ext/soap/tests/schema/schema061.phpt @@ -6,16 +6,16 @@ SOAP XML Schema 61: SOAP 1.2 Multidimensional array (second way, literal encodin <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> - <all> - <element name="x_item" type="int" maxOccurs="unbounded"/> - </all> - <attribute ref="enc12:arraySize" wsdl:arraySize="* 1"/> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> + <all> + <element name="x_item" type="int" maxOccurs="unbounded"/> + </all> + <attribute ref="enc12:arraySize" wsdl:arraySize="* 1"/> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(array(123),array(123.5)),'rpc','literal'); echo "ok"; diff --git a/ext/soap/tests/schema/schema062.phpt b/ext/soap/tests/schema/schema062.phpt index 60b06568ed..ae26c7b1cd 100644 --- a/ext/soap/tests/schema/schema062.phpt +++ b/ext/soap/tests/schema/schema062.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 62: NULL with attributes <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <simpleContent> - <restriction base="int"> - <attribute name="int" type="int"/> - </restriction> - </simpleContent> - </complexType> + <complexType name="testType"> + <simpleContent> + <restriction base="int"> + <attribute name="int" type="int"/> + </restriction> + </simpleContent> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("_"=>NULL,"int"=>123.5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema064.phpt b/ext/soap/tests/schema/schema064.phpt index 913cbd16e0..88f58cf8ce 100644 --- a/ext/soap/tests/schema/schema064.phpt +++ b/ext/soap/tests/schema/schema064.phpt @@ -10,30 +10,30 @@ require_once('skipif.inc'); ?> <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="dateTime" type="dateTime"/> - <element name="time" type="time"/> - <element name="date" type="date"/> - <element name="gYearMonth" type="gYearMonth"/> - <element name="gYear" type="gYear"/> - <element name="gMonthDay" type="gMonthDay"/> - <element name="gDay" type="gDay"/> - <element name="gMonth" type="gMonth"/> - </sequence> - </complexType> + <complexType name="testType"> + <sequence> + <element name="dateTime" type="dateTime"/> + <element name="time" type="time"/> + <element name="date" type="date"/> + <element name="gYearMonth" type="gYearMonth"/> + <element name="gYear" type="gYear"/> + <element name="gMonthDay" type="gMonthDay"/> + <element name="gDay" type="gDay"/> + <element name="gMonth" type="gMonth"/> + </sequence> + </complexType> EOF; $date = gmmktime(1,2,3,4,5,1976); putenv('TZ=GMT'); test_schema($schema,'type="tns:testType"',array( - 'dateTime' => $date, - 'time' => $date, - 'date' => $date, - 'gYearMonth' => $date, - 'gYear' => $date, - 'gMonthDay' => $date, - 'gDay' => $date, - 'gMonth' => $date + 'dateTime' => $date, + 'time' => $date, + 'date' => $date, + 'gYearMonth' => $date, + 'gYear' => $date, + 'gMonthDay' => $date, + 'gDay' => $date, + 'gMonth' => $date )); echo "ok"; ?> diff --git a/ext/soap/tests/schema/schema065.phpt b/ext/soap/tests/schema/schema065.phpt index 3199a6bc8f..0e5a66cd3f 100644 --- a/ext/soap/tests/schema/schema065.phpt +++ b/ext/soap/tests/schema/schema065.phpt @@ -6,10 +6,10 @@ SOAP XML Schema 65: Attribute with default value <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <attribute name="str" type="string"/> - <attribute name="int" type="int" default="5"/> - </complexType> + <complexType name="testType"> + <attribute name="str" type="string"/> + <attribute name="int" type="int" default="5"/> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str")); echo "ok"; diff --git a/ext/soap/tests/schema/schema066.phpt b/ext/soap/tests/schema/schema066.phpt index 7fe47bbd2c..c6692535a6 100644 --- a/ext/soap/tests/schema/schema066.phpt +++ b/ext/soap/tests/schema/schema066.phpt @@ -6,10 +6,10 @@ SOAP XML Schema 66: Attribute with fixed value (1) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <attribute name="str" type="string"/> - <attribute name="int" type="int" fixed="5"/> - </complexType> + <complexType name="testType"> + <attribute name="str" type="string"/> + <attribute name="int" type="int" fixed="5"/> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str")); echo "ok"; diff --git a/ext/soap/tests/schema/schema067.phpt b/ext/soap/tests/schema/schema067.phpt index 5ee0036ebe..7fb7eff233 100644 --- a/ext/soap/tests/schema/schema067.phpt +++ b/ext/soap/tests/schema/schema067.phpt @@ -6,10 +6,10 @@ SOAP XML Schema 67: Attribute with fixed value (2) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <attribute name="str" type="string"/> - <attribute name="int" type="int" fixed="5"/> - </complexType> + <complexType name="testType"> + <attribute name="str" type="string"/> + <attribute name="int" type="int" fixed="5"/> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>5)); echo "ok"; diff --git a/ext/soap/tests/schema/schema068.phpt b/ext/soap/tests/schema/schema068.phpt index 5ab63be097..4372cdfa23 100644 --- a/ext/soap/tests/schema/schema068.phpt +++ b/ext/soap/tests/schema/schema068.phpt @@ -6,10 +6,10 @@ SOAP XML Schema 68: Attribute with fixed value (3) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <attribute name="str" type="string"/> - <attribute name="int" type="int" fixed="5"/> - </complexType> + <complexType name="testType"> + <attribute name="str" type="string"/> + <attribute name="int" type="int" fixed="5"/> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>4)); echo "ok"; diff --git a/ext/soap/tests/schema/schema069.phpt b/ext/soap/tests/schema/schema069.phpt index ccaa342406..d944765e32 100644 --- a/ext/soap/tests/schema/schema069.phpt +++ b/ext/soap/tests/schema/schema069.phpt @@ -6,11 +6,11 @@ SOAP XML Schema 69: Attribute with default value (reference) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <attribute name="str" type="string"/> - <attribute ref="tns:int"/> - </complexType> - <attribute name="int" type="int" default="5"/> + <complexType name="testType"> + <attribute name="str" type="string"/> + <attribute ref="tns:int"/> + </complexType> + <attribute name="int" type="int" default="5"/> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str")); echo "ok"; diff --git a/ext/soap/tests/schema/schema070.phpt b/ext/soap/tests/schema/schema070.phpt index 0c1e249392..3135183398 100644 --- a/ext/soap/tests/schema/schema070.phpt +++ b/ext/soap/tests/schema/schema070.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 70: Attribute with default value (attributeGroup) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <attribute name="str" type="string"/> - <attributeGroup ref="tns:int_group"/> - </complexType> - <attributeGroup name="int_group"> - <attribute name="int" type="int" default="5"/> - </attributeGroup> + <complexType name="testType"> + <attribute name="str" type="string"/> + <attributeGroup ref="tns:int_group"/> + </complexType> + <attributeGroup name="int_group"> + <attribute name="int" type="int" default="5"/> + </attributeGroup> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str")); echo "ok"; diff --git a/ext/soap/tests/schema/schema071.phpt b/ext/soap/tests/schema/schema071.phpt index 1991f7ad8e..65ea47bf9e 100644 --- a/ext/soap/tests/schema/schema071.phpt +++ b/ext/soap/tests/schema/schema071.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 71: SOAP 1.1 Array (document style) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="SOAP-ENC:Array"> + <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5),'document','literal'); echo "ok"; diff --git a/ext/soap/tests/schema/schema072.phpt b/ext/soap/tests/schema/schema072.phpt index 89a0ed3597..cbf08db00b 100644 --- a/ext/soap/tests/schema/schema072.phpt +++ b/ext/soap/tests/schema/schema072.phpt @@ -6,15 +6,15 @@ SOAP XML Schema 72: SOAP 1.1 Array (document style, element with inline type) <?php include "test_schema.inc"; $schema = <<<EOF - <element name="testElement"> - <complexType name="testType"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> - </restriction> + <element name="testElement"> + <complexType name="testType"> + <complexContent> + <restriction base="SOAP-ENC:Array"> + <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> + </restriction> </complexContent> - </complexType> - </element> + </complexType> + </element> EOF; test_schema($schema,'element="tns:testElement"',array(123,123.5),'document','literal'); echo "ok"; diff --git a/ext/soap/tests/schema/schema073.phpt b/ext/soap/tests/schema/schema073.phpt index 22dd9e2604..3338684a9b 100644 --- a/ext/soap/tests/schema/schema073.phpt +++ b/ext/soap/tests/schema/schema073.phpt @@ -6,14 +6,14 @@ SOAP XML Schema 73: SOAP 1.1 Array (document style, element with type ref) <?php include "test_schema.inc"; $schema = <<<EOF - <element name="testElement" type="tns:testType"/> - <complexType name="testType"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> - </restriction> + <element name="testElement" type="tns:testType"/> + <complexType name="testType"> + <complexContent> + <restriction base="SOAP-ENC:Array"> + <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'element="tns:testElement"',array(123,123.5),'document','literal'); echo "ok"; diff --git a/ext/soap/tests/schema/schema074.phpt b/ext/soap/tests/schema/schema074.phpt index 3dbba0cd25..4735957bfa 100644 --- a/ext/soap/tests/schema/schema074.phpt +++ b/ext/soap/tests/schema/schema074.phpt @@ -6,12 +6,12 @@ SOAP XML Schema 74: Structure with attributes and qualified elements <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="str" type="string"/> - </sequence> - <attribute name="int" type="int"/> - </complexType> + <complexType name="testType"> + <sequence> + <element name="str" type="string"/> + </sequence> + <attribute name="int" type="int"/> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("str"=>"str","int"=>123.5), "rpc", "encoded", 'attributeFormDefault="qualified"'); diff --git a/ext/soap/tests/schema/schema075.phpt b/ext/soap/tests/schema/schema075.phpt index 5867e55a7c..eb3729a9b2 100644 --- a/ext/soap/tests/schema/schema075.phpt +++ b/ext/soap/tests/schema/schema075.phpt @@ -6,11 +6,11 @@ SOAP XML Schema 75: Attributes form qualified/unqualified (attributeFormDefault= <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <attribute name="int1" type="int"/> - <attribute name="int2" type="int" form="qualified"/> - <attribute name="int3" type="int" form="unqualified"/> - </complexType> + <complexType name="testType"> + <attribute name="int1" type="int"/> + <attribute name="int2" type="int" form="qualified"/> + <attribute name="int3" type="int" form="unqualified"/> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int1"=>1.1,"int2"=>2.2,"int3"=>3.3), "rpc", "encoded", 'attributeFormDefault="qualified"'); diff --git a/ext/soap/tests/schema/schema076.phpt b/ext/soap/tests/schema/schema076.phpt index 3ad2eae33a..d4940deb6b 100644 --- a/ext/soap/tests/schema/schema076.phpt +++ b/ext/soap/tests/schema/schema076.phpt @@ -6,11 +6,11 @@ SOAP XML Schema 76: Attributes form qualified/unqualified (attributeFormDefault= <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <attribute name="int1" type="int"/> - <attribute name="int2" type="int" form="qualified"/> - <attribute name="int3" type="int" form="unqualified"/> - </complexType> + <complexType name="testType"> + <attribute name="int1" type="int"/> + <attribute name="int2" type="int" form="qualified"/> + <attribute name="int3" type="int" form="unqualified"/> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int1"=>1.1,"int2"=>2.2,"int3"=>3.3), "rpc", "encoded", 'attributeFormDefault="unqualified"'); diff --git a/ext/soap/tests/schema/schema077.phpt b/ext/soap/tests/schema/schema077.phpt index 16057cfcf9..7da8b4a1a2 100644 --- a/ext/soap/tests/schema/schema077.phpt +++ b/ext/soap/tests/schema/schema077.phpt @@ -6,11 +6,11 @@ SOAP XML Schema 77: Attributes form qualified/unqualified (attributeFormDefault <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <attribute name="int1" type="int"/> - <attribute name="int2" type="int" form="qualified"/> - <attribute name="int3" type="int" form="unqualified"/> - </complexType> + <complexType name="testType"> + <attribute name="int1" type="int"/> + <attribute name="int2" type="int" form="qualified"/> + <attribute name="int3" type="int" form="unqualified"/> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int1"=>1.1,"int2"=>2.2,"int3"=>3.3), "rpc", "encoded"); diff --git a/ext/soap/tests/schema/schema078.phpt b/ext/soap/tests/schema/schema078.phpt index 7636a78f93..a051acd8f2 100644 --- a/ext/soap/tests/schema/schema078.phpt +++ b/ext/soap/tests/schema/schema078.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 78: Element form qualified/unqualified (elementFormDefault="qual <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="int1" type="int"/> - <element name="int2" type="int" form="qualified"/> - <element name="int3" type="int" form="unqualified"/> - </sequence> - </complexType> + <complexType name="testType"> + <sequence> + <element name="int1" type="int"/> + <element name="int2" type="int" form="qualified"/> + <element name="int3" type="int" form="unqualified"/> + </sequence> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int1"=>1.1,"int2"=>2.2,"int3"=>3.3), "rpc", "literal", 'elementFormDefault="qualified"'); diff --git a/ext/soap/tests/schema/schema079.phpt b/ext/soap/tests/schema/schema079.phpt index 34dcd9bee7..de1a4480fe 100644 --- a/ext/soap/tests/schema/schema079.phpt +++ b/ext/soap/tests/schema/schema079.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 79: Element form qualified/unqualified (elementFormDefault="unqu <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="int1" type="int"/> - <element name="int2" type="int" form="qualified"/> - <element name="int3" type="int" form="unqualified"/> - </sequence> - </complexType> + <complexType name="testType"> + <sequence> + <element name="int1" type="int"/> + <element name="int2" type="int" form="qualified"/> + <element name="int3" type="int" form="unqualified"/> + </sequence> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int1"=>1.1,"int2"=>2.2,"int3"=>3.3), "rpc", "literal", 'elementFormDefault="unqualified"'); diff --git a/ext/soap/tests/schema/schema080.phpt b/ext/soap/tests/schema/schema080.phpt index 7519d6a30d..926bc8ae22 100644 --- a/ext/soap/tests/schema/schema080.phpt +++ b/ext/soap/tests/schema/schema080.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 80: Element form qualified/unqualified (elementFormDefault - def <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <sequence> - <element name="int1" type="int"/> - <element name="int2" type="int" form="qualified"/> - <element name="int3" type="int" form="unqualified"/> - </sequence> - </complexType> + <complexType name="testType"> + <sequence> + <element name="int1" type="int"/> + <element name="int2" type="int" form="qualified"/> + <element name="int3" type="int" form="unqualified"/> + </sequence> + </complexType> EOF; test_schema($schema,'type="tns:testType"',(object)array("int1"=>1.1,"int2"=>2.2,"int3"=>3.3), "rpc", "literal"); diff --git a/ext/soap/tests/schema/schema081.phpt b/ext/soap/tests/schema/schema081.phpt index 337f081261..976d95baf8 100644 --- a/ext/soap/tests/schema/schema081.phpt +++ b/ext/soap/tests/schema/schema081.phpt @@ -6,13 +6,13 @@ SOAP XML Schema 81: SOAP 1.1 Array with SOAP_USE_XSI_ARRAY_TYPE <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="SOAP-ENC:Array"> + <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5),"rpc","encoded",'',SOAP_USE_XSI_ARRAY_TYPE); echo "ok"; diff --git a/ext/soap/tests/schema/schema082.phpt b/ext/soap/tests/schema/schema082.phpt index 34c4c76c25..229e566afc 100644 --- a/ext/soap/tests/schema/schema082.phpt +++ b/ext/soap/tests/schema/schema082.phpt @@ -6,15 +6,15 @@ SOAP XML Schema 82: SOAP 1.1 Array with SOAP_USE_XSI_ARRAY_TYPE (second way) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <all> - <element name="x_item" type="int" maxOccurs="unbounded"/> - </all> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="SOAP-ENC:Array"> + <all> + <element name="x_item" type="int" maxOccurs="unbounded"/> + </all> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5),"rpc","encoded",'',SOAP_USE_XSI_ARRAY_TYPE); echo "ok"; diff --git a/ext/soap/tests/schema/schema083.phpt b/ext/soap/tests/schema/schema083.phpt index 854c4f9ff6..8bcf602305 100644 --- a/ext/soap/tests/schema/schema083.phpt +++ b/ext/soap/tests/schema/schema083.phpt @@ -6,14 +6,14 @@ SOAP XML Schema 83: SOAP 1.2 Array with SOAP_USE_XSI_ARRAY_TYPE <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> - <attribute ref="enc12:itemType" wsdl:itemType="int"/> - <attribute ref="enc12:arraySize" wsdl:arraySize="*"/> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> + <attribute ref="enc12:itemType" wsdl:itemType="int"/> + <attribute ref="enc12:arraySize" wsdl:arraySize="*"/> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5),"rpc","encoded",'',SOAP_USE_XSI_ARRAY_TYPE); echo "ok"; diff --git a/ext/soap/tests/schema/schema084.phpt b/ext/soap/tests/schema/schema084.phpt index 94a9551faf..62804c9ccc 100644 --- a/ext/soap/tests/schema/schema084.phpt +++ b/ext/soap/tests/schema/schema084.phpt @@ -6,15 +6,15 @@ SOAP XML Schema 84: SOAP 1.2 Array with SOAP_USE_XSI_ARRAY_TYPE (second way) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType"> - <complexContent> - <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> - <all> - <element name="x_item" type="int" maxOccurs="unbounded"/> - </all> - </restriction> + <complexType name="testType"> + <complexContent> + <restriction base="enc12:Array" xmlns:enc12="http://www.w3.org/2003/05/soap-encoding"> + <all> + <element name="x_item" type="int" maxOccurs="unbounded"/> + </all> + </restriction> </complexContent> - </complexType> + </complexType> EOF; test_schema($schema,'type="tns:testType"',array(123,123.5),"rpc","encoded",'',SOAP_USE_XSI_ARRAY_TYPE); echo "ok"; diff --git a/ext/soap/tests/schema/schema085.phpt b/ext/soap/tests/schema/schema085.phpt index 1a1ab15999..206553bb51 100644 --- a/ext/soap/tests/schema/schema085.phpt +++ b/ext/soap/tests/schema/schema085.phpt @@ -6,20 +6,20 @@ SOAP XML Schema 85: Extension of complex type (elements order) <?php include "test_schema.inc"; $schema = <<<EOF - <complexType name="testType2"> - <sequence> - <element name="int" type="int"/> - </sequence> - </complexType> - <complexType name="testType"> - <complexContent> - <extension base="tns:testType2"> - <sequence> - <element name="int2" type="int"/> - </sequence> - </extension> - </complexContent> - </complexType> + <complexType name="testType2"> + <sequence> + <element name="int" type="int"/> + </sequence> + </complexType> + <complexType name="testType"> + <complexContent> + <extension base="tns:testType2"> + <sequence> + <element name="int2" type="int"/> + </sequence> + </extension> + </complexContent> + </complexType> EOF; class A { public $int = 1; diff --git a/ext/soap/tests/schema/test_schema.inc b/ext/soap/tests/schema/test_schema.inc index 7afc4e697c..a0ba2c4dc1 100644 --- a/ext/soap/tests/schema/test_schema.inc +++ b/ext/soap/tests/schema/test_schema.inc @@ -2,8 +2,8 @@ $val = null; function test($input) { - global $val; - $val = $input; + global $val; + $val = $input; } function test_schema($schema,$type,$param,$style="rpc",$use="encoded", $attributeFormDefault='',$features=0) { @@ -22,27 +22,27 @@ $wsdl = <<<EOF <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test-uri/" $attributeFormDefault> <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/" /> <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/" /> - $schema + $schema </schema> </types> <message name="testMessage"> - <part name="testParam" $type/> + <part name="testParam" $type/> </message> - <portType name="testPortType"> - <operation name="test"> - <input message="testMessage"/> - </operation> - </portType> - <binding name="testBinding" type="testPortType"> - <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="test"> - <soap:operation soapAction="#test" style="$style"/> - <input> - <soap:body use="$use" namespace="http://test-uri/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - </operation> - </binding> - <service name="testService"> + <portType name="testPortType"> + <operation name="test"> + <input message="testMessage"/> + </operation> + </portType> + <binding name="testBinding" type="testPortType"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="test"> + <soap:operation soapAction="#test" style="$style"/> + <input> + <soap:body use="$use" namespace="http://test-uri/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> + </input> + </operation> + </binding> + <service name="testService"> <port name="testPort" binding="tns:testBinding"> <soap:address location="test://" /> </port> @@ -57,7 +57,7 @@ EOF; ini_set("soap.wsdl_cache_enabled",0); $x = new SoapClient($fname, array("trace"=>1,"exceptions"=>0,"features"=>$features)); $y = new SoapServer($fname, array("features"=>$features)); - $y->addfunction("test"); + $y->addfunction("test"); unlink($fname); $x->test($param); diff --git a/ext/soap/tests/server011.phpt b/ext/soap/tests/server011.phpt index 1c367d7d56..53c6521314 100644 --- a/ext/soap/tests/server011.phpt +++ b/ext/soap/tests/server011.phpt @@ -20,7 +20,7 @@ ob_end_clean(); if ($wsdl == file_get_contents(__DIR__."/test.wsdl")) { echo "ok\n"; } else { - echo "fail\n"; + echo "fail\n"; } ?> --EXPECT-- diff --git a/ext/soap/tests/server016.phpt b/ext/soap/tests/server016.phpt index 8934f46afe..acef045a46 100644 --- a/ext/soap/tests/server016.phpt +++ b/ext/soap/tests/server016.phpt @@ -5,8 +5,8 @@ SOAP Server 16: user fault --FILE-- <?php function test() { - global $server; - $server->fault("MyFault","My fault string"); + global $server; + $server->fault("MyFault","My fault string"); } $server = new soapserver(null,array('uri'=>"http://testuri.org")); diff --git a/ext/soap/tests/server017.phpt b/ext/soap/tests/server017.phpt index 3ff0acb4e9..a635065750 100644 --- a/ext/soap/tests/server017.phpt +++ b/ext/soap/tests/server017.phpt @@ -5,7 +5,7 @@ SOAP Server 17: user fault (through return) --FILE-- <?php function test() { - return new SoapFault("MyFault","My fault string"); + return new SoapFault("MyFault","My fault string"); } $server = new soapserver(null,array('uri'=>"http://testuri.org")); diff --git a/ext/soap/tests/server018.phpt b/ext/soap/tests/server018.phpt index b033ed9c57..2c379d85dd 100644 --- a/ext/soap/tests/server018.phpt +++ b/ext/soap/tests/server018.phpt @@ -5,7 +5,7 @@ SOAP Server 18: user fault (through throw) --FILE-- <?php function test() { - throw new SoapFault("MyFault","My fault string"); + throw new SoapFault("MyFault","My fault string"); } $server = new soapserver(null,array('uri'=>"http://testuri.org")); diff --git a/ext/soap/tests/server022.phpt b/ext/soap/tests/server022.phpt index ff79a1518f..82270f8eef 100644 --- a/ext/soap/tests/server022.phpt +++ b/ext/soap/tests/server022.phpt @@ -5,14 +5,14 @@ SOAP Server 22: user fault (through throw of subclass) --FILE-- <?php class MyFault extends SoapFault { - function __construct() { - parent::__construct("MyFault","My fault string"); - } + function __construct() { + parent::__construct("MyFault","My fault string"); + } } function test() { - throw new MyFault; + throw new MyFault; } $server = new soapserver(null,array('uri'=>"http://testuri.org")); diff --git a/ext/soap/tests/server023.phpt b/ext/soap/tests/server023.phpt index 5614599f3a..07f3aea554 100644 --- a/ext/soap/tests/server023.phpt +++ b/ext/soap/tests/server023.phpt @@ -5,10 +5,10 @@ SOAP Server 23: Send SOAP headers those were not received --FILE-- <?php function test() { - global $server; - $server->addSoapHeader(new SoapHeader("http://testuri.org", "Test1", "Hello Header!")); - $server->addSoapHeader(new SoapHeader("http://testuri.org", "Test2", "Hello Header!")); - return "Hello Body!"; + global $server; + $server->addSoapHeader(new SoapHeader("http://testuri.org", "Test1", "Hello Header!")); + $server->addSoapHeader(new SoapHeader("http://testuri.org", "Test2", "Hello Header!")); + return "Hello Body!"; } $server = new soapserver(null,array('uri'=>"http://testuri.org")); diff --git a/ext/soap/tests/server024.phpt b/ext/soap/tests/server024.phpt index 7db30621d3..63cf06cd02 100644 --- a/ext/soap/tests/server024.phpt +++ b/ext/soap/tests/server024.phpt @@ -5,22 +5,22 @@ SOAP Server 24: Send SOAP headers those were not received --FILE-- <?php class TestHeader1 extends SoapHeader { - function __construct($data) { - parent::__construct("http://testuri.org", "Test1", $data); - } + function __construct($data) { + parent::__construct("http://testuri.org", "Test1", $data); + } } class TestHeader2 extends SoapHeader { - function __construct($data) { - parent::__construct("http://testuri.org", "Test2", $data); - } + function __construct($data) { + parent::__construct("http://testuri.org", "Test2", $data); + } } function test() { - global $server; - $server->addSoapHeader(new TestHeader1("Hello Header!")); - $server->addSoapHeader(new TestHeader2("Hello Header!")); - return "Hello Body!"; + global $server; + $server->addSoapHeader(new TestHeader1("Hello Header!")); + $server->addSoapHeader(new TestHeader2("Hello Header!")); + return "Hello Body!"; } $server = new soapserver(null,array('uri'=>"http://testuri.org")); diff --git a/ext/soap/tests/server025.phpt b/ext/soap/tests/server025.phpt index 5366c7ad91..871134f935 100644 --- a/ext/soap/tests/server025.phpt +++ b/ext/soap/tests/server025.phpt @@ -7,22 +7,22 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php class TestHeader1 extends SoapHeader { - function __construct($data) { - parent::__construct("http://testuri.org", "Test1", $data); - } + function __construct($data) { + parent::__construct("http://testuri.org", "Test1", $data); + } } class TestHeader2 extends SoapHeader { - function __construct($data) { - parent::__construct("http://testuri.org", "Test2", $data); - } + function __construct($data) { + parent::__construct("http://testuri.org", "Test2", $data); + } } function test() { - global $server; - $server->addSoapHeader(new TestHeader1("Hello Header!")); - $server->addSoapHeader(new TestHeader2("Hello Header!")); - return "Hello Body!"; + global $server; + $server->addSoapHeader(new TestHeader1("Hello Header!")); + $server->addSoapHeader(new TestHeader2("Hello Header!")); + return "Hello Body!"; } $server = new soapserver(__DIR__."/server025.wsdl"); diff --git a/ext/soap/tests/server031.phpt b/ext/soap/tests/server031.phpt index c9f8d95f8e..987ad4ab59 100644 --- a/ext/soap/tests/server031.phpt +++ b/ext/soap/tests/server031.phpt @@ -7,11 +7,11 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php class ItemArray implements Iterator { - private $a = array(); + private $a = array(); - public function __construct(array $a) { - $this->a = $a; - } + public function __construct(array $a) { + $this->a = $a; + } public function rewind() { return reset($this->a); } public function current() { return current($this->a); } @@ -23,26 +23,26 @@ class ItemArray implements Iterator { class Item { public $text; - public function __construct($n) { - $this->text = 'text'.$n; - } + public function __construct($n) { + $this->text = 'text'.$n; + } } class handlerClass { public function getItems() { return new ItemArray(array( - new Item(0), - new Item(1), - new Item(2), - new Item(3), - new Item(4), - new Item(5), - new Item(6), - new Item(7), - new Item(8), - new Item(9) - )); + new Item(0), + new Item(1), + new Item(2), + new Item(3), + new Item(4), + new Item(5), + new Item(6), + new Item(7), + new Item(8), + new Item(9) + )); } } diff --git a/ext/soap/tests/soap12/T01.phpt b/ext/soap/tests/soap12/T01.phpt index d584812d09..45aadbad86 100644 --- a/ext/soap/tests/soap12/T01.phpt +++ b/ext/soap/tests/soap12/T01.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T01 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoOk xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/next">foo</test:echoOk> diff --git a/ext/soap/tests/soap12/T02.phpt b/ext/soap/tests/soap12/T02.phpt index db2c260684..d7f9880143 100644 --- a/ext/soap/tests/soap12/T02.phpt +++ b/ext/soap/tests/soap12/T02.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T02 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoOk xmlns:test="http://example.org/ts-tests" env:role="http://example.org/ts-tests/C">foo</test:echoOk> diff --git a/ext/soap/tests/soap12/T03.phpt b/ext/soap/tests/soap12/T03.phpt index 19c29dd3dd..1d7aa3b0d3 100644 --- a/ext/soap/tests/soap12/T03.phpt +++ b/ext/soap/tests/soap12/T03.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T03 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoOk xmlns:test="http://example.org/ts-tests">foo</test:echoOk> </env:Header> diff --git a/ext/soap/tests/soap12/T04.phpt b/ext/soap/tests/soap12/T04.phpt index 7445caedee..2bef7626d8 100644 --- a/ext/soap/tests/soap12/T04.phpt +++ b/ext/soap/tests/soap12/T04.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T04 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoOk xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver">foo</test:echoOk> diff --git a/ext/soap/tests/soap12/T05.phpt b/ext/soap/tests/soap12/T05.phpt index 187eb2ee83..c5e0054eb3 100644 --- a/ext/soap/tests/soap12/T05.phpt +++ b/ext/soap/tests/soap12/T05.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T05 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoOk xmlns:test="http://example.org/ts-tests" env:role="http://example.org/ts-tests/B">foo</test:echoOk> diff --git a/ext/soap/tests/soap12/T10.phpt b/ext/soap/tests/soap12/T10.phpt index 54186f6a0d..6c2a3ea417 100644 --- a/ext/soap/tests/soap12/T10.phpt +++ b/ext/soap/tests/soap12/T10.phpt @@ -6,9 +6,9 @@ SOAP 1.2: T10 unknownHdr <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> - <test:Unknown xmlns:test="http://example.org/ts-tests" + <test:Unknown xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver">foo</test:Unknown> </env:Header> <env:Body> diff --git a/ext/soap/tests/soap12/T11.phpt b/ext/soap/tests/soap12/T11.phpt index 3423d54329..d805596bed 100644 --- a/ext/soap/tests/soap12/T11.phpt +++ b/ext/soap/tests/soap12/T11.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T11 unknownHdr <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:Unknown xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver" diff --git a/ext/soap/tests/soap12/T12.phpt b/ext/soap/tests/soap12/T12.phpt index c67917f0e3..7a1cc56bec 100644 --- a/ext/soap/tests/soap12/T12.phpt +++ b/ext/soap/tests/soap12/T12.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T12 unknownHdr <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:Unknown xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver" diff --git a/ext/soap/tests/soap12/T13.phpt b/ext/soap/tests/soap12/T13.phpt index 95e1c8ad4e..2d7fec0757 100644 --- a/ext/soap/tests/soap12/T13.phpt +++ b/ext/soap/tests/soap12/T13.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T13 unknownHdr <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:Unknown xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver" diff --git a/ext/soap/tests/soap12/T14.phpt b/ext/soap/tests/soap12/T14.phpt index dbf4e1bab5..1bed2aa2d0 100644 --- a/ext/soap/tests/soap12/T14.phpt +++ b/ext/soap/tests/soap12/T14.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T14 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoOk xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver" diff --git a/ext/soap/tests/soap12/T15.phpt b/ext/soap/tests/soap12/T15.phpt index 546f94237f..d68d43c097 100644 --- a/ext/soap/tests/soap12/T15.phpt +++ b/ext/soap/tests/soap12/T15.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T15 unknownHdr <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:Unknown xmlns:test="http://example.org/ts-tests" env:role="http://example.org/ts-tests/B" diff --git a/ext/soap/tests/soap12/T19.phpt b/ext/soap/tests/soap12/T19.phpt index 8ddb5b4f8b..2f5e132f01 100644 --- a/ext/soap/tests/soap12/T19.phpt +++ b/ext/soap/tests/soap12/T19.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T19 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoOk xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/none" diff --git a/ext/soap/tests/soap12/T22.phpt b/ext/soap/tests/soap12/T22.phpt index 5844550ced..2976bc577a 100644 --- a/ext/soap/tests/soap12/T22.phpt +++ b/ext/soap/tests/soap12/T22.phpt @@ -6,9 +6,9 @@ SOAP 1.2: T22 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> - <test:echoOk xmlns:test="http://example.org/ts-tests" + <test:echoOk xmlns:test="http://example.org/ts-tests" env:mustUnderstand = "1">foo</test:echoOk> </env:Header> <env:Body> diff --git a/ext/soap/tests/soap12/T23.phpt b/ext/soap/tests/soap12/T23.phpt index c676fb176c..095e5e725f 100644 --- a/ext/soap/tests/soap12/T23.phpt +++ b/ext/soap/tests/soap12/T23.phpt @@ -6,11 +6,11 @@ SOAP 1.2: T23 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> - <test:Unknown xmlns:test="http://example.org/ts-tests" + <test:Unknown xmlns:test="http://example.org/ts-tests" env:mustUnderstand="1">foo</test:Unknown> - <test:echoOk xmlns:test="http://example.org/ts-tests" + <test:echoOk xmlns:test="http://example.org/ts-tests" env:mustUnderstand="wrong">foo</test:echoOk> </env:Header> <env:Body> diff --git a/ext/soap/tests/soap12/T24.phpt b/ext/soap/tests/soap12/T24.phpt index ebee3b764a..97bd56cf47 100644 --- a/ext/soap/tests/soap12/T24.phpt +++ b/ext/soap/tests/soap12/T24.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T24 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://wrong-version/"> +<env:Envelope xmlns:env="http://wrong-version/"> <env:Body> <test:echoOk xmlns:test="http://example.org/ts-tests"> foo diff --git a/ext/soap/tests/soap12/T25.phpt b/ext/soap/tests/soap12/T25.phpt index ac45e9c52d..ac5e1a0efd 100644 --- a/ext/soap/tests/soap12/T25.phpt +++ b/ext/soap/tests/soap12/T25.phpt @@ -7,7 +7,7 @@ SOAP 1.2: T25 echoOk $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> <!DOCTYPE env:Envelope SYSTEM "env.dtd"[]> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Body> <test:echoOk xmlns:test="http://example.org/ts-tests"> foo diff --git a/ext/soap/tests/soap12/T26.phpt b/ext/soap/tests/soap12/T26.phpt index 53c8cec495..8b23ba7b63 100644 --- a/ext/soap/tests/soap12/T26.phpt +++ b/ext/soap/tests/soap12/T26.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T26 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <?xml-stylesheet href="http://example.org/ts-tests/sub.xsl" type = "text/xsl"?> <env:Body> <test:echoOk xmlns:test="http://example.org/ts-tests">foo</test:echoOk> diff --git a/ext/soap/tests/soap12/T27.phpt b/ext/soap/tests/soap12/T27.phpt index 81db8ee5bc..3cb42940be 100644 --- a/ext/soap/tests/soap12/T27.phpt +++ b/ext/soap/tests/soap12/T27.phpt @@ -9,14 +9,14 @@ $HTTP_RAW_POST_DATA = <<<EOF <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <env:Body> - <test:echoStringArray xmlns:test="http://example.org/ts-tests" + <test:echoStringArray xmlns:test="http://example.org/ts-tests" xmlns:enc="http://www.w3.org/2003/05/soap-encoding" env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"> <test:array enc:itemType="xs:string" enc:arraySize="1"> <a> <b>1</b> </a> - </test:array> + </test:array> </test:echoStringArray> </env:Body> </env:Envelope> diff --git a/ext/soap/tests/soap12/T28.phpt b/ext/soap/tests/soap12/T28.phpt index 751df133db..019cabcdb9 100644 --- a/ext/soap/tests/soap12/T28.phpt +++ b/ext/soap/tests/soap12/T28.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T28 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Body env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"> <test:echoOk xmlns:test="http://example.org/ts-tests" > foo diff --git a/ext/soap/tests/soap12/T29.phpt b/ext/soap/tests/soap12/T29.phpt index 3784da4030..85a3a61ae1 100644 --- a/ext/soap/tests/soap12/T29.phpt +++ b/ext/soap/tests/soap12/T29.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T29 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoOk xmlns:test="http://example.org/ts-tests" env:role="http://example.org/ts-tests/Czzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz">foo</test:echoOk> diff --git a/ext/soap/tests/soap12/T31.phpt b/ext/soap/tests/soap12/T31.phpt index f00e25a59a..689f62bd00 100644 --- a/ext/soap/tests/soap12/T31.phpt +++ b/ext/soap/tests/soap12/T31.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T31 returnVoid <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Body> <test:returnVoid xmlns:test="http://example.org/ts-tests"> </test:returnVoid> diff --git a/ext/soap/tests/soap12/T32.phpt b/ext/soap/tests/soap12/T32.phpt index 8f77873f4c..7d9dc1006a 100644 --- a/ext/soap/tests/soap12/T32.phpt +++ b/ext/soap/tests/soap12/T32.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T32 echoHeader <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:requiredHeader xmlns:test="http://example.org/ts-tests" env:mustUnderstand="true">foo</test:requiredHeader> diff --git a/ext/soap/tests/soap12/T33.phpt b/ext/soap/tests/soap12/T33.phpt index 00ded875b5..76f90bce1b 100644 --- a/ext/soap/tests/soap12/T33.phpt +++ b/ext/soap/tests/soap12/T33.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T33 nonexistentMethod <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Body> <test:DoesNotExist xmlns:test="http://example.org/ts-tests"> </test:DoesNotExist> diff --git a/ext/soap/tests/soap12/T34.phpt b/ext/soap/tests/soap12/T34.phpt index 39e0095d43..873013cbc8 100644 --- a/ext/soap/tests/soap12/T34.phpt +++ b/ext/soap/tests/soap12/T34.phpt @@ -6,9 +6,9 @@ SOAP 1.2: T34 unknownHdr <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> - <test:Unknown xmlns:test="http://example.org/ts-tests" + <test:Unknown xmlns:test="http://example.org/ts-tests" xmlns:env1="http://schemas.xmlsoap.org/soap/envelope/" env1:mustUnderstand="true">foo</test:Unknown> </env:Header> diff --git a/ext/soap/tests/soap12/T35.phpt b/ext/soap/tests/soap12/T35.phpt index a736010ce0..b6511e8e80 100644 --- a/ext/soap/tests/soap12/T35.phpt +++ b/ext/soap/tests/soap12/T35.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T35 unknownHdr <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:Unknown xmlns:test="http://example.org/ts-tests" env:mustUnderstand="1"> diff --git a/ext/soap/tests/soap12/T36.phpt b/ext/soap/tests/soap12/T36.phpt index d625813942..b1efaeaf90 100644 --- a/ext/soap/tests/soap12/T36.phpt +++ b/ext/soap/tests/soap12/T36.phpt @@ -6,10 +6,10 @@ SOAP 1.2: T36 unknownHdr <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:Unknown xmlns:test="http://example.org/ts-tests" - env:mustUnderstand="1" + env:mustUnderstand="1" env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver">foo</test:Unknown> </env:Header> <env:Body> diff --git a/ext/soap/tests/soap12/T37.phpt b/ext/soap/tests/soap12/T37.phpt index cdce8a4429..848c0a4aa4 100644 --- a/ext/soap/tests/soap12/T37.phpt +++ b/ext/soap/tests/soap12/T37.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T37 unknownHdr <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:Unknown xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver">foo</test:Unknown> diff --git a/ext/soap/tests/soap12/T38_1.phpt b/ext/soap/tests/soap12/T38_1.phpt index 30007e55ef..8bc8cf185b 100644 --- a/ext/soap/tests/soap12/T38_1.phpt +++ b/ext/soap/tests/soap12/T38_1.phpt @@ -6,13 +6,13 @@ SOAP 1.2: T38.1 doubleHdr <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:Unknown xmlns:test="http://example.org/ts-tests" - env:mustUnderstand="false" + env:mustUnderstand="false" env:role="http://example.org/ts-tests/C">foo</test:Unknown> <test:echoOk xmlns:test="http://example.org/ts-tests" - env:mustUnderstand="0" + env:mustUnderstand="0" env:role="http://example.org/ts-tests/C">foo</test:echoOk> </env:Header> <env:Body> diff --git a/ext/soap/tests/soap12/T38_2.phpt b/ext/soap/tests/soap12/T38_2.phpt index efff2f4db3..8408ab783f 100644 --- a/ext/soap/tests/soap12/T38_2.phpt +++ b/ext/soap/tests/soap12/T38_2.phpt @@ -6,13 +6,13 @@ SOAP 1.2: T38.2 doubleHdr <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoOk xmlns:test="http://example.org/ts-tests" - env:mustUnderstand="true" + env:mustUnderstand="true" env:role="http://example.org/ts-tests/C">foo</test:echoOk> <test:echoOk xmlns:test="http://example.org/ts-tests" - env:mustUnderstand="1" + env:mustUnderstand="1" env:role="http://example.org/ts-tests/C">bar</test:echoOk> </env:Header> <env:Body> diff --git a/ext/soap/tests/soap12/T39.phpt b/ext/soap/tests/soap12/T39.phpt index 2b29562aba..f4ddcc9d20 100644 --- a/ext/soap/tests/soap12/T39.phpt +++ b/ext/soap/tests/soap12/T39.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T39 unknownHdr <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:Unknown xmlns:test="http://example.org/ts-tests" env:mustUnderstand="9">foo</test:Unknown> diff --git a/ext/soap/tests/soap12/T40.phpt b/ext/soap/tests/soap12/T40.phpt index 332e5768dd..2814309321 100644 --- a/ext/soap/tests/soap12/T40.phpt +++ b/ext/soap/tests/soap12/T40.phpt @@ -6,10 +6,10 @@ SOAP 1.2: T40 echoOK <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:Unknown xmlns:test="http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]/ts-tests" - env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver" + env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver" env:mustUnderstand="false"> foo </test:Unknown> diff --git a/ext/soap/tests/soap12/T46.phpt b/ext/soap/tests/soap12/T46.phpt index 8098ef72e7..fbbf543fdf 100644 --- a/ext/soap/tests/soap12/T46.phpt +++ b/ext/soap/tests/soap12/T46.phpt @@ -10,7 +10,7 @@ $HTTP_RAW_POST_DATA = <<<EOF xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> - <test:echoNestedArray xmlns:test="http://exaple.org/ts-tests" + <test:echoNestedArray xmlns:test="http://example.org/ts-tests" env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"> <inputStruct xsi:type="ns1:SOAPArrayStruct" xmlns:ns1="http://example.org/ts-tests/xsd"> @@ -18,7 +18,7 @@ $HTTP_RAW_POST_DATA = <<<EOF <varFloat xsi:type="xsd:float">0.005</varFloat> <varString xsi:type="xsd:string">hello world</varString> <varArray enc:itemType="xsd:string" enc:arraySize="3" - xmlns:enc="http://www.w3.org/2003/05/soap-encoding"> + xmlns:enc="http://www.w3.org/2003/05/soap-encoding"> <item xsi:type="xsd:string">red</item> <item xsi:type="xsd:string">blue</item> <item xsi:type="xsd:string">green</item> diff --git a/ext/soap/tests/soap12/T49.phpt b/ext/soap/tests/soap12/T49.phpt index 9687d03b94..01ac0e679f 100644 --- a/ext/soap/tests/soap12/T49.phpt +++ b/ext/soap/tests/soap12/T49.phpt @@ -7,7 +7,7 @@ SOAP 1.2: T49 echoStringArray $HTTP_RAW_POST_DATA = <<<EOF <?xml version="1.0"?> <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <test:echoStringArray xmlns:test="http://example.org/ts-tests" diff --git a/ext/soap/tests/soap12/T50.phpt b/ext/soap/tests/soap12/T50.phpt index e3fcc0c316..66263abcb7 100644 --- a/ext/soap/tests/soap12/T50.phpt +++ b/ext/soap/tests/soap12/T50.phpt @@ -7,7 +7,7 @@ SOAP 1.2: T50 echoIntegerArray $HTTP_RAW_POST_DATA = <<<EOF <?xml version="1.0"?> <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <test:echoIntegerArray xmlns:test="http://example.org/ts-tests" diff --git a/ext/soap/tests/soap12/T52.phpt b/ext/soap/tests/soap12/T52.phpt index 9d75fb9823..7cd229b741 100644 --- a/ext/soap/tests/soap12/T52.phpt +++ b/ext/soap/tests/soap12/T52.phpt @@ -7,7 +7,7 @@ SOAP 1.2: T52 echoBoolean $HTTP_RAW_POST_DATA = <<<EOF <?xml version="1.0"?> <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <test:echoBoolean xmlns:test="http://example.org/ts-tests" diff --git a/ext/soap/tests/soap12/T53.phpt b/ext/soap/tests/soap12/T53.phpt index c1c8fe63aa..5bff2c775f 100644 --- a/ext/soap/tests/soap12/T53.phpt +++ b/ext/soap/tests/soap12/T53.phpt @@ -7,7 +7,7 @@ SOAP 1.2: T53 echoDate $HTTP_RAW_POST_DATA = <<<EOF <?xml version="1.0" encoding="UTF-8"?> <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <test:echoDate xmlns:test="http://example.org/ts-tests" diff --git a/ext/soap/tests/soap12/T54.phpt b/ext/soap/tests/soap12/T54.phpt index ba3ed35526..ac33859a75 100644 --- a/ext/soap/tests/soap12/T54.phpt +++ b/ext/soap/tests/soap12/T54.phpt @@ -7,7 +7,7 @@ SOAP 1.2: T54 echoDecimal $HTTP_RAW_POST_DATA = <<<EOF <?xml version="1.0" encoding="UTF-8"?> <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <test:echoDecimal xmlns:test="http://example.org/ts-tests" diff --git a/ext/soap/tests/soap12/T55.phpt b/ext/soap/tests/soap12/T55.phpt index 1c12e504f2..5e362854f9 100644 --- a/ext/soap/tests/soap12/T55.phpt +++ b/ext/soap/tests/soap12/T55.phpt @@ -7,7 +7,7 @@ SOAP 1.2: T55 echoFloat $HTTP_RAW_POST_DATA = <<<EOF <?xml version="1.0"?> <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <test:echoFloat xmlns:test="http://example.org/ts-tests" diff --git a/ext/soap/tests/soap12/T58.phpt b/ext/soap/tests/soap12/T58.phpt index aa53985486..9878baeacf 100644 --- a/ext/soap/tests/soap12/T58.phpt +++ b/ext/soap/tests/soap12/T58.phpt @@ -6,16 +6,16 @@ SOAP 1.2: T58 echoIntegerArray <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> - <test:echoIntegerArray xmlns:test="http://example.org/ts-tests" + <test:echoIntegerArray xmlns:test="http://example.org/ts-tests" env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"> <inputIntegerArray enc:itemType="xsd:int" enc:arraySize="1" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"> <a><b>1</b></a> - </inputIntegerArray> + </inputIntegerArray> </test:echoIntegerArray> </env:Body> </env:Envelope> diff --git a/ext/soap/tests/soap12/T59.phpt b/ext/soap/tests/soap12/T59.phpt index 2ceef325bb..4c0ec5a382 100644 --- a/ext/soap/tests/soap12/T59.phpt +++ b/ext/soap/tests/soap12/T59.phpt @@ -7,12 +7,12 @@ SOAP 1.2: T59 echoStringArray $HTTP_RAW_POST_DATA = <<<EOF <?xml version="1.0"?> <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> <test:echoStringArray xmlns:test="http://example.org/ts-tests" env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"> - <inputStringArray enc:itemType="xsd:string" + <inputStringArray enc:itemType="xsd:string" xmlns:enc="http://www.w3.org/2003/05/soap-encoding"> <item enc:id="data" xsi:type="xsd:string" enc:ref="#data">hello</item> <item>world</item> diff --git a/ext/soap/tests/soap12/T63.phpt b/ext/soap/tests/soap12/T63.phpt index 5a41ef0109..72b9ca35f5 100644 --- a/ext/soap/tests/soap12/T63.phpt +++ b/ext/soap/tests/soap12/T63.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T63 validateCountryCode <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:validateCountryCode xmlns:test="http://example.org/ts-tests" env:role="http://example.org/ts-tests/C" diff --git a/ext/soap/tests/soap12/T64.phpt b/ext/soap/tests/soap12/T64.phpt index 24e62ecb6b..932c112d83 100644 --- a/ext/soap/tests/soap12/T64.phpt +++ b/ext/soap/tests/soap12/T64.phpt @@ -9,7 +9,7 @@ $HTTP_RAW_POST_DATA = <<<EOF <!DOCTYPE DOC [ <!NOTATION application_xml SYSTEM 'http://www.isi.edu/in-notes/iana/assignments/media-types/application/xml'> ]> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Body> <test:echoOk xmlns:test="http://example.org/ts-tests"> foo diff --git a/ext/soap/tests/soap12/T65.phpt b/ext/soap/tests/soap12/T65.phpt index cd96d4a82f..e89ce995d8 100644 --- a/ext/soap/tests/soap12/T65.phpt +++ b/ext/soap/tests/soap12/T65.phpt @@ -11,7 +11,7 @@ $HTTP_RAW_POST_DATA = <<<EOF <!ELEMENT Body (echoOk) > <!ELEMENT echoOk (#PCDATA) > ]> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Body> <test:echoOk xmlns:test="http://example.org/ts-tests"> foo diff --git a/ext/soap/tests/soap12/T66.phpt b/ext/soap/tests/soap12/T66.phpt index cc7cc2e3e3..23586b8ee7 100644 --- a/ext/soap/tests/soap12/T66.phpt +++ b/ext/soap/tests/soap12/T66.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T66 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' encoding='UTF8'?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoOk xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/next">foo</test:echoOk> diff --git a/ext/soap/tests/soap12/T67.phpt b/ext/soap/tests/soap12/T67.phpt index ddc527a6ec..dd197a1b82 100644 --- a/ext/soap/tests/soap12/T67.phpt +++ b/ext/soap/tests/soap12/T67.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T67 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' standalone='yes'?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoOk xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/next">foo</test:echoOk> diff --git a/ext/soap/tests/soap12/T68.phpt b/ext/soap/tests/soap12/T68.phpt index acf4230973..0dfa08ff16 100644 --- a/ext/soap/tests/soap12/T68.phpt +++ b/ext/soap/tests/soap12/T68.phpt @@ -5,7 +5,7 @@ SOAP 1.2: T68 echoOk --FILE-- <?php $HTTP_RAW_POST_DATA = <<<EOF -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header > diff --git a/ext/soap/tests/soap12/T69.phpt b/ext/soap/tests/soap12/T69.phpt index 0fb02dec06..8a64745f95 100644 --- a/ext/soap/tests/soap12/T69.phpt +++ b/ext/soap/tests/soap12/T69.phpt @@ -8,7 +8,7 @@ $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> - <test:echoOk xmlns:test="http://example.org/ts-tests">foo</test:echoOk> + <test:echoOk xmlns:test="http://example.org/ts-tests">foo</test:echoOk> </env:Header> </env:Envelope> EOF; diff --git a/ext/soap/tests/soap12/T70.phpt b/ext/soap/tests/soap12/T70.phpt index 3622c320e7..9b665bf176 100644 --- a/ext/soap/tests/soap12/T70.phpt +++ b/ext/soap/tests/soap12/T70.phpt @@ -8,7 +8,7 @@ $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> - <test:echoOk xmlns:test="http://example.org/ts-tests">foo</test:echoOk> + <test:echoOk xmlns:test="http://example.org/ts-tests">foo</test:echoOk> </env:Header> <env:Body> </env:Body> diff --git a/ext/soap/tests/soap12/T71.phpt b/ext/soap/tests/soap12/T71.phpt index fdb5b8d460..dffaf585d3 100644 --- a/ext/soap/tests/soap12/T71.phpt +++ b/ext/soap/tests/soap12/T71.phpt @@ -9,7 +9,7 @@ $HTTP_RAW_POST_DATA = <<<EOF <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" attr1="a-value"> <env:Header> - <test:echoOk xmlns:test="http://example.org/ts-tests"> + <test:echoOk xmlns:test="http://example.org/ts-tests"> foo </test:echoOk> </env:Header> diff --git a/ext/soap/tests/soap12/T72.phpt b/ext/soap/tests/soap12/T72.phpt index b8f5060c6b..3b4db8c3f3 100644 --- a/ext/soap/tests/soap12/T72.phpt +++ b/ext/soap/tests/soap12/T72.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T72 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" env:encodingStyle="http://www.w3.org/2003/05/soap-encoding"> <env:Body> <test:echoOk xmlns:test="http://example.org/ts-tests"> diff --git a/ext/soap/tests/soap12/T74.phpt b/ext/soap/tests/soap12/T74.phpt index 703e1870a6..4f210b642e 100644 --- a/ext/soap/tests/soap12/T74.phpt +++ b/ext/soap/tests/soap12/T74.phpt @@ -6,12 +6,12 @@ SOAP 1.2: T74 doubleHdr <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoOk xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/next">foo</test:echoOk> <test:Unknown xmlns:test="http://example.org/ts-tests"> - <test:raiseFault env:mustUnderstand="1" + <test:raiseFault env:mustUnderstand="1" env:role="http://www.w3.org/2003/05/soap-envelope/role/next"> </test:raiseFault> </test:Unknown> diff --git a/ext/soap/tests/soap12/T75.phpt b/ext/soap/tests/soap12/T75.phpt index 3e2166d957..cdee965db0 100644 --- a/ext/soap/tests/soap12/T75.phpt +++ b/ext/soap/tests/soap12/T75.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T75 echoResolvedRef <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoResolvedRef xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/next" diff --git a/ext/soap/tests/soap12/T76_1.phpt b/ext/soap/tests/soap12/T76_1.phpt index e97c179768..87f4c55f09 100644 --- a/ext/soap/tests/soap12/T76_1.phpt +++ b/ext/soap/tests/soap12/T76_1.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T76.1 echoString <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> diff --git a/ext/soap/tests/soap12/T77_1.phpt b/ext/soap/tests/soap12/T77_1.phpt index d847b6cfd8..3cf3f4358a 100644 --- a/ext/soap/tests/soap12/T77_1.phpt +++ b/ext/soap/tests/soap12/T77_1.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T77.1 isNil <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> diff --git a/ext/soap/tests/soap12/T77_2.phpt b/ext/soap/tests/soap12/T77_2.phpt index c829b57892..4d18b374dc 100644 --- a/ext/soap/tests/soap12/T77_2.phpt +++ b/ext/soap/tests/soap12/T77_2.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T77.2 isNil <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> diff --git a/ext/soap/tests/soap12/T77_3.phpt b/ext/soap/tests/soap12/T77_3.phpt index 0e1355a5a2..1242daf0ea 100644 --- a/ext/soap/tests/soap12/T77_3.phpt +++ b/ext/soap/tests/soap12/T77_3.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T77.3 isNul <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <env:Body> diff --git a/ext/soap/tests/soap12/T78.phpt b/ext/soap/tests/soap12/T78.phpt index 63d13c7cae..228a88ad43 100644 --- a/ext/soap/tests/soap12/T78.phpt +++ b/ext/soap/tests/soap12/T78.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T78 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version='1.0' ?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Header> <test:echoOk xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver">foo</test:echoOk> diff --git a/ext/soap/tests/soap12/T80.phpt b/ext/soap/tests/soap12/T80.phpt index 1ac114ba32..e987338ea8 100644 --- a/ext/soap/tests/soap12/T80.phpt +++ b/ext/soap/tests/soap12/T80.phpt @@ -6,7 +6,7 @@ SOAP 1.2: T80 echoOk <?php $HTTP_RAW_POST_DATA = <<<EOF <?xml version="1.0"?> -<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> +<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"> <env:Body> <test:echoOk xmlns:test="http://example.org/ts-tests" env:encodingStyle="http://example.org/PoisonEncoding">foo</test:echoOk> </env:Body> diff --git a/ext/soap/tests/soap12/soap12-test.inc b/ext/soap/tests/soap12/soap12-test.inc index e27712241f..550494e516 100644 --- a/ext/soap/tests/soap12/soap12-test.inc +++ b/ext/soap/tests/soap12/soap12-test.inc @@ -1,124 +1,124 @@ <?php class Soap12test { - public $header; + public $header; - function echoOk($x) { - return $x; - } + function echoOk($x) { + return $x; + } - function echoString($inputString) { - return $inputString; - } + function echoString($inputString) { + return $inputString; + } - function echoStringArray($inputStringArray) { - return $inputStringArray; - } + function echoStringArray($inputStringArray) { + return $inputStringArray; + } - function echoInteger($inputInteger) { - return $inputInteger; - } + function echoInteger($inputInteger) { + return $inputInteger; + } - function echoIntegerArray($inputIntegerArray) { - return $inputIntegerArray; - } + function echoIntegerArray($inputIntegerArray) { + return $inputIntegerArray; + } - function echoFloat($inputFloat) { - return $inputFloat; - } + function echoFloat($inputFloat) { + return $inputFloat; + } - function echoFloatArray($inputFloatArray) { - return $inputFloatArray; + function echoFloatArray($inputFloatArray) { + return $inputFloatArray; } - function echoStruct($x) { - return $x; - } + function echoStruct($x) { + return $x; + } - function echoStructArray($x) { - return $x; - } + function echoStructArray($x) { + return $x; + } - function echoVoid() { - return NULL; - } + function echoVoid() { + return NULL; + } - function echoBase64($b_encoded) { - return $b_encoded; + function echoBase64($b_encoded) { + return $b_encoded; } - function echoDate($timeInstant) { - return $timeInstant; - } - - function echoHexBinary($hb) { - return $hb; - } - - function echoDecimal($dec) { - return $dec; - } - - function echoBoolean($boolean) { - return $boolean; - } - - function echoStructAsSimpleTypes ($struct) { - return array('outputString' => $struct->varString, - 'outputInteger' => $struct->varInt, - 'outputFloat' => $struct->varFloat); - } - - function echoSimpleTypesAsStruct($string, $int, $float) { - return (object)array("varString" => $string, - "varInt" => $int, - "varFloat" => $float); - } - - function echoNestedStruct($struct) { - return $struct; - } - - function echo2DStringArray($ary) { - return $ary; - } - - function echoNestedArray($ary) { - return $ary; - } - - function countItems($input) { - return count($input); - } - - function isNil($input=NULL) { - return is_null($input); - } - - function returnVoid() { - } - - function emptyBody() { - } - - function requiredHeader($x) { - $this->header = $x; - } - - function echoHeader() { - return $this->header; - } - - function echoResolvedRef($ref) { - return $ref->RelativeReference->base.$ref->RelativeReference->href; - } - - function validateCountryCode($code) { - if (strlen($code) != 2) { - return new SoapFault("Client", "Not a valid country code", NULL, NULL, NULL, new SoapHeader("http://example.org/ts-tests", "validateCountryCodeFault", "Country code must be 2 letters.")); - } else { - return "OK"; - } - } + function echoDate($timeInstant) { + return $timeInstant; + } + + function echoHexBinary($hb) { + return $hb; + } + + function echoDecimal($dec) { + return $dec; + } + + function echoBoolean($boolean) { + return $boolean; + } + + function echoStructAsSimpleTypes ($struct) { + return array('outputString' => $struct->varString, + 'outputInteger' => $struct->varInt, + 'outputFloat' => $struct->varFloat); + } + + function echoSimpleTypesAsStruct($string, $int, $float) { + return (object)array("varString" => $string, + "varInt" => $int, + "varFloat" => $float); + } + + function echoNestedStruct($struct) { + return $struct; + } + + function echo2DStringArray($ary) { + return $ary; + } + + function echoNestedArray($ary) { + return $ary; + } + + function countItems($input) { + return count($input); + } + + function isNil($input=NULL) { + return is_null($input); + } + + function returnVoid() { + } + + function emptyBody() { + } + + function requiredHeader($x) { + $this->header = $x; + } + + function echoHeader() { + return $this->header; + } + + function echoResolvedRef($ref) { + return $ref->RelativeReference->base.$ref->RelativeReference->href; + } + + function validateCountryCode($code) { + if (strlen($code) != 2) { + return new SoapFault("Client", "Not a valid country code", NULL, NULL, NULL, new SoapHeader("http://example.org/ts-tests", "validateCountryCodeFault", "Country code must be 2 letters.")); + } else { + return "OK"; + } + } } diff --git a/ext/soap/tests/typemap001.phpt b/ext/soap/tests/typemap001.phpt index c582406f41..04c72eb836 100644 --- a/ext/soap/tests/typemap001.phpt +++ b/ext/soap/tests/typemap001.phpt @@ -8,11 +8,11 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $GLOBALS['HTTP_RAW_POST_DATA']=" -<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" - xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" - xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" - xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" - xmlns:ns1=\"http://schemas.nothing.com\" +<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" + xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" + xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" + xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" + xmlns:ns1=\"http://schemas.nothing.com\" > <env:Body> <ns1:dotest> @@ -26,31 +26,31 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </env:Envelope>"; function book_from_xml($xml) { - $sxe = simplexml_load_string($xml); - $obj = new book; - $obj->a = (string)$sxe->a; - $obj->b = (string)$sxe->b; - return $obj; + $sxe = simplexml_load_string($xml); + $obj = new book; + $obj->a = (string)$sxe->a; + $obj->b = (string)$sxe->b; + return $obj; } class test{ - function dotest($book){ - $classname=get_class($book); - return "Object: ".$classname. "(".$book->a.",".$book->b.")"; - } + function dotest($book){ + $classname=get_class($book); + return "Object: ".$classname. "(".$book->a.",".$book->b.")"; + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } $options=Array( - 'actor' =>'http://schemas.nothing.com', - 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", - "type_name" => "book", - "from_xml" => "book_from_xml")) - ); + 'actor' =>'http://schemas.nothing.com', + 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", + "type_name" => "book", + "from_xml" => "book_from_xml")) + ); $server = new SoapServer(__DIR__."/classmap.wsdl",$options); $server->setClass("test"); diff --git a/ext/soap/tests/typemap002.phpt b/ext/soap/tests/typemap002.phpt index 84ef043ac3..551d8ee71f 100644 --- a/ext/soap/tests/typemap002.phpt +++ b/ext/soap/tests/typemap002.phpt @@ -7,11 +7,11 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $GLOBALS['HTTP_RAW_POST_DATA']=" -<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" - xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" - xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" - xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" - xmlns:ns1=\"http://schemas.nothing.com\" +<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" + xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" + xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" + xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" + xmlns:ns1=\"http://schemas.nothing.com\" > <env:Body> <ns1:dotest2> @@ -22,30 +22,30 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </env:Envelope>"; function book_to_xml($book) { - return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>'; + return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>'; } class test{ - function dotest2($str){ - $book = new book; - $book->a = "foo"; - $book->b = "bar"; - return $book; - } + function dotest2($str){ + $book = new book; + $book->a = "foo"; + $book->b = "bar"; + return $book; + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } $options=Array( - 'actor' =>'http://schemas.nothing.com', - 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", - "type_name" => "book", - "to_xml" => "book_to_xml")) - ); + 'actor' =>'http://schemas.nothing.com', + 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", + "type_name" => "book", + "to_xml" => "book_to_xml")) + ); $server = new SoapServer(__DIR__."/classmap.wsdl",$options); $server->setClass("test"); diff --git a/ext/soap/tests/typemap003.phpt b/ext/soap/tests/typemap003.phpt index 0770d1be67..2cd0ac64e4 100644 --- a/ext/soap/tests/typemap003.phpt +++ b/ext/soap/tests/typemap003.phpt @@ -9,7 +9,7 @@ soap.wsdl_cache_enabled=0 <?php class TestSoapClient extends SoapClient{ function __doRequest($request, $location, $action, $version, $one_way = 0) { - return <<<EOF + return <<<EOF <?xml version="1.0" encoding="UTF-8"?> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body> <ns1:dotest2Response><res xsi:type="ns1:book"> @@ -18,29 +18,29 @@ class TestSoapClient extends SoapClient{ </res> </ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope> EOF; - } + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } function book_from_xml($xml) { - $sxe = simplexml_load_string($xml); - $obj = new book; - $obj->a = (string)$sxe->a; - $obj->b = (string)$sxe->b; - return $obj; + $sxe = simplexml_load_string($xml); + $obj = new book; + $obj->a = (string)$sxe->a; + $obj->b = (string)$sxe->b; + return $obj; } $options=Array( - 'actor' =>'http://schemas.nothing.com', - 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", - "type_name" => "book", - "from_xml" => "book_from_xml")) - ); + 'actor' =>'http://schemas.nothing.com', + 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", + "type_name" => "book", + "from_xml" => "book_from_xml")) + ); $client = new TestSoapClient(__DIR__."/classmap.wsdl",$options); $ret = $client->dotest2("???"); diff --git a/ext/soap/tests/typemap004.phpt b/ext/soap/tests/typemap004.phpt index 07d489db95..bf0a643abe 100644 --- a/ext/soap/tests/typemap004.phpt +++ b/ext/soap/tests/typemap004.phpt @@ -8,27 +8,27 @@ soap.wsdl_cache_enabled=0 <?php class TestSoapClient extends SoapClient{ function __doRequest($request, $location, $action, $version, $one_way = 0) { - echo $request; - exit; - } + echo $request; + exit; + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } function book_to_xml($book) { - return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>'; + return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>'; } $options=Array( - 'actor' =>'http://schemas.nothing.com', - 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", - "type_name" => "book", - "to_xml" => "book_to_xml")) - ); + 'actor' =>'http://schemas.nothing.com', + 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", + "type_name" => "book", + "to_xml" => "book_to_xml")) + ); $client = new TestSoapClient(__DIR__."/classmap.wsdl",$options); $book = new book(); diff --git a/ext/soap/tests/typemap005.phpt b/ext/soap/tests/typemap005.phpt index 5a8319fab7..4a4c81c118 100644 --- a/ext/soap/tests/typemap005.phpt +++ b/ext/soap/tests/typemap005.phpt @@ -8,11 +8,11 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $GLOBALS['HTTP_RAW_POST_DATA']=" -<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" - xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" - xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" - xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" - xmlns:ns1=\"http://schemas.nothing.com\" +<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" + xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" + xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" + xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" + xmlns:ns1=\"http://schemas.nothing.com\" > <env:Body> <ns1:dotest> @@ -26,32 +26,32 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </env:Envelope>"; function book_from_xml($xml) { - $sxe = simplexml_load_string($xml); - $obj = new book; - $obj->a = (string)$sxe->a; - $obj->b = (string)$sxe->b; - return $obj; + $sxe = simplexml_load_string($xml); + $obj = new book; + $obj->a = (string)$sxe->a; + $obj->b = (string)$sxe->b; + return $obj; } class test{ - function dotest($book){ - $classname=get_class($book); - return "Object: ".$classname. "(".$book->a.",".$book->b.")"; - } + function dotest($book){ + $classname=get_class($book); + return "Object: ".$classname. "(".$book->a.",".$book->b.")"; + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } $options=Array( - 'uri' => "http://schemas.nothing.com", - 'actor' => 'http://schemas.nothing.com', - 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", - "type_name" => "book", - "from_xml" => "book_from_xml")) - ); + 'uri' => "http://schemas.nothing.com", + 'actor' => 'http://schemas.nothing.com', + 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", + "type_name" => "book", + "from_xml" => "book_from_xml")) + ); $server = new SoapServer(NULL,$options); $server->setClass("test"); diff --git a/ext/soap/tests/typemap006.phpt b/ext/soap/tests/typemap006.phpt index 9de9e245d2..ca8c3351e8 100644 --- a/ext/soap/tests/typemap006.phpt +++ b/ext/soap/tests/typemap006.phpt @@ -7,11 +7,11 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $GLOBALS['HTTP_RAW_POST_DATA']=" -<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" - xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" - xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" - xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" - xmlns:ns1=\"http://schemas.nothing.com\" +<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" + xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" + xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" + xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" + xmlns:ns1=\"http://schemas.nothing.com\" > <env:Body> <ns1:dotest2> @@ -22,31 +22,31 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </env:Envelope>"; function book_to_xml($book) { - return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>'; + return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>'; } class test{ - function dotest2($str){ - $book = new book; - $book->a = "foo"; - $book->b = "bar"; - return new SoapVar($book, null, "book", "http://schemas.nothing.com"); - } + function dotest2($str){ + $book = new book; + $book->a = "foo"; + $book->b = "bar"; + return new SoapVar($book, null, "book", "http://schemas.nothing.com"); + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } $options=Array( - 'uri' => "http://schemas.nothing.com", - 'actor' => 'http://schemas.nothing.com', - 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", - "type_name" => "book", - "to_xml" => "book_to_xml")) - ); + 'uri' => "http://schemas.nothing.com", + 'actor' => 'http://schemas.nothing.com', + 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", + "type_name" => "book", + "to_xml" => "book_to_xml")) + ); $server = new SoapServer(NULL,$options); $server->setClass("test"); diff --git a/ext/soap/tests/typemap007.phpt b/ext/soap/tests/typemap007.phpt index 1dd2becb61..5b7cbd10d7 100644 --- a/ext/soap/tests/typemap007.phpt +++ b/ext/soap/tests/typemap007.phpt @@ -9,7 +9,7 @@ soap.wsdl_cache_enabled=0 <?php class TestSoapClient extends SoapClient{ function __doRequest($request, $location, $action, $version, $one_way = 0) { - return <<<EOF + return <<<EOF <?xml version="1.0" encoding="UTF-8"?> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body> <ns1:dotest2Response><res xsi:type="ns1:book"> @@ -18,31 +18,31 @@ class TestSoapClient extends SoapClient{ </res> </ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope> EOF; - } + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } function book_from_xml($xml) { - $sxe = simplexml_load_string($xml); - $obj = new book; - $obj->a = (string)$sxe->a; - $obj->b = (string)$sxe->b; - return $obj; + $sxe = simplexml_load_string($xml); + $obj = new book; + $obj->a = (string)$sxe->a; + $obj->b = (string)$sxe->b; + return $obj; } $options=Array( 'uri' => 'http://schemas.nothing.com', 'location' => 'test://', - 'actor' => 'http://schemas.nothing.com', - 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", - "type_name" => "book", - "from_xml" => "book_from_xml")) - ); + 'actor' => 'http://schemas.nothing.com', + 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", + "type_name" => "book", + "from_xml" => "book_from_xml")) + ); $client = new TestSoapClient(NULL, $options); $ret = $client->dotest2("???"); diff --git a/ext/soap/tests/typemap008.phpt b/ext/soap/tests/typemap008.phpt index 4ba1fb5bef..c4bd649f51 100644 --- a/ext/soap/tests/typemap008.phpt +++ b/ext/soap/tests/typemap008.phpt @@ -8,29 +8,29 @@ soap.wsdl_cache_enabled=0 <?php class TestSoapClient extends SoapClient{ function __doRequest($request, $location, $action, $version, $one_way = 0) { - echo $request; - exit; - } + echo $request; + exit; + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } function book_to_xml($book) { - return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>'; + return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>'; } $options=Array( 'uri' => 'http://schemas.nothing.com', 'location' => 'test://', - 'actor' => 'http://schemas.nothing.com', - 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", - "type_name" => "book", - "to_xml" => "book_to_xml")) - ); + 'actor' => 'http://schemas.nothing.com', + 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", + "type_name" => "book", + "to_xml" => "book_to_xml")) + ); $client = new TestSoapClient(NULL, $options); $book = new book(); diff --git a/ext/soap/tests/typemap009.phpt b/ext/soap/tests/typemap009.phpt index 37e73edeca..a36a64136f 100644 --- a/ext/soap/tests/typemap009.phpt +++ b/ext/soap/tests/typemap009.phpt @@ -7,11 +7,11 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $GLOBALS['HTTP_RAW_POST_DATA']=" -<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" - xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" - xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" - xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" - xmlns:ns1=\"http://schemas.nothing.com\" +<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" + xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" + xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" + xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" + xmlns:ns1=\"http://schemas.nothing.com\" > <env:Body> <ns1:dotest> @@ -25,27 +25,27 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </env:Envelope>"; function book_from_xml($xml) { - throw new SoapFault("Server", "Conversion Failed"); + throw new SoapFault("Server", "Conversion Failed"); } class test{ - function dotest($book){ - $classname=get_class($book); - return "Object: ".$classname. "(".$book->a.",".$book->b.")"; - } + function dotest($book){ + $classname=get_class($book); + return "Object: ".$classname. "(".$book->a.",".$book->b.")"; + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } $options=Array( - 'actor' =>'http://schemas.nothing.com', - 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", - "type_name" => "book", - "from_xml" => "book_from_xml")) - ); + 'actor' =>'http://schemas.nothing.com', + 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", + "type_name" => "book", + "from_xml" => "book_from_xml")) + ); $server = new SoapServer(__DIR__."/classmap.wsdl",$options); $server->setClass("test"); diff --git a/ext/soap/tests/typemap010.phpt b/ext/soap/tests/typemap010.phpt index 46e9909a62..fde89a4603 100644 --- a/ext/soap/tests/typemap010.phpt +++ b/ext/soap/tests/typemap010.phpt @@ -7,11 +7,11 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $GLOBALS['HTTP_RAW_POST_DATA']=" -<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" - xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" - xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" - xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" - xmlns:ns1=\"http://schemas.nothing.com\" +<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" + xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" + xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" + xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" + xmlns:ns1=\"http://schemas.nothing.com\" > <env:Body> <ns1:dotest2> @@ -22,30 +22,30 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </env:Envelope>"; function book_to_xml($book) { - throw new SoapFault("Server", "Conversion Fault"); + throw new SoapFault("Server", "Conversion Fault"); } class test{ - function dotest2($str){ - $book = new book; - $book->a = "foo"; - $book->b = "bar"; - return $book; - } + function dotest2($str){ + $book = new book; + $book->a = "foo"; + $book->b = "bar"; + return $book; + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } $options=Array( - 'actor' =>'http://schemas.nothing.com', - 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", - "type_name" => "book", - "to_xml" => "book_to_xml")) - ); + 'actor' =>'http://schemas.nothing.com', + 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", + "type_name" => "book", + "to_xml" => "book_to_xml")) + ); $server = new SoapServer(__DIR__."/classmap.wsdl",$options); $server->setClass("test"); diff --git a/ext/soap/tests/typemap011.phpt b/ext/soap/tests/typemap011.phpt index ac6b9f3924..b0c75ce0c7 100644 --- a/ext/soap/tests/typemap011.phpt +++ b/ext/soap/tests/typemap011.phpt @@ -8,7 +8,7 @@ soap.wsdl_cache_enabled=0 <?php class TestSoapClient extends SoapClient{ function __doRequest($request, $location, $action, $version, $one_way = 0) { - return <<<EOF + return <<<EOF <?xml version="1.0" encoding="UTF-8"?> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://schemas.nothing.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body> <ns1:dotest2Response><res xsi:type="ns1:book"> @@ -17,31 +17,31 @@ class TestSoapClient extends SoapClient{ </res> </ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope> EOF; - } + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } function book_from_xml($xml) { - throw new SoapFault("Client", "Conversion Error"); + throw new SoapFault("Client", "Conversion Error"); } $options=Array( - 'actor' =>'http://schemas.nothing.com', - 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", - "type_name" => "book", - "from_xml" => "book_from_xml")) - ); + 'actor' =>'http://schemas.nothing.com', + 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", + "type_name" => "book", + "from_xml" => "book_from_xml")) + ); $client = new TestSoapClient(__DIR__."/classmap.wsdl",$options); try { - $ret = $client->dotest2("???"); + $ret = $client->dotest2("???"); } catch (SoapFault $e) { - $ret = "SoapFault = " . $e->faultcode . " - " . $e->faultstring; + $ret = "SoapFault = " . $e->faultcode . " - " . $e->faultstring; } var_dump($ret); echo "ok\n"; diff --git a/ext/soap/tests/typemap012.phpt b/ext/soap/tests/typemap012.phpt index 837ae1fd80..039a4f9ba7 100644 --- a/ext/soap/tests/typemap012.phpt +++ b/ext/soap/tests/typemap012.phpt @@ -8,36 +8,36 @@ soap.wsdl_cache_enabled=0 <?php class TestSoapClient extends SoapClient{ function __doRequest($request, $location, $action, $version, $one_way = 0) { - echo $request; - exit; - } + echo $request; + exit; + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } function book_to_xml($book) { - throw new SoapFault("Client", "Conversion Error"); + throw new SoapFault("Client", "Conversion Error"); } $options=Array( - 'actor' =>'http://schemas.nothing.com', - 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", - "type_name" => "book", - "to_xml" => "book_to_xml")) - ); + 'actor' =>'http://schemas.nothing.com', + 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", + "type_name" => "book", + "to_xml" => "book_to_xml")) + ); $client = new TestSoapClient(__DIR__."/classmap.wsdl",$options); $book = new book(); $book->a = "foo"; $book->b = "bar"; try { - $ret = $client->dotest($book); + $ret = $client->dotest($book); } catch (SoapFault $e) { - $ret = "SoapFault = " . $e->faultcode . " - " . $e->faultstring; + $ret = "SoapFault = " . $e->faultcode . " - " . $e->faultstring; } var_dump($ret); echo "ok\n"; diff --git a/ext/soap/tests/typemap013.phpt b/ext/soap/tests/typemap013.phpt index 6d414fdbc0..f73a257d75 100644 --- a/ext/soap/tests/typemap013.phpt +++ b/ext/soap/tests/typemap013.phpt @@ -7,11 +7,11 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $GLOBALS['HTTP_RAW_POST_DATA']=" -<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" - xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" - xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" - xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" - xmlns:ns1=\"http://schemas.nothing.com\" +<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\" + xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" + xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" + xmlns:enc=\"http://schemas.xmlsoap.org/soap/encoding/\" + xmlns:ns1=\"http://schemas.nothing.com\" > <env:Body> <ns1:dotest2> @@ -22,30 +22,30 @@ $GLOBALS['HTTP_RAW_POST_DATA']=" </env:Envelope>"; function book_to_xml($book) { - return '<book xmlns="http://schemas.nothing.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>'; + return '<book xmlns="http://schemas.nothing.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>'; } class test{ - function dotest2($str){ - $book = new book; - $book->a = "foo"; - $book->b = "bar"; - return $book; - } + function dotest2($str){ + $book = new book; + $book->a = "foo"; + $book->b = "bar"; + return $book; + } } class book{ - public $a="a"; - public $b="c"; + public $a="a"; + public $b="c"; } $options=Array( - 'actor' =>'http://schemas.nothing.com', - 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", - "type_name" => "book", - "to_xml" => "book_to_xml")) - ); + 'actor' =>'http://schemas.nothing.com', + 'typemap' => array(array("type_ns" => "http://schemas.nothing.com", + "type_name" => "book", + "to_xml" => "book_to_xml")) + ); $server = new SoapServer(__DIR__."/classmap.wsdl",$options); $server->setClass("test"); |