diff options
Diffstat (limited to 'ext/soap')
297 files changed, 450 insertions, 3844 deletions
diff --git a/ext/soap/config.m4 b/ext/soap/config.m4 index d0a99d9624..8e5fdd4ebc 100644 --- a/ext/soap/config.m4 +++ b/ext/soap/config.m4 @@ -1,24 +1,17 @@ -dnl config.m4 for extension soap - -PHP_ARG_ENABLE(soap, whether to enable SOAP support, -[ --enable-soap Enable SOAP support]) - -if test -z "$PHP_LIBXML_DIR"; then - PHP_ARG_WITH(libxml-dir, libxml2 install dir, - [ --with-libxml-dir=DIR SOAP: libxml2 install prefix], no, no) -fi +PHP_ARG_ENABLE([soap], + [whether to enable SOAP support], + [AS_HELP_STRING([--enable-soap], + [Enable SOAP support])]) if test "$PHP_SOAP" != "no"; then if test "$PHP_LIBXML" = "no"; then - AC_MSG_ERROR([SOAP extension requires LIBXML extension, add --enable-libxml]) + AC_MSG_ERROR([SOAP extension requires LIBXML extension, add --with-libxml]) fi PHP_SETUP_LIBXML(SOAP_SHARED_LIBADD, [ AC_DEFINE(HAVE_SOAP,1,[ ]) PHP_NEW_EXTENSION(soap, soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(SOAP_SHARED_LIBADD) - ], [ - AC_MSG_ERROR([libxml2 not found. Please check your libxml2 installation.]) ]) fi diff --git a/ext/soap/interop/client_round2.php b/ext/soap/interop/client_round2.php deleted file mode 100644 index c1307472c4..0000000000 --- a/ext/soap/interop/client_round2.php +++ /dev/null @@ -1,113 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - -<html> -<head> - <title>Round 2 Interop Client Tests</title> -</head> - -<body> -<a href="index.php">Back to Interop Index</a><br> -<p> </p> -<?php -require_once 'client_round2_interop.php'; - -$iop = new Interop_Client(); - -function endpointList($test,$sel_endpoint) -{ - global $iop; - $iop->getEndpoints($test); - echo "<select name='endpoint'>\n"; - echo "<option value=''>-- All Endpoints --</option>\n"; - foreach ($iop->endpoints as $epname => $epinfo) { - $selected = ''; - if ($sel_endpoint == $epname) $selected = ' SELECTED'; - echo "<option value='$epname'$selected>$epname</option>\n"; - } - echo "</select>\n"; -} -function methodList($test,$sel_method) -{ - global $iop; - global $soap_tests; - - echo "<select name='method'>\n"; - echo "<option value='ALL'>-- Run All Methods --</option>\n"; - $prev_method = ""; - foreach ($soap_tests[$test] as $x) { - $method = $x->test_name; - if ($method != $prev_method) { - $prev_method = $method; - $selected = ''; - if ($sel_method == $method) $selected = ' SELECTED'; - echo "<option value='$method'$selected>$method</option>\n"; - } - } - echo "</select>\n"; -} - -function endpointTestForm($test, $endpoint, $method, $paramType, $useWSDL) -{ - global $PHP_SELF; - if (!$test) $test = 'base'; - echo "Round 2 '$test' Selected<br>\n"; - echo "Select endpoint and method to run:<br>\n"; - echo "<form action='$PHP_SELF' method='post'>\n"; - echo "<input type='hidden' name='test' value='$test'>\n"; - endpointList($test, $endpoint); - methodList($test, $method); - echo "<select name='paramType'>"; -// echo "<option value='all'>-- All --</option>"; - echo "<option value='soapval'".($paramType=='soapval'?' selected':'').">soap value</option>"; - echo "<option value='php'".($paramType=='php'?' selected':'').">php internal type</option></select>\n"; - echo "<select name='useWSDL'>"; -// echo "<option value='all'>-- All --</option>"; - echo "<option value='0'>go Direct</option>"; - echo "<option value='1'".($useWSDL?' selected':'').">use WSDL</option></select>\n"; - echo "<input type='submit' value='Go'>\n"; - echo "</form><br>\n"; -} - -function testSelectForm($selected_test = NULL) -{ - global $iop, $PHP_SELF; - echo "Select a Round 2 test case to run:<br>\n"; - echo "<form action='$PHP_SELF' method='post'>\n"; - echo "<select name='test'>\n"; - foreach ($iop->tests as $test) { - $selected = ''; - if ($selected_test == $test) $selected = ' SELECTED'; - echo "<option value='$test'$selected>$test</option>\n"; - } - echo "</select>\n"; - echo "<input type='submit' value='Go'>\n"; - echo "</form><br>\n"; -} - -testSelectForm($_POST['test']); -endpointTestForm($_POST['test'],$_POST['endpoint'],$_POST['method'],$_POST['paramType'],$_POST['useWSDL']); - -if ($_POST['test'] && array_key_exists('endpoint', $_POST) && array_key_exists('method', $_POST)) { - // here we execute the orders - echo "<h2>Calling {$_POST['method']} at {$_POST['endpoint']}</h2>\n"; - echo "NOTE: wire's are slightly modified to display better in web browsers.<br>\n"; - - $iop->currentTest = $_POST['test']; // see $tests above - $iop->paramType = $_POST['paramType']; // 'php' or 'soapval' - $iop->useWSDL = $_POST['useWSDL']; // 1= do wsdl tests - $iop->numServers = 0; // 0 = all - $iop->specificEndpoint = $_POST['endpoint']; // test only this endpoint - $iop->testMethod = $_POST['method']=='ALL'?'':$_POST['method']; // test only this method - $iop->skipEndpointList = array(); // endpoints to skip - $iop->nosave = 0; // 1= disable saving results to database - // debug output - $iop->show = 0; - $iop->debug = 0; - $iop->showFaults = 0; // used in result table output - echo '<pre>'; - $iop->doTest(); // run a single set of tests using above options - echo '</pre>'; -} -?> -</body> -</html> diff --git a/ext/soap/interop/client_round2_interop.php b/ext/soap/interop/client_round2_interop.php deleted file mode 100644 index 7e48f83e40..0000000000 --- a/ext/soap/interop/client_round2_interop.php +++ /dev/null @@ -1,783 +0,0 @@ -<?php -// -// +----------------------------------------------------------------------+ -// | PHP Version 4 | -// +----------------------------------------------------------------------+ -// | Copyright (c) 1997-2018 The PHP Group | -// +----------------------------------------------------------------------+ -// | This source file is subject to version 2.02 of the PHP license, | -// | that is bundled with this package in the file LICENSE, and is | -// | available through the world-wide-web at | -// | http://www.php.net/license/2_02.txt. | -// | If you did not receive a copy of the PHP license and are unable to | -// | obtain it through the world-wide-web, please send a note to | -// | license@php.net so we can mail you a copy immediately. | -// +----------------------------------------------------------------------+ -// | Authors: Shane Caraveo <Shane@Caraveo.com> | -// +----------------------------------------------------------------------+ - -require_once 'DB.php'; // PEAR/DB -require_once 'client_round2_params.php'; -require_once 'test.utility.php'; -require_once 'config.php'; - -error_reporting(E_ALL ^ E_NOTICE); - -class Interop_Client -{ - // database DNS - var $DSN = ""; - - var $baseURL = ""; - - // our central interop server, where we can get the list of endpoints - var $interopServer = "http://www.whitemesa.net/wsdl/interopInfo.wsdl"; - - // our local endpoint, will always get added to the database for all tests - var $localEndpoint; - - // specify testing - var $currentTest = 'base'; // see $tests above - var $paramType = 'php'; // 'php' or 'soapval' - var $useWSDL = 0; // 1= do wsdl tests - var $numServers = 0; // 0 = all - var $specificEndpoint = ''; // test only this endpoint - var $testMethod = ''; // test only this method - var $skipEndpointList = array(); // endpoints to skip - var $nosave = 0; - var $startAt = ''; // start in list at this endpoint - // debug output - var $show = 1; - var $debug = 0; - var $showFaults = 0; // used in result table output - - // PRIVATE VARIABLES - var $dbc = NULL; - var $totals = array(); - var $tests = array('base','GroupB', 'GroupC'); - var $paramTypes = array('php', 'soapval'); - var $endpoints = array(); - var $html = 1; - - function Interop_Client() { - global $interopConfig; - $this->DSN = $interopConfig['DSN']; - $this->baseURL = $interopConfig['baseURL']; - //$this->baseURL = 'http://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']); - // set up the database connection - $this->dbc = DB::connect($this->DSN, true); - // if it errors out, just ignore it and rely on regular methods - if (DB::isError($this->dbc)) { - echo $this->dbc->getMessage(); - $this->dbc = NULL; - } - // set up local endpoint - $this->localEndpoint['base'] = (object)array( - 'endpointName'=>'PHP ext/soap', - 'endpointURL'=>$this->baseURL.'/server_round2_base.php', - 'wsdlURL'=>$this->baseURL.'/interop.wsdl.php' - ); - $this->localEndpoint['GroupB'] = (object)array( - 'endpointName'=>'PHP ext/soap', - 'endpointURL'=>$this->baseURL.'/server_round2_groupB.php', - 'wsdlURL'=>$this->baseURL.'/interopB.wsdl.php' - ); - $this->localEndpoint['GroupC'] = (object)array( - 'endpointName'=>'PHP ext/soap', - 'endpointURL'=>$this->baseURL.'/server_round2_groupC.php', - 'wsdlURL'=>$this->baseURL.'/echoheadersvc.wsdl.php'); - } - - function _fetchEndpoints(&$soapclient, $test) { - $this->_getEndpoints($test, 1); - - // retrieve endpoints from the endpoint server - $endpointArray = $soapclient->__soapCall("GetEndpointInfo",array("groupName"=>$test),array('soapaction'=>"http://soapinterop.org/",'uri'=>"http://soapinterop.org/")); - if (is_soap_fault($endpointArray) || PEAR::isError($endpointArray)) { - if ($this->html) print "<pre>"; - print $soapclient->wire."\n"; - print_r($endpointArray); - if ($this->html) print "</pre>"; - print "\n"; - return; - } - - // add our local endpoint - if ($this->localEndpoint[$test]) { - array_push($endpointArray, $this->localEndpoint[$test]); - } - - if (!$endpointArray) return; - - // reset the status to zero - $res = $this->dbc->query("update endpoints set status = 0 where class='$test'"); - if (DB::isError($res)) { - die ($res->getMessage()); - } - if (is_object($res)) $res->free(); - // save new endpoints into database - foreach($endpointArray as $k => $v){ - if (array_key_exists($v->endpointName,$this->endpoints)) { - $res = $this->dbc->query("update endpoints set endpointURL='{$v->endpointURL}', wsdlURL='{$v->wsdlURL}', status=1 where id={$this->endpoints[$v->endpointName]['id']}"); - } else { - $res = $this->dbc->query("insert into endpoints (endpointName,endpointURL,wsdlURL,class) values('{$v->endpointName}','{$v->endpointURL}','{$v->wsdlURL}','$test')"); - } - if (DB::isError($res)) { - die ($res->getMessage()); - } - if (is_object($res)) $res->free(); - } - } - - /** - * fetchEndpoints - * retrieve endpoints interop server - * - * @return boolean result - * @access private - */ - function fetchEndpoints($test = NULL) { - // fetch from the interop server - try { - $soapclient = new SoapClient($this->interopServer); - if ($test) { - $this->_fetchEndpoints($soapclient, $test); - } else { - foreach ($this->tests as $test) { - $this->_fetchEndpoints($soapclient, $test); - } - $test = 'base'; - } - } catch (SoapFault $fault) { - if ($this->html) { - echo "<pre>$fault</pre>\n"; - } else { - echo "$fault\n"; - } - return NULL; - } - // retrieve all endpoints now - $this->currentTest = $test; - $x = $this->_getEndpoints($test); - return $x; - } - - /** - * getEndpoints - * retrieve endpoints from either database or interop server - * - * @param string base (see local var $tests) - * @param boolean all (if false, only get valid endpoints, status=1) - * @return boolean result - * @access private - */ - function getEndpoints($base = 'base', $all = 0) { - if (!$this->_getEndpoints($base, $all)) { - return $this->fetchEndpoints($base); - } - return TRUE; - } - - /** - * _getEndpoints - * retrieve endpoints from database - * - * @param string base (see local var $tests) - * @param boolean all (if false, only get valid endpoints, status=1) - * @return boolean result - * @access private - */ - function _getEndpoints($base = "", $all = 0) { - $this->endpoints = array(); - - // build sql - $sql = "select * from endpoints "; - if ($base) { - $sql .= "where class='$base' "; - if (!$all) $sql .= "and status=1"; - } else - if (!$all) $sql .= "where status=1"; - $sql .= " order by endpointName"; - - - $db_ep = $this->dbc->getAll($sql,NULL, DB_FETCHMODE_ASSOC ); - if (DB::isError($db_ep)) { - echo $sql."\n"; - echo $db_ep->getMessage(); - return FALSE; - } - // rearange the array - foreach ($db_ep as $entry) { - $this->endpoints[$entry['endpointName']] = $entry; - } - - if (count($this->endpoints) > 0) { - $this->currentTest = $base; - return TRUE; - } - return FALSE; - } - - /** - * getResults - * retrieve results from the database, stuff them into the endpoint array - * - * @access private - */ - function getResults($test = 'base', $type = 'php', $wsdl = 0) { - // be sure we have the right endpoints for this test result - $this->getEndpoints($test); - - // retrieve the results and put them into the endpoint info - $sql = "select * from results where class='$test' and type='$type' and wsdl=$wsdl"; - $results = $this->dbc->getAll($sql,NULL, DB_FETCHMODE_ASSOC ); - foreach ($results as $result) { - // find the endpoint - foreach ($this->endpoints as $epn => $epi) { - if ($epi['id'] == $result['endpoint']) { - // store the info - $this->endpoints[$epn]['methods'][$result['function']] = $result; - break; - } - } - } - } - - /** - * saveResults - * save the results of a method test into the database - * - * @access private - */ - function _saveResults($endpoint_id, &$soap_test) { - if ($this->nosave) return; - - $result = $soap_test->result; - $wire = $result['wire']; - if ($result['success']) { - $success = 'OK'; - $error = ''; - } else { - $success = $result['fault']->faultcode; - $pos = strpos($success,':'); - if ($pos !== false) { - $success = substr($success,$pos+1); - } - $error = $result['fault']->faultstring; - if (!$wire) $wire= $result['fault']->detail; - } - - $test_name = $soap_test->test_name; - - $sql = "delete from results where endpoint=$endpoint_id ". - "and class='$this->currentTest' and type='$this->paramType' ". - "and wsdl=$this->useWSDL and function=". - $this->dbc->quote($test_name); - #echo "\n".$sql; - $res = $this->dbc->query($sql); - if (DB::isError($res)) { - die ($res->getMessage()); - } - if (is_object($res)) $res->free(); - - $sql = "insert into results (endpoint,stamp,class,type,wsdl,function,result,error,wire) ". - "values($endpoint_id,".time().",'$this->currentTest',". - "'$this->paramType',$this->useWSDL,". - $this->dbc->quote($test_name).",". - $this->dbc->quote($success).",". - $this->dbc->quote($error).",". - ($wire?$this->dbc->quote($wire):"''").")"; - #echo "\n".$sql; - $res = $this->dbc->query($sql); - - if (DB::isError($res)) { - die ($res->getMessage()); - } - if (is_object($res)) $res->free(); - } - - /** - * decodeSoapval - * decodes a soap value to php type, used for test result comparisons - * - * @param SOAP_Value soapval - * @return mixed result - * @access public - */ - function decodeSoapval($soapval) - { - if (gettype($soapval) == "object" && - (strcasecmp(get_class($soapval),"SoapParam") == 0 || - strcasecmp(get_class($soapval),"SoapVar") == 0)) { - if (strcasecmp(get_class($soapval),"SoapParam") == 0) - $val = $soapval->param_data->enc_value; - else - $val = $soapval->enc_value; - } else { - $val = $soapval; - } - if (is_array($val)) { - foreach($val as $k => $v) { - if (gettype($v) == "object" && - (strcasecmp(get_class($soapval),"SoapParam") == 0 || - strcasecmp(get_class($soapval),"SoapVar") == 0)) { - $val[$k] = $this->decodeSoapval($v); - } - } - } - return $val; - } - - /** - * compareResult - * compare two php types for a match - * - * @param string expect - * @param string test_result - * @return boolean result - * @access public - */ - function compareResult($expect, $result, $type = NULL) - { - return compare($expect, $result); - } - - - /** - * doEndpointMethod - * run a method on an endpoint and store it's results to the database - * - * @param array endpoint_info - * @param SOAP_Test test - * @return boolean result - * @access public - */ - function doEndpointMethod(&$endpoint_info, &$soap_test) { - $ok = FALSE; - - // prepare a holder for the test results - $soap_test->result['class'] = $this->currentTest; - $soap_test->result['type'] = $this->paramType; - $soap_test->result['wsdl'] = $this->useWSDL; - - if ($this->useWSDL) { - if (array_key_exists('wsdlURL',$endpoint_info)) { - if (!array_key_exists('client',$endpoint_info)) { - try { - $endpoint_info['client'] = new SoapClient($endpoint_info['wsdlURL'], array("trace"=>1)); - } catch (SoapFault $ex) { - $endpoint_info['client']->wsdl->fault = $ex; - } - } - $soap =& $endpoint_info['client']; - - # XXX how do we determine a failure on retrieving/parsing wsdl? - if ($soap->wsdl->fault) { - $fault = $soap->wsdl->fault; - $soap_test->setResult(0,'WSDL', - $fault->faultstring."\n\n".$fault->detail, - $fault->faultstring, - $fault - ); - return FALSE; - } - } else { - $fault = new SoapFault('WSDL',"no WSDL defined for $endpoint"); - $soap_test->setResult(0,'WSDL', - $fault->faultstring, - $fault->faultstring, - $fault - ); - return FALSE; - } - $namespace = false; - $soapaction = false; - } else { - $namespace = $soapaction = 'http://soapinterop.org/'; - // hack to make tests work with MS SoapToolkit - // it's the only one that uses this soapaction, and breaks if - // it isn't right. Can't wait for soapaction to be fully deprecated - if ($this->currentTest == 'base' && - strstr($endpoint_info['endpointName'],'MS SOAP ToolKit 2.0')) { - $soapaction = 'urn:soapinterop'; - } - if (!array_key_exists('client',$endpoint_info)) { - $endpoint_info['client'] = new SoapClient(null,array('location'=>$endpoint_info['endpointURL'],'uri'=>$soapaction,'trace'=>1)); - } - $soap = $endpoint_info['client']; - } -// // add headers to the test -// if ($soap_test->headers) { -// // $header is already a SOAP_Header class -// foreach ($soap_test->headers as $header) { -// $soap->addHeader($header); -// } -// } - // XXX no way to set encoding - // this lets us set UTF-8, US-ASCII or other - //$soap->setEncoding($soap_test->encoding); -try { - if ($this->useWSDL && !$soap_test->headers && !$soap_test->headers_expect) { - $args = ''; - foreach ($soap_test->method_params as $pname => $param) { - $arg = '$soap_test->method_params["'.$pname.'"]'; - $args .= $args?','.$arg:$arg; - } - $return = eval('return $soap->'.$soap_test->method_name.'('.$args.');'); - } else { - if ($soap_test->headers || $soap_test->headers_expect) { - $return = $soap->__soapCall($soap_test->method_name,$soap_test->method_params,array('soapaction'=>$soapaction,'uri'=>$namespace), $soap_test->headers, $result_headers); - } else { - $return = $soap->__soapCall($soap_test->method_name,$soap_test->method_params,array('soapaction'=>$soapaction,'uri'=>$namespace)); - } - } -} catch (SoapFault $ex) { - $return = $ex; -} - - if(!is_soap_fault($return)){ - if ($soap_test->expect !== NULL) { - $sent = $soap_test->expect; - } else if (is_array($soap_test->method_params) && count($soap_test->method_params) == 1) { - reset($soap_test->method_params); - $sent = current($soap_test->method_params); - } else if (is_array($soap_test->method_params) && count($soap_test->method_params) == 0) { - $sent = null; - } else { - $sent = $soap_test->method_params; - } - - // compare header results - $headers_ok = TRUE; - if ($soap_test->headers || $soap_test->headers_expect) { - $headers_ok = $this->compareResult($soap_test->headers_expect, $result_headers); - } - - # we need to decode what we sent so we can compare! - $sent_d = $this->decodeSoapval($sent); - - $soap_test->result['sent'] = $sent; - $soap_test->result['return'] = $return; - - // compare the results with what we sent - - if ($soap_test->cmp_func !== NULL) { - $cmp_func = $soap_test->cmp_func; - $ok = $cmp_func($sent_d,$return); - } else { - $ok = $this->compareResult($sent_d,$return, $sent->type); - if (!$ok && $soap_test->expect) { - $ok = $this->compareResult($soap_test->expect,$return); - } - } - - // save the wire - $wire = "REQUEST:\n".str_replace('" ',"\" \n",str_replace('>',">\n",$soap->__getlastrequest()))."\n\n". - "RESPONSE:\n".str_replace('" ',"\" \n",str_replace('>',">\n",$soap->__getlastresponse()))."\n\n". - "EXPECTED:\n".var_dump_str($sent_d)."\n". - "RESULTL:\n".var_dump_str($return); - if ($soap_test->headers_expect) { - $wire .= "\nEXPECTED HEADERS:\n".var_dump_str($soap_test->headers_expect)."\n". - "RESULT HEADERS:\n".var_dump_str($result_headers); - } - #print "Wire:".htmlentities($wire); - - if($ok){ - if (!$headers_ok) { - $fault = new SoapFault('HEADER','The returned result did not match what we expected to receive'); - $soap_test->setResult(0,$fault->faultcode, - $wire, - $fault->faultstring, - $fault - ); - } else { - $soap_test->setResult(1,'OK',$wire); - $success = TRUE; - } - } else { - $fault = new SoapFault('RESULT','The returned result did not match what we expected to receive'); - $soap_test->setResult(0,$fault->faultcode, - $wire, - $fault->faultstring, - $fault - ); - } - } else { - $fault = $return; - if ($soap_test->expect_fault) { - $ok = 1; - $res = 'OK'; - } else { - $ok = 0; - $res =$fault->faultcode; - $pos = strpos($res,':'); - if ($pos !== false) { - $res = substr($res,$pos+1); - } - } - // save the wire - $wire = "REQUEST:\n".str_replace('" ',"\" \n",str_replace('>',">\n",$soap->__getlastrequest()))."\n\n". - "RESPONSE:\n".str_replace('" ',"\" \n",str_replace('>',">\n",$soap->__getlastresponse()))."\n". - "RESULTL:\n".var_dump_str($return); - #print "Wire:".htmlentities($wire); - - $soap_test->setResult($ok,$res, $wire,$fault->faultstring, $fault); - - } - return $ok; - } - - - /** - * doTest - * run a single round of tests - * - * @access public - */ - function doTest() { - global $soap_tests; - // get endpoints for this test - $this->getEndpoints($this->currentTest); - #clear totals - $this->totals = array(); - - $i = 0; - foreach($this->endpoints as $endpoint => $endpoint_info){ - - // if we specify an endpoint, skip until we find it - if ($this->specificEndpoint && $endpoint != $this->specificEndpoint) continue; - if ($this->useWSDL && !$endpoint_info['endpointURL']) continue; - - $skipendpoint = FALSE; - $this->totals['servers']++; - #$endpoint_info['tests'] = array(); - - if ($this->show) { - print "Processing $endpoint at {$endpoint_info['endpointURL']}"; - if ($this->html) print "<br>\n"; else print "\n"; - } - - foreach($soap_tests[$this->currentTest] as $soap_test) { - //foreach(array_keys($method_params[$this->currentTest][$this->paramType]) as $method) - - // only run the type of test we're looking for (php or soapval) - if ($soap_test->type != $this->paramType) continue; - - // if we haven't reached our startpoint, skip - if ($this->startAt && $this->startAt != $endpoint_info['endpointName']) continue; - $this->startAt = ''; - - // if this is in our skip list, skip it - if (in_array($endpoint, $this->skipEndpointList)) { - $skipendpoint = TRUE; - $skipfault = new SoapFault('SKIP','endpoint skipped'); - $soap_test->setResult(0,$fault->faultcode, '', - $skipfault->faultstring, - $skipfault - ); - #$endpoint_info['tests'][] = &$soap_test; - #$soap_test->showTestResult($this->debug, $this->html); - #$this->_saveResults($endpoint_info['id'], $soap_test->method_name); - $soap_test->result = NULL; - continue; - } - - // if we're looking for a specific method, skip unless we have it - if ($this->testMethod && strcmp($this->testMethod,$soap_test->test_name) != 0) continue; - - // if we are skipping the rest of the tests (due to error) note a fault - if ($skipendpoint) { - $soap_test->setResult(0,$fault->faultcode, '', - $skipfault->faultstring, - $skipfault - ); - #$endpoint_info['tests'][] = &$soap_test; - $this->totals['fail']++; - } else { - // run the endpoint test - if ($this->doEndpointMethod($endpoint_info, $soap_test)) { - $this->totals['success']++; - } else { - $skipendpoint = $soap_test->result['fault']->faultcode=='HTTP' - && strstr($soap_test->result['fault']->faultstring,'Connect Error'); - $skipfault = $soap_test->result['fault']; - $this->totals['fail']++; - } - #$endpoint_info['tests'][] = &$soap_test; - } - $soap_test->showTestResult($this->debug, $this->html); - $this->_saveResults($endpoint_info['id'], $soap_test); - $soap_test->result = NULL; - $this->totals['calls']++; - } - if ($this->numservers && ++$i >= $this->numservers) break; - } - } - - function doGroupTests() { - $dowsdl = array(0,1); - foreach($dowsdl as $usewsdl) { - $this->useWSDL = $usewsdl; - foreach($this->paramTypes as $ptype) { - // skip a pointless test - if ($usewsdl && $ptype == 'soapval') break; - $this->paramType = $ptype; - $this->doTest(); - } - } - } - - /** - * doTests - * go all out. This takes time. - * - * @access public - */ - function doTests() { - // the mother of all interop tests - $dowsdl = array(0,1); - foreach($this->tests as $test) { - $this->currentTest = $test; - foreach($dowsdl as $usewsdl) { - $this->useWSDL = $usewsdl; - foreach($this->paramTypes as $ptype) { - // skip a pointless test - if ($usewsdl && $ptype == 'soapval') break; - $this->paramType = $ptype; - $this->doTest(); - } - } - } - } - - // *********************************************************** - // output functions - - /** - * getResults - * retrieve results from the database, stuff them into the endpoint array - * - * @access private - */ - function getMethodList($test = 'base') { - // retrieve the results and put them into the endpoint info - $sql = "select distinct(function) from results where class='$test' order by function"; - $results = $this->dbc->getAll($sql); - $ar = array(); - foreach($results as $result) { - $ar[] = $result[0]; - } - return $ar; - } - - function outputTable() - { - $methods = $this->getMethodList($this->currentTest); - if (!$methods) return; - $this->getResults($this->currentTest,$this->paramType,$this->useWSDL); - - echo "<b>Testing $this->currentTest "; - if ($this->useWSDL) echo "using WSDL "; - else echo "using Direct calls "; - echo "with $this->paramType values</b><br>\n"; - - // calculate totals for this table - $this->totals['success'] = 0; - $this->totals['fail'] = 0; - $this->totals['servers'] = 0; #count($this->endpoints); - foreach ($this->endpoints as $endpoint => $endpoint_info) { - if (count($endpoint_info['methods']) > 0) { - $this->totals['servers']++; - foreach ($methods as $method) { - $r = $endpoint_info['methods'][$method]['result']; - if ($r == 'OK') $this->totals['success']++; - else $this->totals['fail']++; - } - } else { - unset($this->endpoints[$endpoint]); - } - } - $this->totals['calls'] = count($methods) * $this->totals['servers']; - - echo "\n\n<b>Servers: {$this->totals['servers']} Calls: {$this->totals['calls']} Success: {$this->totals['success']} Fail: {$this->totals['fail']}</b><br>\n"; - - echo "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n"; - echo "<tr><td class=\"BLANK\">Endpoint</td>\n"; - foreach ($methods as $method) { - $info = split(':', $method); - echo "<td class='BLANK' valign='top'>"; - foreach ($info as $m) { - $hi = split(',',$m); - echo '<b>'.$hi[0]."</b><br>\n"; - if (count($hi) > 1) { - echo " Actor=".($hi[1]?'Target':'Not Target')."<br>\n"; - echo " MustUnderstand=$hi[2]<br>\n"; - } - } - echo "</td>\n"; - } - echo "</tr>\n"; - $faults = array(); - $fi = 0; - foreach ($this->endpoints as $endpoint => $endpoint_info) { - if (array_key_exists('wsdlURL',$endpoint_info)) { - echo "<tr><td class=\"BLANK\"><a href=\"{$endpoint_info['wsdlURL']}\">$endpoint</a></td>\n"; - } else { - echo "<tr><td class=\"BLANK\">$endpoint</td>\n"; - } - foreach ($methods as $method) { - $id = $endpoint_info['methods'][$method]['id']; - $r = $endpoint_info['methods'][$method]['result']; - $e = $endpoint_info['methods'][$method]['error']; - if ($e) { - $faults[$fi++] = $e; - } - if ($r) { - echo "<td class='$r'><a href='$PHP_SELF?wire=$id'>$r</a></td>\n"; - } else { - echo "<td class='untested'>untested</td>\n"; - } - } - echo "</tr>\n"; - } - echo "</table><br>\n"; - if ($this->showFaults && count($faults) > 0) { - echo "<b>ERROR Details:</b><br>\n<ul>\n"; - # output more error detail - foreach ($faults as $fault) { - echo '<li>'.HTMLSpecialChars($fault)."</li>\n"; - } - } - echo "</ul><br><br>\n"; - } - - function outputTables() { - // the mother of all interop tests - $dowsdl = array(0,1); - foreach($this->tests as $test) { - $this->currentTest = $test; - foreach($dowsdl as $usewsdl) { - $this->useWSDL = $usewsdl; - foreach($this->paramTypes as $ptype) { - // skip a pointless test - if ($usewsdl && $ptype == 'soapval') break; - $this->paramType = $ptype; - $this->outputTable(); - } - } - } - } - - function showWire($id) { - $results = $this->dbc->getAll("select * from results where id=$id",NULL, DB_FETCHMODE_ASSOC ); - #$wire = preg_replace("/>/",">\n",$results[0]['wire']); - $wire = $results[0]['wire']; - if ($this->html) print "<pre>"; - echo "\n".HTMLSpecialChars($wire); - if ($this->html) print "</pre>"; - print "\n"; - } - -} - -?> diff --git a/ext/soap/interop/client_round2_params.php b/ext/soap/interop/client_round2_params.php deleted file mode 100644 index 3979e72497..0000000000 --- a/ext/soap/interop/client_round2_params.php +++ /dev/null @@ -1,619 +0,0 @@ -<?php -// -// +----------------------------------------------------------------------+ -// | PHP Version 4 | -// +----------------------------------------------------------------------+ -// | Copyright (c) 1997-2018 The PHP Group | -// +----------------------------------------------------------------------+ -// | This source file is subject to version 2.02 of the PHP license, | -// | that is bundled with this package in the file LICENSE, and is | -// | available through the world-wide-web at | -// | http://www.php.net/license/2_02.txt. | -// | If you did not receive a copy of the PHP license and are unable to | -// | obtain it through the world-wide-web, please send a note to | -// | license@php.net so we can mail you a copy immediately. | -// +----------------------------------------------------------------------+ -// | Authors: Shane Caraveo <Shane@Caraveo.com> | -// +----------------------------------------------------------------------+ - -define('SOAP_TEST_ACTOR_OTHER','http://some/other/actor'); - -class SOAP_Test { - var $type = 'php'; - var $test_name = NULL; - var $method_name = NULL; - var $method_params = NULL; - var $cmp_func = NULL; - var $expect = NULL; - var $expect_fault = FALSE; - var $headers = NULL; - var $headers_expect = NULL; - var $result = array(); - var $show = 1; - var $debug = 0; - var $encoding = 'UTF-8'; - - function SOAP_Test($methodname, $params, $expect = NULL, $cmp_func = NULL) { - # XXX we have to do this to make php-soap happy with NULL params - if (!$params) $params = array(); - - if (strchr($methodname,'(')) { - preg_match('/(.*)\((.*)\)/',$methodname,$matches); - $this->test_name = $methodname; - $this->method_name = $matches[1]; - } else { - $this->test_name = $this->method_name = $methodname; - } - $this->method_params = $params; - if ($expect !== NULL) { - $this->expect = $expect; - } - if ($cmp_func !== NULL) { - $this->cmp_func = $cmp_func; - } - - // determine test type - if ($params) { - $v = array_values($params); - if (gettype($v[0]) == 'object' && - (get_class($v[0]) == 'SoapVar' || get_class($v[0]) == 'SoapParam')) - $this->type = 'soapval'; - } - } - - function setResult($ok, $result, $wire, $error = '', $fault = NULL) - { - $this->result['success'] = $ok; - $this->result['result'] = $result; - $this->result['error'] = $error; - $this->result['wire'] = $wire; - $this->result['fault'] = $fault; - } - - /** - * showMethodResult - * print simple output about a methods result - * - * @param array endpoint_info - * @param string method - * @access public - */ - function showTestResult($debug = 0, $html = 0) { - // debug output - if ($debug) $this->show = 1; - if ($debug) { - echo str_repeat("-",50).$html?"<br>\n":"\n"; - } - - echo "testing $this->test_name : "; - - if ($debug) { - print "method params: "; - print_r($this->params); - print "\n"; - } - - $ok = $this->result['success']; - if ($ok) { - if ($html) { - print "<font color=\"#00cc00\">SUCCESS</font>\n"; - } else { - print "SUCCESS\n"; - } - } else { - $fault = $this->result['fault']; - if ($fault) { - $res = $fault->faultcode; - $pos = strpos($res,':'); - if ($pos !== false) { - $res = substr($res,$pos+1); - } - if ($html) { - print "<font color=\"#ff0000\">FAILED: [$res] {$fault->faultstring}</font>\n"; - } else { - print "FAILED: [$res] {$fault->faultstring}\n"; - } - } else { - if ($html) { - print "<font color=\"#ff0000\">FAILED: ".$this->result['result']."</font>\n"; - } else { - print "FAILED: ".$this->result['result']."\n"; - } - } - } - if ($debug) { - if ($html) { - echo "<pre>\n".htmlentities($this->result['wire'])."</pre>\n"; - } else { - echo "\n".htmlentities($this->result['wire'])."\n"; - } - } - } -} - -# XXX I know this isn't quite right, need to deal with this better -function make_2d($x, $y) -{ - for ($_x = 0; $_x < $x; $_x++) { - for ($_y = 0; $_y < $y; $_y++) { - $a[$_x][$_y] = "x{$_x}y{$_y}"; - } - } - return $a; -} - -function soap_value($name, $value, $type, $type_name=NULL, $type_ns=NULL) { - return new SoapParam(new SoapVar($value,$type,$type_name,$type_ns),$name); -} - -class SOAPStruct { - var $varString; - var $varInt; - var $varFloat; - function SOAPStruct($s, $i, $f) { - $this->varString = $s; - $this->varInt = $i; - $this->varFloat = $f; - } -} - -//*********************************************************** -// Base echoString - -$soap_tests['base'][] = new SOAP_Test('echoString', array('inputString' => 'hello world!')); -$soap_tests['base'][] = new SOAP_Test('echoString', array('inputString' => soap_value('inputString','hello world',XSD_STRING))); -$soap_tests['base'][] = new SOAP_Test('echoString(empty)', array('inputString' => '')); -$soap_tests['base'][] = new SOAP_Test('echoString(empty)', array('inputString' => soap_value('inputString','',XSD_STRING))); -$soap_tests['base'][] = new SOAP_Test('echoString(null)', array('inputString' => NULL)); -$soap_tests['base'][] = new SOAP_Test('echoString(null)', array('inputString' => soap_value('inputString',NULL,XSD_STRING))); -//$soap_tests['base'][] = new SOAP_Test('echoString(entities)', array('inputString' => ">,<,&,\",',0:\x00",1:\x01,2:\x02,3:\x03,4:\x04,5:\x05,6:\x06,7:\x07,8:\x08,9:\x09,10:\x0a,11:\x0b,12:\x0c,13:\x0d,14:\x0e,15:\x0f,16:\x10,17:\x11,18:\x12,19:\x13,20:\x14,21:\x15,22:\x16,23:\x17,24:\x18,25:\x19,26:\x1a,27:\x1b,28:\x1c,29:\x1d,30:\x1e,31:\x1f")); -//$soap_tests['base'][] = new SOAP_Test('echoString(entities)', array('inputString' => soap_value('inputString',">,<,&,\",',0:\x00",1:\x01,2:\x02,3:\x03,4:\x04,5:\x05,6:\x06,7:\x07,8:\x08,9:\x09,10:\x0a,11:\x0b,12:\x0c,13:\x0d,14:\x0e,15:\x0f,16:\x10,17:\x11,18:\x12,19:\x13,20:\x14,21:\x15,22:\x16,23:\x17,24:\x18,25:\x19,26:\x1a,27:\x1b,28:\x1c,29:\x1d,30:\x1e,31:\x1f",XSD_STRING))); -$soap_tests['base'][] = new SOAP_Test('echoString(entities)', array('inputString' => ">,<,&,\",',\\,\n")); -$soap_tests['base'][] = new SOAP_Test('echoString(entities)', array('inputString' => soap_value('inputString',">,<,&,\",',\\,\n",XSD_STRING))); -$test = new SOAP_Test('echoString(utf-8)', array('inputString' => utf8_encode('ỗÈéóÒ₧⅜ỗỸ'))); -$test->encoding = 'UTF-8'; -$soap_tests['base'][] = $test; -$test = new SOAP_Test('echoString(utf-8)', array('inputString' => soap_value('inputString',utf8_encode('ỗÈéóÒ₧⅜ỗỸ'),XSD_STRING))); -$test->encoding = 'UTF-8'; -$soap_tests['base'][] = $test; - -//*********************************************************** -// Base echoStringArray - -$soap_tests['base'][] = new SOAP_Test('echoStringArray', - array('inputStringArray' => array('good','bad'))); -$soap_tests['base'][] = new SOAP_Test('echoStringArray', - array('inputStringArray' => - soap_value('inputStringArray',array('good','bad'),SOAP_ENC_ARRAY,"ArrayOfstring","http://soapinterop.org/xsd"))); - -$soap_tests['base'][] = new SOAP_Test('echoStringArray(one)', - array('inputStringArray' => array('good'))); -$soap_tests['base'][] = new SOAP_Test('echoStringArray(one)', - array('inputStringArray' => - soap_value('inputStringArray',array('good'),SOAP_ENC_ARRAY,"ArrayOfstring","http://soapinterop.org/xsd"))); - -// empty array test -$soap_tests['base'][] = new SOAP_Test('echoStringArray(empty)', array('inputStringArray' => array())); -$soap_tests['base'][] = new SOAP_Test('echoStringArray(empty)', array('inputStringArray' => soap_value('inputStringArray',array(),SOAP_ENC_ARRAY,"ArrayOfstring","http://soapinterop.org/xsd"))); - -# XXX NULL Arrays not supported -// null array test -$soap_tests['base'][] = new SOAP_Test('echoStringArray(null)', array('inputStringArray' => NULL)); -$soap_tests['base'][] = new SOAP_Test('echoStringArray(null)', array('inputStringArray' => soap_value('inputStringArray',NULL,SOAP_ENC_ARRAY,"ArrayOfstring","http://soapinterop.org/xsd"))); - -//*********************************************************** -// Base echoInteger -$x = new SOAP_Test('echoInteger', array('inputInteger' => 34345)); -$soap_tests['base'][] = new SOAP_Test('echoInteger', array('inputInteger' => 34345)); -$soap_tests['base'][] = new SOAP_Test('echoInteger', array('inputInteger' => soap_value('inputInteger',12345,XSD_INT))); - -//*********************************************************** -// Base echoIntegerArray - -$soap_tests['base'][] = new SOAP_Test('echoIntegerArray', array('inputIntegerArray' => array(1,234324324,2))); -$soap_tests['base'][] = new SOAP_Test('echoIntegerArray', - array('inputIntegerArray' => - soap_value('inputIntegerArray', - array(new SoapVar(12345,XSD_INT),new SoapVar(654321,XSD_INT)), - SOAP_ENC_ARRAY,"ArrayOfint","http://soapinterop.org/xsd"))); - -//*********************************************************** -// Base echoFloat - -$soap_tests['base'][] = new SOAP_Test('echoFloat', array('inputFloat' => 342.23)); -$soap_tests['base'][] = new SOAP_Test('echoFloat', array('inputFloat' => soap_value('inputFloat',123.45,XSD_FLOAT))); - -//*********************************************************** -// Base echoFloatArray - -$soap_tests['base'][] = new SOAP_Test('echoFloatArray', array('inputFloatArray' => array(1.3223,34.2,325.325))); -$soap_tests['base'][] = new SOAP_Test('echoFloatArray', - array('inputFloatArray' => - soap_value('inputFloatArray', - array(new SoapVar(123.45,XSD_FLOAT),new SoapVar(654.321,XSD_FLOAT)), - SOAP_ENC_ARRAY,"ArrayOffloat","http://soapinterop.org/xsd"))); -//*********************************************************** -// Base echoStruct - -$soapstruct = new SOAPStruct('arg',34,325.325); -# XXX no way to set a namespace!!! -$soapsoapstruct = soap_value('inputStruct',$soapstruct,SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd"); -$soap_tests['base'][] = new SOAP_Test('echoStruct', array('inputStruct' =>$soapstruct)); -$soap_tests['base'][] = new SOAP_Test('echoStruct', array('inputStruct' =>$soapsoapstruct)); - -//*********************************************************** -// Base echoStructArray - -$soap_tests['base'][] = new SOAP_Test('echoStructArray', array('inputStructArray' => array( - $soapstruct,$soapstruct,$soapstruct))); -$soap_tests['base'][] = new SOAP_Test('echoStructArray', array('inputStructArray' => - soap_value('inputStructArray',array( - new SoapVar($soapstruct,SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd"), - new SoapVar($soapstruct,SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd"), - new SoapVar($soapstruct,SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd")), - SOAP_ENC_ARRAY,"ArrayOfSOAPStruct","http://soapinterop.org/xsd"))); - - -//*********************************************************** -// Base echoVoid - -$soap_tests['base'][] = new SOAP_Test('echoVoid', NULL); -$test = new SOAP_Test('echoVoid', NULL); -$test->type = 'soapval'; -$soap_tests['base'][] = $test; - -//*********************************************************** -// Base echoBase64 - -$soap_tests['base'][] = new SOAP_Test('echoBase64', array('inputBase64' => 'TmVicmFza2E=')); -$soap_tests['base'][] = new SOAP_Test('echoBase64', array('inputBase64' => - soap_value('inputBase64','TmVicmFza2E=',XSD_BASE64BINARY))); - -//*********************************************************** -// Base echoHexBinary - -$soap_tests['base'][] = new SOAP_Test('echoHexBinary', array('inputHexBinary' => '736F61707834'),'736F61707834','hex_compare'); -$soap_tests['base'][] = new SOAP_Test('echoHexBinary', array('inputHexBinary' => - soap_value('inputHexBinary','736F61707834',XSD_HEXBINARY)),'736F61707834','hex_compare'); - -//*********************************************************** -// Base echoDecimal - -# XXX test fails because php-soap incorrectly sets decimal to long rather than float -$soap_tests['base'][] = new SOAP_Test('echoDecimal', array('inputDecimal' => '12345.67890')); -$soap_tests['base'][] = new SOAP_Test('echoDecimal', array('inputDecimal' => - soap_value('inputDecimal','12345.67890',XSD_DECIMAL))); - -//*********************************************************** -// Base echoDate - -# php-soap doesn't handle datetime types properly yet -$soap_tests['base'][] = new SOAP_Test('echoDate', array('inputDate' => '2001-05-24T17:31:41Z'), null, 'date_compare'); -$soap_tests['base'][] = new SOAP_Test('echoDate', array('inputDate' => - soap_value('inputDate','2001-05-24T17:31:41Z',XSD_DATETIME)), null, 'date_compare'); - -//*********************************************************** -// Base echoBoolean - -# php-soap sends boolean as zero or one, which is ok, but to be explicit, send true or false. -$soap_tests['base'][] = new SOAP_Test('echoBoolean(true)', array('inputBoolean' => TRUE)); -$soap_tests['base'][] = new SOAP_Test('echoBoolean(true)', array('inputBoolean' => - soap_value('inputBoolean',TRUE,XSD_BOOLEAN))); -$soap_tests['base'][] = new SOAP_Test('echoBoolean(false)', array('inputBoolean' => FALSE)); -$soap_tests['base'][] = new SOAP_Test('echoBoolean(false)', array('inputBoolean' => - soap_value('inputBoolean',FALSE,XSD_BOOLEAN))); -$soap_tests['base'][] = new SOAP_Test('echoBoolean(1)', array('inputBoolean' => 1),true); -$soap_tests['base'][] = new SOAP_Test('echoBoolean(1)', array('inputBoolean' => - soap_value('inputBoolean',1,XSD_BOOLEAN)),true); -$soap_tests['base'][] = new SOAP_Test('echoBoolean(0)', array('inputBoolean' => 0),false); -$soap_tests['base'][] = new SOAP_Test('echoBoolean(0)', array('inputBoolean' => - soap_value('inputBoolean',0,XSD_BOOLEAN)),false); - - - -//*********************************************************** -// GROUP B - - -//*********************************************************** -// GroupB echoStructAsSimpleTypes - -$expect = array( - 'outputString'=>'arg', - 'outputInteger'=>34, - 'outputFloat'=>325.325 - ); -$soap_tests['GroupB'][] = new SOAP_Test('echoStructAsSimpleTypes', - array('inputStruct' => (object)array( - 'varString'=>'arg', - 'varInt'=>34, - 'varFloat'=>325.325 - )), $expect); -$soap_tests['GroupB'][] = new SOAP_Test('echoStructAsSimpleTypes', - array('inputStruct' => - soap_value('inputStruct', - (object)array('varString' => 'arg', - 'varInt' => 34, - 'varFloat' => 325.325 - ), SOAP_ENC_OBJECT, "SOAPStruct","http://soapinterop.org/xsd")), $expect); - -//*********************************************************** -// GroupB echoSimpleTypesAsStruct - -$expect = - (object)array( - 'varString'=>'arg', - 'varInt'=>34, - 'varFloat'=>325.325 - ); -$soap_tests['GroupB'][] = new SOAP_Test('echoSimpleTypesAsStruct', - array( - 'inputString'=>'arg', - 'inputInteger'=>34, - 'inputFloat'=>325.325 - ), $expect); -$soap_tests['GroupB'][] = new SOAP_Test('echoSimpleTypesAsStruct', - array( - soap_value('inputString','arg', XSD_STRING), - soap_value('inputInteger',34, XSD_INT), - soap_value('inputFloat',325.325, XSD_FLOAT) - ), $expect); - -//*********************************************************** -// GroupB echo2DStringArray - -$soap_tests['GroupB'][] = new SOAP_Test('echo2DStringArray', - array('input2DStringArray' => make_2d(3,3))); - -$multidimarray = - soap_value('input2DStringArray', - array( - array('row0col0', 'row0col1', 'row0col2'), - array('row1col0', 'row1col1', 'row1col2') - ), SOAP_ENC_ARRAY - ); -//$multidimarray->options['flatten'] = TRUE; -$soap_tests['GroupB'][] = new SOAP_Test('echo2DStringArray', - array('input2DStringArray' => $multidimarray)); - -//*********************************************************** -// GroupB echoNestedStruct - -$strstr = (object)array( - 'varString'=>'arg', - 'varInt'=>34, - 'varFloat'=>325.325, - 'varStruct' => (object)array( - 'varString'=>'arg', - 'varInt'=>34, - 'varFloat'=>325.325 - )); -$soap_tests['GroupB'][] = new SOAP_Test('echoNestedStruct', - array('inputStruct' => $strstr)); -$soap_tests['GroupB'][] = new SOAP_Test('echoNestedStruct', - array('inputStruct' => - soap_value('inputStruct', - (object)array( - 'varString'=>'arg', - 'varInt'=>34, - 'varFloat'=>325.325, - 'varStruct' => new SoapVar((object)array( - 'varString'=>'arg', - 'varInt'=>34, - 'varFloat'=>325.325 - ), SOAP_ENC_OBJECT, "SOAPStruct","http://soapinterop.org/xsd") - ), SOAP_ENC_OBJECT, "SOAPStructStruct","http://soapinterop.org/xsd" - )),$strstr); - -//*********************************************************** -// GroupB echoNestedArray - -$arrstr = (object)array( - 'varString'=>'arg', - 'varInt'=>34, - 'varFloat'=>325.325, - 'varArray' => array('red','blue','green') - ); -$soap_tests['GroupB'][] = new SOAP_Test('echoNestedArray', - array('inputStruct' => $arrstr)); -$soap_tests['GroupB'][] = new SOAP_Test('echoNestedArray', - array('inputStruct' => - soap_value('inputStruct', - (object)array('varString' => 'arg', - 'varInt' => 34, - 'varFloat' => 325.325, - 'varArray' => - new SoapVar(array("red", "blue", "green"), SOAP_ENC_ARRAY, "ArrayOfstring","http://soapinterop.org/xsd") - ), SOAP_ENC_OBJECT, "SOAPArrayStruct","http://soapinterop.org/xsd" - )),$arrstr); - - -//*********************************************************** -// GROUP C header tests - -//*********************************************************** -// echoMeStringRequest - -// echoMeStringRequest with endpoint as header destination, doesn't have to understand -$test = new SOAP_Test('echoVoid(echoMeStringRequest mustUnderstand=0 actor=next)', NULL); -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStringRequest', 'hello world', 0, SOAP_ACTOR_NEXT); -$test->headers_expect = array('echoMeStringResponse'=>'hello world'); -$soap_tests['GroupC'][] = $test; - -$test = new SOAP_Test('echoVoid(echoMeStringRequest mustUnderstand=0 actor=next)', NULL); -$test->type = 'soapval'; -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStringRequest', new SoapVar('hello world',XSD_STRING), 0, SOAP_ACTOR_NEXT); -$test->headers_expect = array('echoMeStringResponse'=>'hello world'); -$soap_tests['GroupC'][] = $test; - -// echoMeStringRequest with endpoint as header destination, must understand -$test = new SOAP_Test('echoVoid(echoMeStringRequest mustUnderstand=1 actor=next)', NULL); -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStringRequest', 'hello world', 1, SOAP_ACTOR_NEXT); -$test->headers_expect = array('echoMeStringResponse'=>'hello world'); -$soap_tests['GroupC'][] = $test; - -$test = new SOAP_Test('echoVoid(echoMeStringRequest mustUnderstand=1 actor=next)', NULL); -$test->type = 'soapval'; -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStringRequest', new SoapVar('hello world',XSD_STRING), 1, SOAP_ACTOR_NEXT); -$test->headers_expect = array('echoMeStringResponse'=>'hello world'); -$soap_tests['GroupC'][] = $test; - -// echoMeStringRequest with endpoint NOT header destination, doesn't have to understand -$test = new SOAP_Test('echoVoid(echoMeStringRequest mustUnderstand=0 actor=other)', NULL); -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStringRequest', 'hello world', 0, SOAP_TEST_ACTOR_OTHER); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; - -$test = new SOAP_Test('echoVoid(echoMeStringRequest mustUnderstand=0 actor=other)', NULL); -$test->type = 'soapval'; -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStringRequest', new SoapVar('hello world',XSD_STRING), 0, SOAP_TEST_ACTOR_OTHER); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; - -// echoMeStringRequest with endpoint NOT header destination, must understand -$test = new SOAP_Test('echoVoid(echoMeStringRequest mustUnderstand=1 actor=other)', NULL); -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStringRequest', 'hello world', 1, SOAP_TEST_ACTOR_OTHER); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; - -$test = new SOAP_Test('echoVoid(echoMeStringRequest mustUnderstand=1 actor=other)', NULL); -$test->type = 'soapval'; -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStringRequest', new SoapVar('hello world', XSD_STRING), 1, SOAP_TEST_ACTOR_OTHER); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; - -// echoMeStringRequest with endpoint header destination, must understand, -// invalid namespace, should receive a fault -$test = new SOAP_Test('echoVoid(echoMeStringRequest invalid namespace)', NULL); -$test->headers[] = new SoapHeader('http://unknown.org/echoheader/','echoMeStringRequest', 'hello world', 1, SOAP_ACTOR_NEXT); -$test->headers_expect = array(); -$test->expect_fault = TRUE; -$soap_tests['GroupC'][] = $test; - -$test = new SOAP_Test('echoVoid(echoMeStringRequest invalid namespace)', NULL); -$test->type = 'soapval'; -$test->headers[] = new SoapHeader('http://unknown.org/echoheader/','echoMeStringRequest', new SoapVar('hello world', XSD_STRING), 1, SOAP_ACTOR_NEXT); -$test->headers_expect = array(); -$test->expect_fault = TRUE; -$soap_tests['GroupC'][] = $test; - -//*********************************************************** -// echoMeStructRequest - -// echoMeStructRequest with endpoint as header destination, doesn't have to understand -$test = new SOAP_Test('echoVoid(echoMeStructRequest mustUnderstand=0 actor=next)', NULL); -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStructRequest', - new SOAPStruct('arg',34,325.325), 0, SOAP_ACTOR_NEXT); -$test->headers_expect = - array('echoMeStructResponse'=> (object)array('varString'=>'arg','varInt'=>34,'varFloat'=>325.325)); -$soap_tests['GroupC'][] = $test; - -$test = new SOAP_Test('echoVoid(echoMeStructRequest mustUnderstand=0 actor=next)', NULL); -$test->type = 'soapval'; -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStructRequest', - new SoapVar(new SOAPStruct('arg',34,325.325),SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd"), - 0, SOAP_ACTOR_NEXT); -$test->headers_expect = - array('echoMeStructResponse'=> (object)array('varString'=>'arg','varInt'=>34,'varFloat'=>325.325)); -$soap_tests['GroupC'][] = $test; - -// echoMeStructRequest with endpoint as header destination, must understand -$test = new SOAP_Test('echoVoid(echoMeStructRequest mustUnderstand=1 actor=next)', NULL); -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStructRequest', - new SOAPStruct('arg',34,325.325), 1, SOAP_ACTOR_NEXT); -$test->headers_expect = - array('echoMeStructResponse'=> (object)array('varString'=>'arg','varInt'=>34,'varFloat'=>325.325)); -$soap_tests['GroupC'][] = $test; - -$test = new SOAP_Test('echoVoid(echoMeStructRequest mustUnderstand=1 actor=next)', NULL); -$test->type = 'soapval'; -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStructRequest', - new SoapVar(new SOAPStruct('arg',34,325.325),SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd"), - 1, SOAP_ACTOR_NEXT); -$test->headers_expect = - array('echoMeStructResponse'=> (object)array('varString'=>'arg','varInt'=>34,'varFloat'=>325.325)); -$soap_tests['GroupC'][] = $test; - -// echoMeStructRequest with endpoint NOT header destination, doesn't have to understand -$test = new SOAP_Test('echoVoid(echoMeStructRequest mustUnderstand=0 actor=other)', NULL); -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStructRequest', - new SOAPStruct('arg',34,325.325), 0, SOAP_TEST_ACTOR_OTHER); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; - -$test = new SOAP_Test('echoVoid(echoMeStructRequest mustUnderstand=0 actor=other)', NULL); -$test->type = 'soapval'; -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStructRequest', - new SoapVar(new SOAPStruct('arg',34,325.325),SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd"), - 0, SOAP_TEST_ACTOR_OTHER); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; - -// echoMeStructRequest with endpoint NOT header destination, must understand -$test = new SOAP_Test('echoVoid(echoMeStructRequest mustUnderstand=1 actor=other)', NULL); -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStructRequest', - new SOAPStruct('arg',34,325.325), 1, SOAP_TEST_ACTOR_OTHER); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; - -$test = new SOAP_Test('echoVoid(echoMeStructRequest mustUnderstand=1 actor=other)', NULL); -$test->type = 'soapval'; -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeStructRequest', - new SoapVar(new SOAPStruct('arg',34,325.325),SOAP_ENC_OBJECT,"SOAPStruct","http://soapinterop.org/xsd"), - 1, SOAP_TEST_ACTOR_OTHER); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; - -//*********************************************************** -// echoMeUnknown - -// echoMeUnknown with endpoint as header destination, doesn't have to understand -$test = new SOAP_Test('echoVoid(echoMeUnknown mustUnderstand=0 actor=next)', NULL); -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeUnknown', 'nobody understands me!',0,SOAP_ACTOR_NEXT); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; - -$test = new SOAP_Test('echoVoid(echoMeUnknown mustUnderstand=0 actor=next)', NULL); -$test->type = 'soapval'; -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeUnknown', new SoapVar('nobody understands me!',XSD_STRING),0,SOAP_ACTOR_NEXT); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; - -// echoMeUnknown with endpoint as header destination, must understand -$test = new SOAP_Test('echoVoid(echoMeUnknown mustUnderstand=1 actor=next)', NULL); -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeUnknown', 'nobody understands me!',1,SOAP_ACTOR_NEXT); -$test->headers_expect = array(); -$test->expect_fault = TRUE; -$soap_tests['GroupC'][] = $test; - -$test = new SOAP_Test('echoVoid(echoMeUnknown mustUnderstand=1 actor=next)', NULL); -$test->type = 'soapval'; -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeUnknown', new SoapVar('nobody understands me!',XSD_STRING),1,SOAP_ACTOR_NEXT); -$test->headers_expect = array(); -$test->expect_fault = TRUE; -$soap_tests['GroupC'][] = $test; - -// echoMeUnknown with endpoint NOT header destination, doesn't have to understand -$test = new SOAP_Test('echoVoid(echoMeUnknown mustUnderstand=0 actor=other)', NULL); -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeUnknown', 'nobody understands me!',0,SOAP_TEST_ACTOR_OTHER); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; - -$test = new SOAP_Test('echoVoid(echoMeUnknown mustUnderstand=0 actor=other)', NULL); -$test->type = 'soapval'; -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeUnknown', new SoapVar('nobody understands me!',XSD_STRING),0,SOAP_TEST_ACTOR_OTHER); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; - -// echoMeUnknown with endpoint NOT header destination, must understand -$test = new SOAP_Test('echoVoid(echoMeUnknown mustUnderstand=1 actor=other)', NULL); -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeUnknown', 'nobody understands me!',1,SOAP_TEST_ACTOR_OTHER); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; - -$test = new SOAP_Test('echoVoid(echoMeUnknown mustUnderstand=1 actor=other)', NULL); -$test->type = 'soapval'; -$test->headers[] = new SoapHeader('http://soapinterop.org/echoheader/','echoMeUnknown', new SoapVar('nobody understands me!',XSD_STRING),1,SOAP_TEST_ACTOR_OTHER); -$test->headers_expect = array(); -$soap_tests['GroupC'][] = $test; -?> diff --git a/ext/soap/interop/client_round2_results.php b/ext/soap/interop/client_round2_results.php deleted file mode 100644 index ff6a58f48c..0000000000 --- a/ext/soap/interop/client_round2_results.php +++ /dev/null @@ -1,73 +0,0 @@ -<?php -// NOTE: do not run this directly under a web server, as it will take a very long -// time to execute. Run from a command line or something, and redirect output -// to an html file. -// -// +----------------------------------------------------------------------+ -// | PHP Version 4 | -// +----------------------------------------------------------------------+ -// | Copyright (c) 1997-2018 The PHP Group | -// +----------------------------------------------------------------------+ -// | This source file is subject to version 2.02 of the PHP license, | -// | that is bundled with this package in the file LICENSE, and is | -// | available through the world-wide-web at | -// | http://www.php.net/license/2_02.txt. | -// | If you did not receive a copy of the PHP license and are unable to | -// | obtain it through the world-wide-web, please send a note to | -// | license@php.net so we can mail you a copy immediately. | -// +----------------------------------------------------------------------+ -// | Authors: Shane Caraveo <Shane@Caraveo.com> | -// +----------------------------------------------------------------------+ - -require_once 'client_round2_interop.php'; -?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - -<html> -<head> -<style> -TD { background-color: Red; } -TD.BLANK { background-color: White; } -TD.OK { background-color: Lime; } -TD.RESULT { background-color: Green; } -TD.untested { background-color: White; } -TD.CONNECT { background-color: Yellow; } -TD.TRANSPORT { background-color: Yellow; } -TD.WSDL { background-color: Yellow; } -TD.WSDLCACHE { background-color: Yellow; } -TD.WSDLPARSER { background-color: Yellow; } -TD.HTTP { background-color: Yellow; } -TD.SMTP { background-color: Yellow; } -</style> - <title>PHP SOAP Client Interop Test Results</title> -</head> - -<body bgcolor="White" text="Black"> -<h2 align="center">PHP SOAP Client Interop Test Results: Round2</h2> - -<a href="index.php">Back to Interop Index</a><br> -<p> </p> - -<?php -$iop = new Interop_Client(); - -if ($_GET['detail'] == 1) $iop->showFaults = 1; - -if ($_GET['wire']) { - $iop->showWire($_GET['wire']); -} else { - $iop->getEndpoints(); - $iop->getResults(); - - if ($_GET['test']) { - $iop->currentTest = $_GET['test']; - $iop->useWSDL = $_GET['wsdl']?$_GET['wsdl']:0; - $iop->paramType = $_GET['type']?$_GET['type']:'php'; - $iop->outputTable(); - } else { - $iop->outputTables(); - } -} -?> -</body> -</html> diff --git a/ext/soap/interop/client_round2_run.php b/ext/soap/interop/client_round2_run.php deleted file mode 100644 index f850448ce9..0000000000 --- a/ext/soap/interop/client_round2_run.php +++ /dev/null @@ -1,50 +0,0 @@ -<?php -// +----------------------------------------------------------------------+ -// | PHP Version 4 | -// +----------------------------------------------------------------------+ -// | Copyright (c) 1997-2018 The PHP Group | -// +----------------------------------------------------------------------+ -// | This source file is subject to version 2.02 of the PHP license, | -// | that is bundled with this package in the file LICENSE, and is | -// | available through the world-wide-web at | -// | http://www.php.net/license/2_02.txt. | -// | If you did not receive a copy of the PHP license and are unable to | -// | obtain it through the world-wide-web, please send a note to | -// | license@php.net so we can mail you a copy immediately. | -// +----------------------------------------------------------------------+ -// | Authors: Shane Caraveo <Shane@Caraveo.com> | -// +----------------------------------------------------------------------+ - -set_time_limit(0); -require_once 'client_round2_interop.php'; - -$iop = new Interop_Client(); -$iop->html = 0; - -// force a fetch of endpoints, this happens regardless if no endpoints in database -$iop->fetchEndpoints(); - -// set some options -$iop->currentTest = 'GroupC'; // see $tests above -$iop->paramType = 'php'; // 'php' or 'soapval' -$iop->useWSDL = 1; // 1= do wsdl tests -$iop->numServers = 0; // 0 = all -//$iop->specificEndpoint = 'PHP ext/soap'; // test only this endpoint -//$iop->testMethod = 'echoString'; // test only this method - -// endpoints to skip -//$iop->skipEndpointList = array('Apache Axis','IONA XMLBus','IONA XMLBus (CORBA)','MS SOAP ToolKit 2.0','MS SOAP ToolKit 3.0','Spheon JSOAP','SQLData SOAP Server','WASP Advanced 3.0'); -$iop->startAt=''; -$iop->nosave = 0; // 1= disable saving results to database -// debug output -$iop->show = 1; -$iop->debug = 0; -$iop->showFaults = 0; // used in result table output - -$iop->doTest(); // run a single set of tests using above options -#$iop->doGroupTests(); // run a group of tests set in $currentTest -#$iop->doTests(); // run all tests, ignore above options -#$iop->outputTables(); -echo "done\n"; - -?> diff --git a/ext/soap/interop/config.php.dist b/ext/soap/interop/config.php.dist deleted file mode 100644 index afdeaf9f6c..0000000000 --- a/ext/soap/interop/config.php.dist +++ /dev/null @@ -1,5 +0,0 @@ -<?php -// configuration items -$interopConfig['DSN'] = 'mysql://root@localhost/soapinterop'; -$interopConfig['baseURL'] = 'http://localhost/soap/interop'; -?>
\ No newline at end of file diff --git a/ext/soap/interop/database_round2.sql b/ext/soap/interop/database_round2.sql deleted file mode 100644 index 6834b0eeae..0000000000 --- a/ext/soap/interop/database_round2.sql +++ /dev/null @@ -1,44 +0,0 @@ -# phpMyAdmin MySQL-Dump -# version 2.2.5 -# http://phpwizard.net/phpMyAdmin/ -# http://phpmyadmin.sourceforge.net/ (download page) -# -# Host: localhost -# Generation Time: Apr 08, 2002 at 08:32 PM -# Server version: 3.23.49 -# PHP Version: 4.1.1 -# Database : `interop` -# -------------------------------------------------------- - -# -# Table structure for table `endpoints` -# - -CREATE TABLE endpoints ( - id int(11) NOT NULL auto_increment, - endpointName varchar(50) NOT NULL default '', - endpointURL varchar(255) NOT NULL default '', - wsdlURL varchar(255) NOT NULL default '', - class varchar(20) NOT NULL default '', - status int(11) NOT NULL default '1', - PRIMARY KEY (id) -) TYPE=MyISAM; -# -------------------------------------------------------- - -# -# Table structure for table `results` -# - -CREATE TABLE results ( - id int(11) NOT NULL auto_increment, - endpoint int(11) NOT NULL default '0', - stamp int(11) NOT NULL default '0', - class varchar(10) NOT NULL default '', - type varchar(10) default NULL, - wsdl int(11) NOT NULL default '0', - function varchar(255) NOT NULL default '', - result varchar(25) NOT NULL default '', - error text, - wire text NOT NULL, - PRIMARY KEY (id) -) TYPE=MyISAM; diff --git a/ext/soap/interop/echoheadersvc.wsdl.php b/ext/soap/interop/echoheadersvc.wsdl.php deleted file mode 100644 index e7070242a3..0000000000 --- a/ext/soap/interop/echoheadersvc.wsdl.php +++ /dev/null @@ -1,398 +0,0 @@ -<?php -header("Content-Type: text/xml"); -echo '<?xml version="1.0"?>'; -echo "\n"; -?> -<definitions name="InteropTest" targetNamespace="http://soapinterop.org/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://soapinterop.org/" xmlns:s="http://soapinterop.org/xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <types> - <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://soapinterop.org/xsd"> - - <import namespace="http://schemas.xmlsoap.org/soap/encoding/" /> - - <complexType name="ArrayOfstring"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="string[]"/> - </restriction> - </complexContent> - </complexType> - <complexType name="ArrayOfint"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> - </restriction> - </complexContent> - </complexType> - <complexType name="ArrayOffloat"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="float[]"/> - </restriction> - </complexContent> - </complexType> - <complexType name="ArrayOfSOAPStruct"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="s:SOAPStruct[]"/> - </restriction> - </complexContent> - </complexType> - <complexType name="SOAPStruct"> - <all> - <element name="varString" type="string" nillable="true"/> - <element name="varInt" type="int" nillable="true"/> - <element name="varFloat" type="float" nillable="true"/> - </all> - </complexType> - </schema> - </types> - - <message name="echoHeaderString_Request"> - <part name="echoMeStringRequest" type="xsd:string"/> - </message> - <message name="echoHeaderString_Response"> - <part name="echoMeStringResponse" type="xsd:string"/> - </message> - <message name="echoHeaderStruct_Request"> - <part name="echoMeStructRequest" type="s:SOAPStruct"/> - </message> - <message name="echoHeaderStruct_Response"> - <part name="echoMeStructResponse" type="s:SOAPStruct"/> - </message> - <message name="echoStringRequest"> - <part name="inputString" type="xsd:string"/> - </message> - <message name="echoStringResponse"> - <part name="return" type="xsd:string"/> - </message> - <message name="echoStringArrayRequest"> - <part name="inputStringArray" type="s:ArrayOfstring"/> - </message> - <message name="echoStringArrayResponse"> - <part name="return" type="s:ArrayOfstring"/> - </message> - <message name="echoIntegerRequest"> - <part name="inputInteger" type="xsd:int"/> - </message> - <message name="echoIntegerResponse"> - <part name="return" type="xsd:int"/> - </message> - <message name="echoIntegerArrayRequest"> - <part name="inputIntegerArray" type="s:ArrayOfint"/> - </message> - <message name="echoIntegerArrayResponse"> - <part name="return" type="s:ArrayOfint"/> - </message> - <message name="echoFloatRequest"> - <part name="inputFloat" type="xsd:float"/> - </message> - <message name="echoFloatResponse"> - <part name="return" type="xsd:float"/> - </message> - <message name="echoFloatArrayRequest"> - <part name="inputFloatArray" type="s:ArrayOffloat"/> - </message> - <message name="echoFloatArrayResponse"> - <part name="return" type="s:ArrayOffloat"/> - </message> - <message name="echoStructRequest"> - <part name="inputStruct" type="s:SOAPStruct"/> - </message> - <message name="echoStructResponse"> - <part name="return" type="s:SOAPStruct"/> - </message> - <message name="echoStructArrayRequest"> - <part name="inputStructArray" type="s:ArrayOfSOAPStruct"/> - </message> - <message name="echoStructArrayResponse"> - <part name="return" type="s:ArrayOfSOAPStruct"/> - </message> - <message name="echoVoidRequest"/> - <message name="echoVoidResponse"/> - <message name="echoBase64Request"> - <part name="inputBase64" type="xsd:base64Binary"/> - </message> - <message name="echoBase64Response"> - <part name="return" type="xsd:base64Binary"/> - </message> - <message name="echoDateRequest"> - <part name="inputDate" type="xsd:dateTime"/> - </message> - <message name="echoDateResponse"> - <part name="return" type="xsd:dateTime"/> - </message> - <message name="echoHexBinaryRequest"> - <part name="inputHexBinary" type="xsd:hexBinary"/> - </message> - <message name="echoHexBinaryResponse"> - <part name="return" type="xsd:hexBinary"/> - </message> - <message name="echoDecimalRequest"> - <part name="inputDecimal" type="xsd:decimal"/> - </message> - <message name="echoDecimalResponse"> - <part name="return" type="xsd:decimal"/> - </message> - <message name="echoBooleanRequest"> - <part name="inputBoolean" type="xsd:boolean"/> - </message> - <message name="echoBooleanResponse"> - <part name="return" type="xsd:boolean"/> - </message> - - <portType name="InteropTestPortType"> - <operation name="echoString" parameterOrder="inputString"> - <input message="tns:echoStringRequest"/> - <output message="tns:echoStringResponse"/> - </operation> - <operation name="echoStringArray" parameterOrder="inputStringArray"> - <input message="tns:echoStringArrayRequest"/> - <output message="tns:echoStringArrayResponse"/> - </operation> - <operation name="echoInteger" parameterOrder="inputInteger"> - <input message="tns:echoIntegerRequest"/> - <output message="tns:echoIntegerResponse"/> - </operation> - <operation name="echoIntegerArray" parameterOrder="inputIntegerArray"> - <input message="tns:echoIntegerArrayRequest"/> - <output message="tns:echoIntegerArrayResponse"/> - </operation> - <operation name="echoFloat" parameterOrder="inputFloat"> - <input message="tns:echoFloatRequest"/> - <output message="tns:echoFloatResponse"/> - </operation> - <operation name="echoFloatArray" parameterOrder="inputFloatArray"> - <input message="tns:echoFloatArrayRequest"/> - <output message="tns:echoFloatArrayResponse"/> - </operation> - <operation name="echoStruct" parameterOrder="inputStruct"> - <input message="tns:echoStructRequest"/> - <output message="tns:echoStructResponse"/> - </operation> - <operation name="echoStructArray" parameterOrder="inputStructArray"> - <input message="tns:echoStructArrayRequest"/> - <output message="tns:echoStructArrayResponse"/> - </operation> - <operation name="echoVoid"> - <input message="tns:echoVoidRequest"/> - <output message="tns:echoVoidResponse"/> - </operation> - <operation name="echoBase64" parameterOrder="inputBase64"> - <input message="tns:echoBase64Request"/> - <output message="tns:echoBase64Response"/> - </operation> - <operation name="echoDate" parameterOrder="inputDate"> - <input message="tns:echoDateRequest"/> - <output message="tns:echoDateResponse"/> - </operation> - <operation name="echoHexBinary" parameterOrder="inputHexBinary"> - <input message="tns:echoHexBinaryRequest"/> - <output message="tns:echoHexBinaryResponse"/> - </operation> - <operation name="echoDecimal" parameterOrder="inputDecimal"> - <input message="tns:echoDecimalRequest"/> - <output message="tns:echoDecimalResponse"/> - </operation> - <operation name="echoBoolean" parameterOrder="inputBoolean"> - <input message="tns:echoBooleanRequest"/> - <output message="tns:echoBooleanResponse"/> - </operation> - </portType> - - <binding name="InteropEchoHeaderBinding" type="tns:InteropTestPortType"> - <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - - <operation name="echoString"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoStringArray"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoInteger"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoIntegerArray"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoFloat"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoFloatArray"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoStruct"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoStructArray"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoVoid"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoBase64"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoDate"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoHexBinary"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoDecimal"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoBoolean"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Request" part="echoMeStringRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Request" part="echoMeStructRequest" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderString_Response" part="echoMeStringResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - <soap:header use="encoded" message="tns:echoHeaderStruct_Response" part="echoMeStructResponse" namespace="http://soapinterop.org/echoheader/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - - </binding> - - <service name="interopLabEchoHeader"> - - <port name="interopPortEchoHdr" binding="tns:InteropEchoHeaderBinding"> - <soap:address location="<?php echo ((isset($_SERVER['HTTPS'])?"https://":"http://").$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']));?>/server_round2_groupC.php"/> - </port> - - </service> -</definitions> diff --git a/ext/soap/interop/index.php b/ext/soap/interop/index.php deleted file mode 100644 index fc12bc8cb7..0000000000 --- a/ext/soap/interop/index.php +++ /dev/null @@ -1,59 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - -<html> -<head> - <title>PHP SOAP Interop</title> -</head> -<?php -// get our endpoint -$server = $_SERVER['HTTP_HOST'].':'.$_SERVER['SERVER_PORT']; -$base = (isset($_SERVER['HTTPS'])?"https://":"http://").$server.dirname($_SERVER['PHP_SELF'])."/interop.wsdl.php"; -$groupb = (isset($_SERVER['HTTPS'])?"https://":"http://").$server.dirname($_SERVER['PHP_SELF'])."/interopB.wsdl.php"; -$groupc = (isset($_SERVER['HTTPS'])?"https://":"http://").$server.dirname($_SERVER['PHP_SELF'])."/echoheadersvc.wsdl.php"; -?> -<body> - -<h2 align='center'>PHP SOAP Interop</h2> -<p>Welcome to the PHP SOAP Interop pages. These pages are set up for -SOAP Builder interop tests. You can find out more about the interop tests -at <a href="http://www.whitemesa.com/interop.htm">White Mesa</a>.</p> -<p>Currently Round 2 base, Group B and Group C interop tests are enabled.</p> - -<h3>Round 2 Interop Server</h3> -Base WSDL: <a href="<?php echo $base ?>"><?php echo $base ?></a><br> -Group B WSDL: <a href="<?php echo $groupb ?>"><?php echo $groupb ?></a><br> -Group C WSDL: <a href="<?php echo $groupc ?>"><?php echo $groupc ?></a><br> - -<h3>Interop Client</h3> - -<p>Notes: Tests are done both "Direct" and with "WSDL". WSDL tests use the supplied interop WSDL -to run the tests against. The Direct method uses an internal prebuilt list of methods and parameters -for the test.</p> -<p>Tests are also run against two methods of generating method parameters. The first, 'php', attempts -to directly serialize PHP variables into soap values. The second method, 'soapval', uses a SoapParam and SoapVar -classes to define what the type of the value is.</p> - -<h3>Client Test Interface</h3> -<p>The <a href="client_round2.php">client interface</a> allows you to run the PHP SOAP -Client against a chosen interop server. Each run updates the results database below.</p> - -<h3>Interop Client Test Results</h3> -<p>This is a database of the current test results using PHP SOAP Clients against interop servers.</p> -<p>More detail (wire) about errors (marked yellow or red) can be obtained by clicking on the -link in the result box. If we have an HTTP error -attempting to connect to the endpoint, we will mark all consecutive attempts as errors, and skip -testing that endpoint. This reduces the time it takes to run the tests if a server is unavailable.</p> -<ul> -<li><a href="client_round2_results.php?test=base&type=php&wsdl=0">Base results using PHP native types</a></li> -<li><a href="client_round2_results.php?test=base&type=soapval&wsdl=0">Base results using SOAP types</a></li> -<li><a href="client_round2_results.php?test=base&type=php&wsdl=1">Base results using PHP native types with WSDL</a></li> -<li><a href="client_round2_results.php?test=GroupB&type=php&wsdl=0">Group B results using PHP native types</a></li> -<li><a href="client_round2_results.php?test=GroupB&type=soapval&wsdl=0">Group B results using SOAP types</a></li> -<li><a href="client_round2_results.php?test=GroupB&type=php&wsdl=1">Group B results using PHP native types with WSDL</a></li> -<li><a href="client_round2_results.php?test=GroupC&type=php&wsdl=0">Group C results using PHP native types</a></li> -<li><a href="client_round2_results.php?test=GroupC&type=soapval&wsdl=0">Group C results using SOAP types</a></li> -<li><a href="client_round2_results.php?test=GroupC&type=php&wsdl=1">Group C results using PHP native types with WSDL</a></li> -<li><a href="client_round2_results.php">Show All Results</a></li> -</ul> -</body> -</html> diff --git a/ext/soap/interop/interop.wsdl.php b/ext/soap/interop/interop.wsdl.php deleted file mode 100644 index 6ed2d17d66..0000000000 --- a/ext/soap/interop/interop.wsdl.php +++ /dev/null @@ -1,336 +0,0 @@ -<?php -header("Content-Type: text/xml"); -echo '<?xml version="1.0"?>'; -echo "\n"; -?> -<definitions name="InteropTest" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://soapinterop.org/" - xmlns:s="http://soapinterop.org/xsd" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns="http://schemas.xmlsoap.org/wsdl/" - targetNamespace="http://soapinterop.org/"> - - <types> - <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://soapinterop.org/xsd"> - <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/" /> - <xsd:import namespace="http://schemas.xmlsoap.org/wsdl/" /> - <xsd:complexType name="ArrayOfstring"> - <xsd:complexContent> - <xsd:restriction base="SOAP-ENC:Array"> - <xsd:attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="string[]"/> - </xsd:restriction> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="ArrayOfint"> - <xsd:complexContent> - <xsd:restriction base="SOAP-ENC:Array"> - <xsd:attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> - </xsd:restriction> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="ArrayOffloat"> - <xsd:complexContent> - <xsd:restriction base="SOAP-ENC:Array"> - <xsd:attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="float[]"/> - </xsd:restriction> - </xsd:complexContent> - </xsd:complexType> - <xsd:complexType name="SOAPStruct"> - <xsd:all> - <xsd:element name="varString" type="string"/> - <xsd:element name="varInt" type="int"/> - <xsd:element name="varFloat" type="float"/> - </xsd:all> - </xsd:complexType> - <xsd:complexType name="ArrayOfSOAPStruct"> - <xsd:complexContent> - <xsd:restriction base="SOAP-ENC:Array"> - <xsd:attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="s:SOAPStruct[]"/> - </xsd:restriction> - </xsd:complexContent> - </xsd:complexType> - </schema> - </types> - - <message name="echoStringRequest"> - <part name="inputString" type="xsd:string" /> - </message> - <message name="echoStringResponse"> - <part name="outputString" type="xsd:string" /> - </message> - <message name="echoStringArrayRequest"> - <part name="inputStringArray" type="s:ArrayOfstring" /> - </message> - <message name="echoStringArrayResponse"> - <part name="outputStringArray" type="s:ArrayOfstring" /> - </message> - <message name="echoIntegerRequest"> - <part name="inputInteger" type="xsd:int" /> - </message> - <message name="echoIntegerResponse"> - <part name="outputInteger" type="xsd:int" /> - </message> - <message name="echoIntegerArrayRequest"> - <part name="inputIntegerArray" type="s:ArrayOfint" /> - </message> - <message name="echoIntegerArrayResponse"> - <part name="outputIntegerArray" type="s:ArrayOfint" /> - </message> - <message name="echoFloatRequest"> - <part name="inputFloat" type="xsd:float" /> - </message> - <message name="echoFloatResponse"> - <part name="outputFloat" type="xsd:float" /> - </message> - <message name="echoFloatArrayRequest"> - <part name="inputFloatArray" type="s:ArrayOffloat" /> - </message> - <message name="echoFloatArrayResponse"> - <part name="outputFloatArray" type="s:ArrayOffloat" /> - </message> - <message name="echoStructRequest"> - <part name="inputStruct" type="s:SOAPStruct" /> - </message> - <message name="echoStructResponse"> - <part name="outputStruct" type="s:SOAPStruct" /> - </message> - <message name="echoStructArrayRequest"> - <part name="inputStructArray" type="s:ArrayOfSOAPStruct" /> - </message> - <message name="echoStructArrayResponse"> - <part name="outputStructArray" type="s:ArrayOfSOAPStruct" /> - </message> - <message name="echoVoidRequest"> - </message> - <message name="echoVoidResponse"> - </message> - <message name="echoBase64Request"> - <part name="inputBase64" type="xsd:base64Binary" /> - </message> - <message name="echoBase64Response"> - <part name="outputBase64" type="xsd:base64Binary" /> - </message> - <message name="echoDateRequest"> - <part name="inputDate" type="xsd:dateTime" /> - </message> - <message name="echoDateResponse"> - <part name="outputDate" type="xsd:dateTime" /> - </message> - <message name="echoHexBinaryRequest"> - <part name="inputHexBinary" type="xsd:hexBinary" /> - </message> - <message name="echoHexBinaryResponse"> - <part name="outputHexBinary" type="xsd:hexBinary" /> - </message> - <message name="echoDecimalRequest"> - <part name="inputDecimal" type="xsd:decimal" /> - </message> - <message name="echoDecimalResponse"> - <part name="outputDecimal" type="xsd:decimal" /> - </message> - <message name="echoBooleanRequest"> - <part name="inputBoolean" type="xsd:boolean" /> - </message> - <message name="echoBooleanResponse"> - <part name="outputBoolean" type="xsd:boolean" /> - </message> - - <portType name="InteropTestPortType"> - <operation name="echoString"> - <input message="tns:echoStringRequest"/> - <output message="tns:echoStringResponse"/> - </operation> - <operation name="echoStringArray"> - <input message="tns:echoStringArrayRequest"/> - <output message="tns:echoStringArrayResponse"/> - </operation> - <operation name="echoInteger"> - <input message="tns:echoIntegerRequest"/> - <output message="tns:echoIntegerResponse"/> - </operation> - <operation name="echoIntegerArray"> - <input message="tns:echoIntegerArrayRequest"/> - <output message="tns:echoIntegerArrayResponse"/> - </operation> - <operation name="echoFloat"> - <input message="tns:echoFloatRequest"/> - <output message="tns:echoFloatResponse"/> - </operation> - <operation name="echoFloatArray"> - <input message="tns:echoFloatArrayRequest"/> - <output message="tns:echoFloatArrayResponse"/> - </operation> - <operation name="echoStruct"> - <input message="tns:echoStructRequest"/> - <output message="tns:echoStructResponse"/> - </operation> - <operation name="echoStructArray"> - <input message="tns:echoStructArrayRequest"/> - <output message="tns:echoStructArrayResponse"/> - </operation> - <operation name="echoVoid"> - <input message="tns:echoVoidRequest"/> - <output message="tns:echoVoidResponse"/> - </operation> - <operation name="echoBase64"> - <input message="tns:echoBase64Request"/> - <output message="tns:echoBase64Response"/> - </operation> - <operation name="echoDate"> - <input message="tns:echoDateRequest"/> - <output message="tns:echoDateResponse"/> - </operation> - <operation name="echoHexBinary"> - <input message="tns:echoHexBinaryRequest"/> - <output message="tns:echoHexBinaryResponse"/> - </operation> - <operation name="echoDecimal"> - <input message="tns:echoDecimalRequest"/> - <output message="tns:echoDecimalResponse"/> - </operation> - <operation name="echoBoolean"> - <input message="tns:echoBooleanRequest"/> - <output message="tns:echoBooleanResponse"/> - </operation> - </portType> - - <binding name="InteropTestBinding" type="tns:InteropTestPortType"> - <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="echoString"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoStringArray"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoInteger"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoIntegerArray"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoFloat"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoFloatArray"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoStruct"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoStructArray"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoVoid"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoBase64"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoDate"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoHexBinary"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoDecimal"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoBoolean"> - <soap:operation soapAction="http://" style="rpc"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - </binding> - - <service name="InteropTest"> - <port name="InteropTestPort" binding="tns:InteropTestBinding"> - <soap:address location="<?php echo ((isset($_SERVER['HTTPS'])?"https://":"http://").$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']));?>/server_round2_base.php"/> - </port> - </service> - -</definitions> diff --git a/ext/soap/interop/interopB.wsdl.php b/ext/soap/interop/interopB.wsdl.php deleted file mode 100644 index 3113b1c2fe..0000000000 --- a/ext/soap/interop/interopB.wsdl.php +++ /dev/null @@ -1,196 +0,0 @@ -<?php -header("Content-Type: text/xml"); -echo '<?xml version="1.0"?>'; -echo "\n"; -?> -<definitions name="InteropTest" - targetNamespace="http://soapinterop.org/" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://soapinterop.org/" - xmlns:s="http://soapinterop.org/xsd" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <types> - <schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://soapinterop.org/xsd"> - - <import namespace="http://schemas.xmlsoap.org/soap/encoding/" /> - - <complexType name="ArrayOfstring"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="string[]"/> - </restriction> - </complexContent> - </complexType> - <complexType name="ArrayOfint"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="int[]"/> - </restriction> - </complexContent> - </complexType> - <complexType name="ArrayOffloat"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="float[]"/> - </restriction> - </complexContent> - </complexType> - <complexType name="ArrayOfSOAPStruct"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="s:SOAPStruct[]"/> - </restriction> - </complexContent> - </complexType> - <complexType name="SOAPStruct"> - <all> - <element name="varString" type="string" nillable="true"/> - <element name="varInt" type="int" nillable="true"/> - <element name="varFloat" type="float" nillable="true"/> - </all> - </complexType> - <complexType name="SOAPStructStruct"> - <all> - <element name="varString" type="string" nillable="true"/> - <element name="varInt" type="int" nillable="true"/> - <element name="varFloat" type="float" nillable="true"/> - <element name="varStruct" type="s:SOAPStruct"/> - </all> - </complexType> - <complexType name="SOAPArrayStruct"> - <all> - <element name="varString" type="string" nillable="true"/> - <element name="varInt" type="int" nillable="true"/> - <element name="varFloat" type="float" nillable="true"/> - <element name="varArray" type="s:ArrayOfstring"/> - </all> - </complexType> - <complexType name="ArrayOfString2D"> - <complexContent> - <restriction base="SOAP-ENC:Array"> - <attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="string[,]"/> - </restriction> - </complexContent> - </complexType> - </schema> - </types> - - <message name="echoStructAsSimpleTypesRequest"> - <part name="inputStruct" type="s:SOAPStruct"/> - </message> - <message name="echoStructAsSimpleTypesResponse"> - <part name="outputString" type="xsd:string"/> - <part name="outputInteger" type="xsd:int"/> - <part name="outputFloat" type="xsd:float"/> - </message> - <message name="echoSimpleTypesAsStructRequest"> - <part name="inputString" type="xsd:string"/> - <part name="inputInteger" type="xsd:int"/> - <part name="inputFloat" type="xsd:float"/> - </message> - <message name="echoSimpleTypesAsStructResponse"> - <part name="return" type="s:SOAPStruct"/> - </message> - <message name="echo2DStringArrayRequest"> - <part name="input2DStringArray" type="s:ArrayOfString2D"/> - </message> - <message name="echo2DStringArrayResponse"> - <part name="return" type="s:ArrayOfString2D"/> - </message> - <message name="echoNestedStructRequest"> - <part name="inputStruct" type="s:SOAPStructStruct"/> - </message> - <message name="echoNestedStructResponse"> - <part name="return" type="s:SOAPStructStruct"/> - </message> - <message name="echoNestedArrayRequest"> - <part name="inputStruct" type="s:SOAPArrayStruct"/> - </message> - <message name="echoNestedArrayResponse"> - <part name="return" type="s:SOAPArrayStruct"/> - </message> - - <portType name="InteropTestPortTypeB"> - <operation name="echoStructAsSimpleTypes" parameterOrder="inputStruct outputString outputInteger outputFloat"> - <input message="tns:echoStructAsSimpleTypesRequest" name="echoStructAsSimpleTypes"/> - <output message="tns:echoStructAsSimpleTypesResponse" name="echoStructAsSimpleTypesResponse"/> - </operation> - <operation name="echoSimpleTypesAsStruct" parameterOrder="inputString inputInteger inputFloat"> - <input message="tns:echoSimpleTypesAsStructRequest" name="echoSimpleTypesAsStruct"/> - <output message="tns:echoSimpleTypesAsStructResponse" name="echoSimpleTypesAsStructResponse"/> - </operation> - <operation name="echo2DStringArray" parameterOrder="input2DStringArray"> - <input message="tns:echo2DStringArrayRequest" name="echo2DStringArray"/> - <output message="tns:echo2DStringArrayResponse" name="echo2DStringArrayResponse"/> - </operation> - <operation name="echoNestedStruct" parameterOrder="inputStruct"> - <input message="tns:echoNestedStructRequest" name="echoNestedStruct"/> - <output message="tns:echoNestedStructResponse" name="echoNestedStructResponse"/> - </operation> - <operation name="echoNestedArray" parameterOrder="inputStruct"> - <input message="tns:echoNestedArrayRequest" name="echoNestedArray"/> - <output message="tns:echoNestedArrayResponse" name="echoNestedArrayResponse"/> - </operation> - </portType> - - <binding name="InteropTestSoapBindingB" type="tns:InteropTestPortTypeB"> - <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="echoStructAsSimpleTypes"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoSimpleTypesAsStruct"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echo2DStringArray"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoNestedStruct"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - <operation name="echoNestedArray"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - </binding> - - <service name="interopLabB"> - <port name="interopTestPortB" binding="tns:InteropTestSoapBindingB"> - <soap:address location="<?php echo ((isset($_SERVER['HTTPS'])?"https://":"http://").$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']));?>/server_round2_groupB.php"/> - </port> - </service> - -</definitions> diff --git a/ext/soap/interop/server_round2_base.php b/ext/soap/interop/server_round2_base.php deleted file mode 100644 index 0eaedd8ec1..0000000000 --- a/ext/soap/interop/server_round2_base.php +++ /dev/null @@ -1,102 +0,0 @@ -<? -// -// +----------------------------------------------------------------------+ -// | PHP Version 4 | -// +----------------------------------------------------------------------+ -// | Copyright (c) 1997-2018 The PHP Group | -// +----------------------------------------------------------------------+ -// | This source file is subject to version 2.02 of the PHP license, | -// | that is bundled with this package in the file LICENSE, and is | -// | available through the world-wide-web at | -// | http://www.php.net/license/2_02.txt. | -// | If you did not receive a copy of the PHP license and are unable to | -// | obtain it through the world-wide-web, please send a note to | -// | license@php.net so we can mail you a copy immediately. | -// +----------------------------------------------------------------------+ -// | Authors: Shane Caraveo <Shane@Caraveo.com> Port to PEAR and more | -// | Authors: Dietrich Ayala <dietrich@ganx4.com> Original Author | -// +----------------------------------------------------------------------+ - -class SOAP_Interop_Base { - - function echoString($inputString) - { - return $inputString; - } - - function echoStringArray($inputStringArray) - { - return $inputStringArray; - } - - - function echoInteger($inputInteger) - { - return $inputInteger; - } - - function echoIntegerArray($inputIntegerArray) - { - return $inputIntegerArray; - } - - function echoFloat($inputFloat) - { - return $inputFloat; - } - - function echoFloatArray($inputFloatArray) - { - return $inputFloatArray; - } - - function echoStruct($inputStruct) - { - return $inputStruct; - } - - function echoStructArray($inputStructArray) - { - return $inputStructArray; - } - - function echoVoid() - { - return NULL; - } - - 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 echoMimeAttachment($stuff) - { - return new SOAP_Attachment('return','application/octet-stream',NULL,$stuff); - } -} - -$server = new SoapServer((isset($_SERVER['HTTPS'])?"https://":"http://").$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/interop.wsdl.php"); -$server->setClass("SOAP_Interop_Base"); -$server->handle(); -?> diff --git a/ext/soap/interop/server_round2_groupB.php b/ext/soap/interop/server_round2_groupB.php deleted file mode 100644 index fd6bc66fbd..0000000000 --- a/ext/soap/interop/server_round2_groupB.php +++ /dev/null @@ -1,55 +0,0 @@ -<? -// -// +----------------------------------------------------------------------+ -// | PHP Version 4 | -// +----------------------------------------------------------------------+ -// | Copyright (c) 1997-2018 The PHP Group | -// +----------------------------------------------------------------------+ -// | This source file is subject to version 2.02 of the PHP license, | -// | that is bundled with this package in the file LICENSE, and is | -// | available through the world-wide-web at | -// | http://www.php.net/license/2_02.txt. | -// | If you did not receive a copy of the PHP license and are unable to | -// | obtain it through the world-wide-web, please send a note to | -// | license@php.net so we can mail you a copy immediately. | -// +----------------------------------------------------------------------+ -// | Authors: Shane Caraveo <Shane@Caraveo.com> Port to PEAR and more | -// | Authors: Dietrich Ayala <dietrich@ganx4.com> Original Author | -// +----------------------------------------------------------------------+ - -class SOAP_Interop_GroupB { - - 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; - } -} - -$server = new SoapServer((isset($_SERVER['HTTPS'])?"https://":"http://").$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/interopB.wsdl.php"); -$server->setClass("SOAP_Interop_GroupB"); -$server->handle(); -?> diff --git a/ext/soap/interop/server_round2_groupC.php b/ext/soap/interop/server_round2_groupC.php deleted file mode 100644 index 785174ebcf..0000000000 --- a/ext/soap/interop/server_round2_groupC.php +++ /dev/null @@ -1,40 +0,0 @@ -<? -// -// +----------------------------------------------------------------------+ -// | PHP Version 4 | -// +----------------------------------------------------------------------+ -// | Copyright (c) 1997-2018 The PHP Group | -// +----------------------------------------------------------------------+ -// | This source file is subject to version 2.02 of the PHP license, | -// | that is bundled with this package in the file LICENSE, and is | -// | available through the world-wide-web at | -// | http://www.php.net/license/2_02.txt. | -// | If you did not receive a copy of the PHP license and are unable to | -// | obtain it through the world-wide-web, please send a note to | -// | license@php.net so we can mail you a copy immediately. | -// +----------------------------------------------------------------------+ -// | Authors: Shane Caraveo <Shane@Caraveo.com> | -// +----------------------------------------------------------------------+ - -class SOAP_Interop_GroupC { - var $method_namespace = 'http://soapinterop.org/echoheader/'; - - function echoMeStringRequest($string) - { - return new SoapHeader($this->method_namespace, "echoMeStringResponse", $string); - } - - function echoMeStructRequest($struct) - { - return new SoapHeader($this->method_namespace, "echoMeStructResponse", $struct); - } - - function echoVoid() - { - } -} - -$server = new SoapServer((isset($_SERVER['HTTPS'])?"https://":"http://").$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/echoheadersvc.wsdl.php"); -$server->setClass("SOAP_Interop_GroupC"); -$server->handle(); -?> diff --git a/ext/soap/interop/test.utility.php b/ext/soap/interop/test.utility.php deleted file mode 100644 index e581772bbb..0000000000 --- a/ext/soap/interop/test.utility.php +++ /dev/null @@ -1,143 +0,0 @@ -<?php - -function timestamp_to_soap_datetime($t) { - return date('Y-m-d\TH:i:sO',$t); -} - -function soap_datetime_to_timestamp($t) { - /* Ignore Microsecconds */ - $iso8601 = '(-?[0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(\.[0-9]*)?(Z|[+\-][0-9]{4}|[+\-][0-9]{2}:[0-9]{2})?'; - if (!is_int($t)) { - if (!ereg($iso8601,$t,$r)) { - return false; - } - $t = gmmktime($r[4],$r[5],$r[6],$r[2],$r[3],$r[1]); - if (!empty($r[8]) && $r[8] != 'Z') { - $op = substr($r[8],0,1); - $h = substr($r[8],1,2); - if (strstr($r[8],':')) { - $m = substr($r[8],4,2); - } else { - $m = substr($r[8],3,2); - } - $t += (($op == "-"?1:-1) * $h * 60 + $m) * 60; - } - } - return $t; -} - -function date_compare($f1,$f2) -{ - return soap_datetime_to_timestamp($f1) == soap_datetime_to_timestamp($f2); -} - -function hex_compare($f1, $f2) -{ - return strcasecmp($f1,$f2) == 0; -} - -function number_compare($f1, $f2) -{ - # figure out which has the least fractional digits - preg_match('/.*?\.(.*)/',$f1,$m1); - preg_match('/.*?\.(.*)/',$f2,$m2); - #print_r($m1); - # always use at least 2 digits of precision - $d = max(min(strlen(count($m1)?$m1[1]:'0'),strlen(count($m2)?$m2[1]:'0')),2); - $f1 = round($f1, $d); - $f2 = round($f2, $d); - return $f1 == $f2; -// return bccomp($f1, $f2, $d) == 0; -} - -function boolean_compare($f1, $f2) -{ - if (($f1 == 'true' || $f1 === TRUE || $f1 != 0) && - ($f2 == 'true' || $f2 === TRUE || $f2 != 0)) return TRUE; - if (($f1 == 'false' || $f1 === FALSE || $f1 == 0) && - ($f2 == 'false' || $f2 === FALSE || $f2 == 0)) return TRUE; - return FALSE; -} - -function string_compare($e1, $e2) -{ - if (is_numeric($e1) && is_numeric($e2)) { - return number_compare($e1, $e2); - } - # handle dateTime comparison - $e1_type = gettype($e1); - $e2_type = gettype($e2); - $ok = FALSE; - if ($e1_type == "string") { -// $dt = new SOAP_Type_dateTime(); -// $ok = $dt->compare($e1, $e2) == 0; - $oj = false; - } - return $ok || $e1 == $e2 || strcasecmp(trim($e1), trim($e2)) == 0; -} - -function array_compare(&$ar1, &$ar2) { - if (gettype($ar1) != 'array' || gettype($ar2) != 'array') return FALSE; - if (count($ar1) != count($ar2)) return FALSE; - foreach ($ar1 as $k => $v) { - if (!array_key_exists($k,$ar2)) return FALSE; - if (!compare($v,$ar2[$k])) return FALSE; - } - return TRUE; -} - -function object_compare(&$obj1, &$obj2) { - if (gettype($obj1) != 'object' || gettype($obj2) != 'object') return FALSE; -// if (class_name(obj1) != class_name(obj2)) return FALSE; - $ar1 = (array)$obj1; - $ar2 = (array)$obj2; - return array_compare($ar1,$ar2); -} - -function compare(&$x,&$y) { - $ok = 0; - $x_type = gettype($x); - $y_type = gettype($y); - if ($x_type == $y_type) { - if ($x_type == "array") { - $ok = array_compare($x, $y); - } else if ($x_type == "object") { - $ok = object_compare($x, $y); - } else if ($x_type == "double") { - $ok = number_compare($x, $y); -// } else if ($x_type == 'boolean') { -// $ok = boolean_compare($x, $y); - } else { - $ok = ($x == $y); -// $ok = string_compare($expect, $result); - } - } - return $ok; -} - - -function parseMessage($msg) -{ - # strip line endings - #$msg = preg_replace('/\r|\n/', ' ', $msg); - $response = new SOAP_Parser($msg); - if ($response->fault) { - return $response->fault->getFault(); - } - $return = $response->getResponse(); - $v = $response->decode($return); - if (gettype($v) == 'array' && count($v)==1) { - return array_shift($v); - } - return $v; -} - -function var_dump_str($var) { - ob_start(); - var_dump($var); - $res = ob_get_contents(); - ob_end_clean(); - return $res; -} - -?> diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index faca3acc15..c44fec3ab0 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -604,7 +604,7 @@ xmlNodePtr to_xml_user(encodeTypePtr type, zval *data, int style, xmlNodePtr par if (type && type->map && Z_TYPE(type->map->to_xml) != IS_UNDEF) { ZVAL_NULL(&return_value); - if (call_user_function(EG(function_table), NULL, &type->map->to_xml, &return_value, 1, data) == FAILURE) { + if (call_user_function(NULL, NULL, &type->map->to_xml, &return_value, 1, data) == FAILURE) { soap_error0(E_ERROR, "Encoding: Error calling to_xml callback"); } if (Z_TYPE(return_value) == IS_STRING) { @@ -641,7 +641,7 @@ zval *to_zval_user(zval *ret, encodeTypePtr type, xmlNodePtr node) xmlBufferFree(buf); xmlFreeNode(copy); - if (call_user_function(EG(function_table), NULL, &type->map->to_zval, ret, 1, &data) == FAILURE) { + if (call_user_function(NULL, NULL, &type->map->to_zval, ret, 1, &data) == FAILURE) { soap_error0(E_ERROR, "Encoding: Error calling from_xml callback"); } else if (EG(exception)) { ZVAL_NULL(ret); @@ -1172,31 +1172,10 @@ static void set_zval_property(zval* object, char* name, zval* val) static zval* get_zval_property(zval* object, char* name, zval *rv) { if (Z_TYPE_P(object) == IS_OBJECT) { - zval member; - zval *data; - zend_class_entry *old_scope; - - ZVAL_STRING(&member, name); - old_scope = EG(fake_scope); - EG(fake_scope) = Z_OBJCE_P(object); - data = Z_OBJ_HT_P(object)->read_property(object, &member, BP_VAR_IS, NULL, rv); + zval *data = zend_read_property(Z_OBJCE_P(object), object, name, strlen(name), 1, rv); if (data == &EG(uninitialized_zval)) { - /* Hack for bug #32455 */ - zend_property_info *property_info; - - property_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR(member), 1); - EG(fake_scope) = old_scope; - if (property_info != ZEND_WRONG_PROPERTY_INFO && property_info && - zend_hash_exists(Z_OBJPROP_P(object), property_info->name)) { - zval_ptr_dtor(&member); - ZVAL_DEREF(data); - return data; - } - zval_ptr_dtor(&member); return NULL; } - zval_ptr_dtor(&member); - EG(fake_scope) = old_scope; ZVAL_DEREF(data); return data; } else if (Z_TYPE_P(object) == IS_ARRAY) { @@ -1208,15 +1187,7 @@ static zval* get_zval_property(zval* object, char* name, zval *rv) static void unset_zval_property(zval* object, char* name) { if (Z_TYPE_P(object) == IS_OBJECT) { - zval member; - zend_class_entry *old_scope; - - ZVAL_STRING(&member, name); - old_scope = EG(fake_scope); - EG(fake_scope) = Z_OBJCE_P(object); - Z_OBJ_HT_P(object)->unset_property(object, &member, NULL); - EG(fake_scope) = old_scope; - zval_ptr_dtor(&member); + zend_unset_property(Z_OBJCE_P(object), object, name, strlen(name)); } else if (Z_TYPE_P(object) == IS_ARRAY) { zend_hash_str_del(Z_ARRVAL_P(object), name, strlen(name)); } @@ -1548,7 +1519,13 @@ static zval *to_zval_object_ex(zval *ret, encodeTypePtr type, xmlNodePtr data, z text = xmlNewText(BAD_CAST(str_val)); xmlAddChild(dummy, text); ZVAL_NULL(&data); - master_to_zval(&data, attr->encode, dummy); + /* TODO: There are other places using dummy nodes -- generalize? */ + zend_try { + master_to_zval(&data, attr->encode, dummy); + } zend_catch { + xmlFreeNode(dummy); + zend_bailout(); + } zend_end_try(); xmlFreeNode(dummy); set_zval_property(ret, attr->name, &data); } @@ -2185,16 +2162,6 @@ static void add_xml_array_elements(xmlNodePtr xmlParam, } } -static inline int array_num_elements(HashTable* ht) -{ - if (ht->nNumUsed && - Z_TYPE(ht->arData[ht->nNumUsed-1].val) != IS_UNDEF && - ht->arData[ht->nNumUsed-1].key == NULL) { - return ht->arData[ht->nNumUsed-1].h - 1; - } - return 0; -} - static xmlNodePtr to_xml_array(encodeTypePtr type, zval *data, int style, xmlNodePtr parent) { sdlTypePtr sdl_type = type->sdl_type; @@ -2896,8 +2863,10 @@ static xmlNodePtr to_xml_datetime_ex(encodeTypePtr type, zval *data, char *forma } /* Time zone support */ -#ifdef HAVE_TM_GMTOFF - snprintf(tzbuf, sizeof(tzbuf), "%c%02d:%02d", (ta->tm_gmtoff < 0) ? '-' : '+', abs(ta->tm_gmtoff / 3600), abs( (ta->tm_gmtoff % 3600) / 60 )); +#ifdef HAVE_STRUCT_TM_TM_GMTOFF + snprintf(tzbuf, sizeof(tzbuf), "%c%02ld:%02ld", + (ta->tm_gmtoff < 0) ? '-' : '+', + labs(ta->tm_gmtoff / 3600), labs( (ta->tm_gmtoff % 3600) / 60 )); #else # if defined(__CYGWIN__) || (defined(PHP_WIN32) && defined(_MSC_VER) && _MSC_VER >= 1900) snprintf(tzbuf, sizeof(tzbuf), "%c%02d:%02d", ((ta->tm_isdst ? _timezone - 3600:_timezone)>0)?'-':'+', abs((ta->tm_isdst ? _timezone - 3600 : _timezone) / 3600), abs(((ta->tm_isdst ? _timezone - 3600 : _timezone) % 3600) / 60)); diff --git a/ext/soap/php_encoding.h b/ext/soap/php_encoding.h index 2ce500b7c0..cab46ddf29 100644 --- a/ext/soap/php_encoding.h +++ b/ext/soap/php_encoding.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index fb3089ec27..299fe23a82 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -833,20 +833,13 @@ try_again: Z_TYPE_P(cookies) == IS_ARRAY) { zval *data; zend_string *key; - int i, n; - + uint32_t n = zend_hash_num_elements(Z_ARRVAL_P(cookies)); has_cookies = 1; - n = zend_hash_num_elements(Z_ARRVAL_P(cookies)); if (n > 0) { - zend_hash_internal_pointer_reset(Z_ARRVAL_P(cookies)); smart_str_append_const(&soap_headers, "Cookie: "); - for (i = 0; i < n; i++) { - zend_ulong numindx; - int res = zend_hash_get_current_key(Z_ARRVAL_P(cookies), &key, &numindx); - data = zend_hash_get_current_data(Z_ARRVAL_P(cookies)); - - if (res == HASH_KEY_IS_STRING && Z_TYPE_P(data) == IS_ARRAY) { - zval *value; + ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(cookies), key, data) { + if (key && Z_TYPE_P(data) == IS_ARRAY) { + zval *value; if ((value = zend_hash_index_find(Z_ARRVAL_P(data), 0)) != NULL && Z_TYPE_P(value) == IS_STRING) { @@ -865,8 +858,7 @@ try_again: } } } - zend_hash_move_forward(Z_ARRVAL_P(cookies)); - } + } ZEND_HASH_FOREACH_END(); smart_str_append_const(&soap_headers, "\r\n"); } } @@ -1434,7 +1426,7 @@ static zend_string* get_http_body(php_stream *stream, int close, char *headers) php_stream_gets(stream, headerbuf, sizeof(headerbuf)); if (sscanf(headerbuf, "%x", &buf_size) > 0 ) { if (buf_size > 0) { - int len_size = 0; + size_t len_size = 0; if (http_buf_size + buf_size + 1 < 0) { if (http_buf) { @@ -1450,7 +1442,7 @@ static zend_string* get_http_body(php_stream *stream, int close, char *headers) } while (len_size < buf_size) { - int len_read = php_stream_read(stream, http_buf->val + http_buf_size, buf_size - len_size); + ssize_t len_read = php_stream_read(stream, http_buf->val + http_buf_size, buf_size - len_size); if (len_read <= 0) { /* Error or EOF */ done = TRUE; @@ -1466,7 +1458,7 @@ static zend_string* get_http_body(php_stream *stream, int close, char *headers) ch = php_stream_getc(stream); } if (ch != '\n') { - /* Somthing wrong in chunked encoding */ + /* Something wrong in chunked encoding */ if (http_buf) { zend_string_release_ex(http_buf, 0); } @@ -1474,7 +1466,7 @@ static zend_string* get_http_body(php_stream *stream, int close, char *headers) } } } else { - /* Somthing wrong in chunked encoding */ + /* Something wrong in chunked encoding */ if (http_buf) { zend_string_release_ex(http_buf, 0); } @@ -1508,7 +1500,7 @@ static zend_string* get_http_body(php_stream *stream, int close, char *headers) } http_buf = zend_string_alloc(header_length, 0); while (http_buf_size < header_length) { - int len_read = php_stream_read(stream, http_buf->val + http_buf_size, header_length - http_buf_size); + ssize_t len_read = php_stream_read(stream, http_buf->val + http_buf_size, header_length - http_buf_size); if (len_read <= 0) { break; } @@ -1516,7 +1508,7 @@ static zend_string* get_http_body(php_stream *stream, int close, char *headers) } } else if (header_close) { do { - int len_read; + ssize_t len_read; if (http_buf) { http_buf = zend_string_realloc(http_buf, http_buf_size + 4096, 0); } else { @@ -1556,11 +1548,3 @@ static zend_string *get_http_headers(php_stream *stream) smart_str_free(&tmp_response); return NULL; } -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: sw=4 ts=4 fdm=marker - * vim<600: sw=4 ts=4 - */ diff --git a/ext/soap/php_http.h b/ext/soap/php_http.h index 8f0f75e42d..887e28fe69 100644 --- a/ext/soap/php_http.h +++ b/ext/soap/php_http.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/soap/php_packet_soap.c b/ext/soap/php_packet_soap.c index 8ee40c78bc..685a474e82 100644 --- a/ext/soap/php_packet_soap.c +++ b/ext/soap/php_packet_soap.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/soap/php_packet_soap.h b/ext/soap/php_packet_soap.h index 855c74bbdb..4d47071634 100644 --- a/ext/soap/php_packet_soap.h +++ b/ext/soap/php_packet_soap.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c index edfe694021..33793704ad 100644 --- a/ext/soap/php_schema.c +++ b/ext/soap/php_schema.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -458,7 +458,7 @@ static int schema_list(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr listType, sdlTypeP { char buf[MAX_LENGTH_OF_LONG + 1]; char *res = zend_print_long_to_buf(buf + sizeof(buf) - 1, zend_hash_num_elements(sdl->types)); - char *str = emalloc(sizeof("anonymous") + buf + sizeof(buf) - 1 - res); + char *str = emalloc(sizeof("anonymous")-1 + (buf + sizeof(buf) - res)); memcpy(str, "anonymous", sizeof("anonymous")-1); memcpy(str + sizeof("anonymous")-1, res, buf + sizeof(buf) - res); @@ -555,7 +555,7 @@ static int schema_union(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr unionType, sdlTyp { char buf[MAX_LENGTH_OF_LONG + 1]; char *res = zend_print_long_to_buf(buf + sizeof(buf) - 1, zend_hash_num_elements(sdl->types)); - char *str = emalloc(sizeof("anonymous") + buf + sizeof(buf) - 1 - res); + char *str = emalloc(sizeof("anonymous")-1 + (buf + sizeof(buf) - res)); memcpy(str, "anonymous", sizeof("anonymous")-1); memcpy(str + sizeof("anonymous")-1, res, buf + sizeof(buf) - res); @@ -1799,6 +1799,7 @@ static int schema_attribute(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr attrType, sdl smart_str_free(&key); } else{ soap_error0(E_ERROR, "Parsing Schema: attribute has no 'name' nor 'ref' attributes"); + return FALSE; /* the above call is noreturn, but not marked as such */ } /* type = QName */ @@ -1927,7 +1928,7 @@ static int schema_attribute(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr attrType, sdl { char buf[MAX_LENGTH_OF_LONG + 1]; char *res = zend_print_long_to_buf(buf + sizeof(buf) - 1, zend_hash_num_elements(sdl->types)); - char *str = emalloc(sizeof("anonymous") + buf + sizeof(buf) - 1 - res); + char *str = emalloc(sizeof("anonymous")-1 + (buf + sizeof(buf) - res)); memcpy(str, "anonymous", sizeof("anonymous")-1); memcpy(str + sizeof("anonymous")-1, res, buf + sizeof(buf) - res); diff --git a/ext/soap/php_schema.h b/ext/soap/php_schema.h index 54db98c740..d7b51aa4b7 100644 --- a/ext/soap/php_schema.h +++ b/ext/soap/php_schema.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 1875bec41d..82fbd3bb20 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -116,7 +116,9 @@ encodePtr get_encoder(sdlPtr sdl, const char *ns, const char *type) int len = ns_len + type_len + 1; nscat = emalloc(len + 1); - memcpy(nscat, ns, ns_len); + if (ns) { + memcpy(nscat, ns, ns_len); + } nscat[ns_len] = ':'; memcpy(nscat+ns_len+1, type, type_len); nscat[len] = '\0'; @@ -737,7 +739,9 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri) zend_hash_init(&ctx.portTypes, 0, NULL, NULL, 0); zend_hash_init(&ctx.services, 0, NULL, NULL, 0); - load_wsdl_ex(this_ptr, struri,&ctx, 0); + load_wsdl_ex(this_ptr, struri, &ctx, 0); + zend_try { + schema_pass2(&ctx); n = zend_hash_num_elements(&ctx.services); @@ -1164,6 +1168,12 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri) soap_error0(E_ERROR, "Parsing WSDL: Could not find any usable binding services in WSDL."); } + } zend_catch { + /* Avoid persistent memory leak. */ + zend_hash_destroy(&ctx.docs); + zend_bailout(); + } zend_end_try(); + zend_hash_destroy(&ctx.messages); zend_hash_destroy(&ctx.bindings); zend_hash_destroy(&ctx.portTypes); @@ -1176,15 +1186,15 @@ static sdlPtr load_wsdl(zval *this_ptr, char *struri) #define WSDL_CACHE_VERSION 0x10 #define WSDL_CACHE_GET(ret,type,buf) memcpy(&ret,*buf,sizeof(type)); *buf += sizeof(type); -#define WSDL_CACHE_GET_INT(ret,buf) ret = ((unsigned char)(*buf)[0])|((unsigned char)(*buf)[1]<<8)|((unsigned char)(*buf)[2]<<16)|((int)(*buf)[3]<<24); *buf += 4; +#define WSDL_CACHE_GET_INT(ret,buf) ret = ((unsigned char)(*buf)[0])|((unsigned char)(*buf)[1]<<8)|((unsigned char)(*buf)[2]<<16)|((unsigned)(*buf)[3]<<24); *buf += 4; #define WSDL_CACHE_GET_1(ret,type,buf) ret = (type)(**buf); (*buf)++; #define WSDL_CACHE_GET_N(ret,n,buf) memcpy(ret,*buf,n); *buf += n; #define WSDL_CACHE_SKIP(n,buf) *buf += n; -#define WSDL_CACHE_PUT_INT(val,buf) smart_str_appendc(buf,val & 0xff); \ - smart_str_appendc(buf,(val >> 8) & 0xff); \ - smart_str_appendc(buf,(val >> 16) & 0xff); \ - smart_str_appendc(buf,(val >> 24) & 0xff); +#define WSDL_CACHE_PUT_INT(val,buf) smart_str_appendc(buf,(char)(val & 0xff)); \ + smart_str_appendc(buf,(char)((val >> 8) & 0xff)); \ + smart_str_appendc(buf,(char)((val >> 16) & 0xff)); \ + smart_str_appendc(buf,(char)((val >> 24) & 0xff)); #define WSDL_CACHE_PUT_1(val,buf) smart_str_appendc(buf,val); #define WSDL_CACHE_PUT_N(val,n,buf) smart_str_appendl(buf,(char*)val,n); diff --git a/ext/soap/php_sdl.h b/ext/soap/php_sdl.h index fbc6118bf3..f57b079f86 100644 --- a/ext/soap/php_sdl.h +++ b/ext/soap/php_sdl.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h index b01e963a98..8e8adb87d2 100644 --- a/ext/soap/php_soap.h +++ b/ext/soap/php_soap.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/soap/php_xml.c b/ext/soap/php_xml.c index 8d07bb0d83..b606030179 100644 --- a/ext/soap/php_xml.c +++ b/ext/soap/php_xml.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -99,9 +99,7 @@ xmlDocPtr soap_xmlParseFile(const char *filename) ctxt->sax->warning = NULL; ctxt->sax->error = NULL; /*ctxt->sax->fatalError = NULL;*/ -#if LIBXML_VERSION >= 20703 ctxt->options |= XML_PARSE_HUGE; -#endif old = php_libxml_disable_entity_loader(1); xmlParseDocument(ctxt); php_libxml_disable_entity_loader(old); @@ -148,9 +146,7 @@ xmlDocPtr soap_xmlParseMemory(const void *buf, size_t buf_size) ctxt->sax->warning = NULL; ctxt->sax->error = NULL; /*ctxt->sax->fatalError = NULL;*/ -#if LIBXML_VERSION >= 20703 ctxt->options |= XML_PARSE_HUGE; -#endif old = php_libxml_disable_entity_loader(1); xmlParseDocument(ctxt); php_libxml_disable_entity_loader(old); diff --git a/ext/soap/php_xml.h b/ext/soap/php_xml.h index 01d0d73860..ac92aa9755 100644 --- a/ext/soap/php_xml.h +++ b/ext/soap/php_xml.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | diff --git a/ext/soap/soap.c b/ext/soap/soap.c index bff077d95f..ce776efb3f 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -51,7 +51,7 @@ static void type_to_string(sdlTypePtr type, smart_str *buf, int level); static void clear_soap_fault(zval *obj); static void set_soap_fault(zval *obj, char *fault_code_ns, char *fault_code, char *fault_string, char *fault_actor, zval *fault_detail, char *name); static void add_soap_fault_ex(zval *fault, zval *obj, char *fault_code, char *fault_string, char *fault_actor, zval *fault_detail); -static void soap_server_fault(char* code, char* string, char *actor, zval* details, char *name); +static ZEND_NORETURN void soap_server_fault(char* code, char* string, char *actor, zval* details, char *name); static void soap_server_fault_ex(sdlFunctionPtr function, zval* fault, soapHeader* hdr); static sdlParamPtr get_param(sdlFunctionPtr function, char *param_name, int index, int); @@ -77,7 +77,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const int _old_soap_version = SOAP_GLOBAL(soap_version);\ SOAP_GLOBAL(use_soap_error_handler) = 1;\ SOAP_GLOBAL(error_code) = "Server";\ - Z_OBJ(SOAP_GLOBAL(error_object)) = Z_OBJ(EX(This)); + Z_OBJ(SOAP_GLOBAL(error_object)) = Z_OBJ_P(ZEND_THIS); #define SOAP_SERVER_END_CODE() \ SOAP_GLOBAL(use_soap_error_handler) = _old_handler;\ @@ -96,7 +96,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const int _bailout = 0;\ SOAP_GLOBAL(use_soap_error_handler) = 1;\ SOAP_GLOBAL(error_code) = "Client";\ - Z_OBJ(SOAP_GLOBAL(error_object)) = Z_OBJ(EX(This));\ + Z_OBJ(SOAP_GLOBAL(error_object)) = Z_OBJ_P(ZEND_THIS);\ zend_try { #define SOAP_CLIENT_END_CODE() \ @@ -130,7 +130,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const #define FETCH_THIS_SDL(ss) \ { \ zval *__tmp; \ - if(FIND_SDL_PROPERTY(getThis(), __tmp) != NULL) { \ + if(FIND_SDL_PROPERTY(ZEND_THIS, __tmp) != NULL) { \ FETCH_SDL_RES(ss,__tmp); \ } else { \ ss = NULL; \ @@ -146,7 +146,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const #define FETCH_THIS_SERVICE(ss) \ { \ zval *tmp; \ - if ((tmp = zend_hash_str_find(Z_OBJPROP_P(getThis()),"service", sizeof("service")-1)) != NULL) { \ + if ((tmp = zend_hash_str_find(Z_OBJPROP_P(ZEND_THIS),"service", sizeof("service")-1)) != NULL) { \ ss = (soapServicePtr)zend_fetch_resource_ex(tmp, "service", le_service); \ } else { \ php_error_docref(NULL, E_WARNING, "Can not fetch service object"); \ @@ -550,9 +550,7 @@ static void php_soap_prepare_globals() } } /* Index everything by number */ - if (!zend_hash_index_exists(&defEncIndex, defaultEncoding[i].details.type)) { - zend_hash_index_update_ptr(&defEncIndex, defaultEncoding[i].details.type, (void*)enc); - } + zend_hash_index_add_ptr(&defEncIndex, defaultEncoding[i].details.type, (void*)enc); i++; } while (defaultEncoding[i].details.type != END_KNOWN_TYPES); @@ -643,7 +641,7 @@ PHP_MINIT_FUNCTION(soap) /* Register SoapClient class */ /* BIG NOTE : THIS EMITS AN COMPILATION WARNING UNDER ZE2 - handle_function_call deprecated. - soap_call_function_handler should be of type struct _zend_function, not (*handle_function_call). + soap_call_function_handler should be of type zend_function, not (*handle_function_call). */ { INIT_CLASS_ENTRY(ce, PHP_SOAP_CLIENT_CLASSNAME, soap_client_functions); @@ -804,7 +802,7 @@ PHP_METHOD(SoapParam, SoapParam) return; } - this_ptr = getThis(); + this_ptr = ZEND_THIS; add_property_stringl(this_ptr, "param_name", name, name_length); add_property_zval(this_ptr, "param_data", data); } @@ -833,7 +831,7 @@ PHP_METHOD(SoapHeader, SoapHeader) return; } - this_ptr = getThis(); + this_ptr = ZEND_THIS; add_property_stringl(this_ptr, "namespace", ns, ns_len); add_property_stringl(this_ptr, "name", name, name_len); if (data) { @@ -897,7 +895,7 @@ PHP_METHOD(SoapFault, SoapFault) name = NULL; } - this_ptr = getThis(); + this_ptr = ZEND_THIS; set_soap_fault(this_ptr, fault_code_ns, fault_code, fault_string, fault_actor, details, name); if (headerfault != NULL) { add_property_zval(this_ptr, "headerfault", headerfault); @@ -920,7 +918,7 @@ PHP_METHOD(SoapFault, __toString) return; } - this_ptr = getThis(); + this_ptr = ZEND_THIS; faultcode = zend_read_property(soap_fault_class_entry, this_ptr, "faultcode", sizeof("faultcode")-1, 1, &rv1); faultstring = zend_read_property(soap_fault_class_entry, this_ptr, "faultstring", sizeof("faultstring")-1, 1, &rv2); file = zend_read_property(soap_fault_class_entry, this_ptr, "file", sizeof("file")-1, 1, &rv3); @@ -928,7 +926,7 @@ PHP_METHOD(SoapFault, __toString) fci.size = sizeof(fci); ZVAL_STRINGL(&fci.function_name, "gettraceasstring", sizeof("gettraceasstring")-1); - fci.object = Z_OBJ(EX(This)); + fci.object = Z_OBJ_P(ZEND_THIS); fci.retval = &trace; fci.param_count = 0; fci.params = NULL; @@ -969,7 +967,7 @@ PHP_METHOD(SoapVar, SoapVar) return; } - this_ptr = getThis(); + this_ptr = ZEND_THIS; if (Z_TYPE_P(type) == IS_NULL) { add_property_long(this_ptr, "enc_type", UNKNOWN_TYPE); } else { @@ -1209,7 +1207,7 @@ PHP_METHOD(SoapServer, SoapServer) service->soap_functions.ft = zend_new_array(0); if (Z_TYPE_P(wsdl) != IS_NULL) { - service->sdl = get_sdl(getThis(), Z_STRVAL_P(wsdl), cache_wsdl); + service->sdl = get_sdl(ZEND_THIS, Z_STRVAL_P(wsdl), cache_wsdl); if (service->uri == NULL) { if (service->sdl->target_ns) { service->uri = estrdup(service->sdl->target_ns); @@ -1225,7 +1223,7 @@ PHP_METHOD(SoapServer, SoapServer) } res = zend_register_resource(service, le_service); - add_property_resource(getThis(), "service", res); + add_property_resource(ZEND_THIS, "service", res); SOAP_SERVER_END_CODE(); } @@ -1323,7 +1321,8 @@ PHP_METHOD(SoapServer, setObject) service->type = SOAP_OBJECT; - ZVAL_COPY(&service->soap_object, obj); + Z_ADDREF_P(obj); + ZVAL_OBJ(&service->soap_object, Z_OBJ_P(obj)); SOAP_SERVER_END_CODE(); } @@ -1486,7 +1485,7 @@ PHP_METHOD(SoapServer, handle) int soap_version, old_soap_version; sdlPtr old_sdl = NULL; soapServicePtr service; - xmlDocPtr doc_request=NULL, doc_return; + xmlDocPtr doc_request = NULL, doc_return = NULL; zval function_name, *params, *soap_obj, retval; char *fn_name, cont_len[30]; int num_params = 0, size, i, call_status = 0; @@ -1644,12 +1643,20 @@ PHP_METHOD(SoapServer, handle) old_features = SOAP_GLOBAL(features); SOAP_GLOBAL(features) = service->features; old_soap_version = SOAP_GLOBAL(soap_version); - function = deserialize_function_call(service->sdl, doc_request, service->actor, &function_name, &num_params, ¶ms, &soap_version, &soap_headers); + + zend_try { + function = deserialize_function_call(service->sdl, doc_request, service->actor, &function_name, &num_params, ¶ms, &soap_version, &soap_headers); + } zend_catch { + /* Avoid leaking persistent memory */ + xmlFreeDoc(doc_request); + zend_bailout(); + } zend_end_try(); + xmlFreeDoc(doc_request); if (EG(exception)) { php_output_discard(); - _soap_server_exception(service, function, getThis()); + _soap_server_exception(service, function, ZEND_THIS); goto fail; } @@ -1696,7 +1703,7 @@ PHP_METHOD(SoapServer, handle) } if (EG(exception)) { php_output_discard(); - _soap_server_exception(service, function, getThis()); + _soap_server_exception(service, function, ZEND_THIS); zval_ptr_dtor_str(&constructor); zval_ptr_dtor(&c_ret); zval_ptr_dtor(&tmp_soap); @@ -1719,7 +1726,7 @@ PHP_METHOD(SoapServer, handle) if (EG(exception)) { php_output_discard(); - _soap_server_exception(service, function, getThis()); + _soap_server_exception(service, function, ZEND_THIS); zval_ptr_dtor_str(&constructor); zval_ptr_dtor(&c_ret); efree(class_name); @@ -1761,8 +1768,6 @@ PHP_METHOD(SoapServer, handle) } } - doc_return = NULL; - /* Process soap headers */ if (soap_headers != NULL) { soapHeader *header = soap_headers; @@ -1806,7 +1811,7 @@ PHP_METHOD(SoapServer, handle) goto fail; } else if (EG(exception)) { php_output_discard(); - _soap_server_exception(service, function, getThis()); + _soap_server_exception(service, function, ZEND_THIS); efree(fn_name); if (service->type == SOAP_CLASS && soap_obj) {zval_ptr_dtor(soap_obj);} goto fail; @@ -1845,7 +1850,7 @@ PHP_METHOD(SoapServer, handle) if (EG(exception)) { php_output_discard(); - _soap_server_exception(service, function, getThis()); + _soap_server_exception(service, function, ZEND_THIS); if (service->type == SOAP_CLASS) { #if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) if (soap_obj && service->soap_class.persistence != SOAP_PERSISTENCE_SESSION) { @@ -1884,7 +1889,7 @@ PHP_METHOD(SoapServer, handle) if (EG(exception)) { php_output_discard(); - _soap_server_exception(service, function, getThis()); + _soap_server_exception(service, function, ZEND_THIS); if (service->type == SOAP_CLASS) { #if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) if (soap_obj && service->soap_class.persistence != SOAP_PERSISTENCE_SESSION) { @@ -1914,8 +1919,6 @@ PHP_METHOD(SoapServer, handle) sapi_add_header("Content-Type: text/xml; charset=utf-8", sizeof("Content-Type: text/xml; charset=utf-8")-1, 1); } - xmlFreeDoc(doc_return); - if (zend_ini_long("zlib.output_compression", sizeof("zlib.output_compression"), 0)) { sapi_add_header("Connection: close", sizeof("Connection: close")-1, 1); } else { @@ -1937,6 +1940,10 @@ fail: SOAP_GLOBAL(typemap) = old_typemap; SOAP_GLOBAL(features) = old_features; + if (doc_return) { + xmlFreeDoc(doc_return); + } + /* Free soap headers */ zval_ptr_dtor(&retval); while (soap_headers != NULL) { @@ -2025,7 +2032,8 @@ PHP_METHOD(SoapServer, addSoapHeader) *p = emalloc(sizeof(soapHeader)); memset(*p, 0, sizeof(soapHeader)); ZVAL_NULL(&(*p)->function_name); - ZVAL_COPY(&(*p)->retval, fault); + Z_ADDREF_P(fault); + ZVAL_OBJ(&(*p)->retval, Z_OBJ_P(fault)); SOAP_SERVER_END_CODE(); } @@ -2081,7 +2089,7 @@ static void soap_server_fault_ex(sdlFunctionPtr function, zval* fault, soapHeade } /* }}} */ -static void soap_server_fault(char* code, char* string, char *actor, zval* details, char* name) /* {{{ */ +static ZEND_NORETURN void soap_server_fault(char* code, char* string, char *actor, zval* details, char* name) /* {{{ */ { zval ret; @@ -2093,7 +2101,7 @@ static void soap_server_fault(char* code, char* string, char *actor, zval* detai } /* }}} */ -static void soap_error_handler(int error_num, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args) /* {{{ */ +static zend_never_inline ZEND_COLD void soap_real_error_handler(int error_num, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args) /* {{{ */ { zend_bool _old_in_compilation; zend_execute_data *_old_current_execute_data; @@ -2105,11 +2113,6 @@ static void soap_error_handler(int error_num, const char *error_filename, const _old_http_response_code = SG(sapi_headers).http_response_code; _old_http_status_line = SG(sapi_headers).http_status_line; - if (!PG(modules_activated) || !SOAP_GLOBAL(use_soap_error_handler) || !EG(objects_store).object_buckets) { - call_old_error_handler(error_num, error_filename, error_lineno, format, args); - return; - } - if (Z_OBJ(SOAP_GLOBAL(error_object)) && instanceof_function(Z_OBJCE(SOAP_GLOBAL(error_object)), soap_class_entry)) { zval *tmp; @@ -2230,6 +2233,16 @@ static void soap_error_handler(int error_num, const char *error_filename, const } /* }}} */ +static void soap_error_handler(int error_num, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args) /* {{{ */ +{ + if (EXPECTED(!SOAP_GLOBAL(use_soap_error_handler))) { + call_old_error_handler(error_num, error_filename, error_lineno, format, args); + } else { + soap_real_error_handler(error_num, error_filename, error_lineno, format, args); + } +} +/* }}} */ + /* {{{ proto use_soap_error_handler([bool $handler = TRUE]) */ PHP_FUNCTION(use_soap_error_handler) { @@ -2269,7 +2282,7 @@ PHP_METHOD(SoapClient, SoapClient) zend_long cache_wsdl; sdlPtr sdl = NULL; HashTable *typemap_ht = NULL; - zval *this_ptr = getThis(); + zval *this_ptr = ZEND_THIS; SOAP_CLIENT_BEGIN_CODE(); @@ -2599,6 +2612,7 @@ static void do_soap_call(zend_execute_data *execute_data, int old_features; HashTable *old_typemap, *typemap = NULL; smart_str action = {0}; + int bailout = 0; SOAP_CLIENT_BEGIN_CODE(); @@ -2765,7 +2779,7 @@ static void do_soap_call(zend_execute_data *execute_data, } } zend_catch { - _bailout = 1; + bailout = 1; } zend_end_try(); if (SOAP_GLOBAL(encoding) != NULL) { @@ -2777,12 +2791,11 @@ static void do_soap_call(zend_execute_data *execute_data, SOAP_GLOBAL(class_map) = old_class_map; SOAP_GLOBAL(encoding) = old_encoding; SOAP_GLOBAL(sdl) = old_sdl; - if (_bailout) { + if (bailout) { smart_str_free(&action); if (request) { xmlFreeDoc(request); } - _bailout = 0; zend_bailout(); } SOAP_CLIENT_END_CODE(); @@ -2802,7 +2815,7 @@ static void verify_soap_headers_array(HashTable *ht) /* {{{ */ } /* }}} */ -/* {{{ proto mixed SoapClient::__call(string function_name, array arguments [, array options [, array input_headers [, array output_headers]]]) +/* {{{ proto mixed SoapClient::__call(string function_name, array arguments [, array options [, array input_headers [, array &output_headers]]]) Calls a SOAP function */ PHP_METHOD(SoapClient, __call) { @@ -2821,7 +2834,7 @@ PHP_METHOD(SoapClient, __call) zend_bool free_soap_headers = 0; zval *this_ptr; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "sa|a!zz/", + if (zend_parse_parameters(ZEND_NUM_ARGS(), "sa|a!zz", &function, &function_len, &args, &options, &headers, &output_headers) == FAILURE) { return; } @@ -2861,7 +2874,7 @@ PHP_METHOD(SoapClient, __call) } /* Add default headers */ - this_ptr = getThis(); + this_ptr = ZEND_THIS; if ((tmp = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "__default_headers", sizeof("__default_headers")-1)) != NULL && Z_TYPE_P(tmp) == IS_ARRAY) { HashTable *default_headers = Z_ARRVAL_P(tmp); if (soap_headers) { @@ -2893,14 +2906,18 @@ PHP_METHOD(SoapClient, __call) } ZEND_HASH_FOREACH_END(); } if (output_headers) { - zval_ptr_dtor(output_headers); - array_init(output_headers); + output_headers = zend_try_array_init(output_headers); + if (!output_headers) { + goto cleanup; + } } + do_soap_call(execute_data, this_ptr, function, function_len, arg_count, real_args, return_value, location, soap_action, uri, soap_headers, output_headers); + +cleanup: if (arg_count > 0) { efree(real_args); } - if (soap_headers && free_soap_headers) { zend_hash_destroy(soap_headers); efree(soap_headers); @@ -2975,7 +2992,7 @@ PHP_METHOD(SoapClient, __getLastRequest) return; } - if ((tmp = zend_hash_str_find(Z_OBJPROP_P(getThis()), "__last_request", sizeof("__last_request")-1)) != NULL && + if ((tmp = zend_hash_str_find(Z_OBJPROP_P(ZEND_THIS), "__last_request", sizeof("__last_request")-1)) != NULL && Z_TYPE_P(tmp) == IS_STRING) { RETURN_STR_COPY(Z_STR_P(tmp)); } @@ -2994,7 +3011,7 @@ PHP_METHOD(SoapClient, __getLastResponse) return; } - if ((tmp = zend_hash_str_find(Z_OBJPROP_P(getThis()), "__last_response", sizeof("__last_response")-1)) != NULL && + if ((tmp = zend_hash_str_find(Z_OBJPROP_P(ZEND_THIS), "__last_response", sizeof("__last_response")-1)) != NULL && Z_TYPE_P(tmp) == IS_STRING) { RETURN_STR_COPY(Z_STR_P(tmp)); } @@ -3013,7 +3030,7 @@ PHP_METHOD(SoapClient, __getLastRequestHeaders) return; } - if ((tmp = zend_hash_str_find(Z_OBJPROP_P(getThis()), "__last_request_headers", sizeof("__last_request_headers")-1)) != NULL && + if ((tmp = zend_hash_str_find(Z_OBJPROP_P(ZEND_THIS), "__last_request_headers", sizeof("__last_request_headers")-1)) != NULL && Z_TYPE_P(tmp) == IS_STRING) { RETURN_STR_COPY(Z_STR_P(tmp)); } @@ -3032,7 +3049,7 @@ PHP_METHOD(SoapClient, __getLastResponseHeaders) return; } - if ((tmp = zend_hash_str_find(Z_OBJPROP_P(getThis()), "__last_response_headers", sizeof("__last_response_headers")-1)) != NULL && + if ((tmp = zend_hash_str_find(Z_OBJPROP_P(ZEND_THIS), "__last_response_headers", sizeof("__last_response_headers")-1)) != NULL && Z_TYPE_P(tmp) == IS_STRING) { RETURN_STR_COPY(Z_STR_P(tmp)); } @@ -3050,7 +3067,7 @@ PHP_METHOD(SoapClient, __doRequest) size_t location_size, action_size; zend_long version; zend_long one_way = 0; - zval *this_ptr = getThis(); + zval *this_ptr = ZEND_THIS; if (zend_parse_parameters(ZEND_NUM_ARGS(), "Sssl|l", &buf, @@ -3084,7 +3101,7 @@ PHP_METHOD(SoapClient, __setCookie) char *val = NULL; size_t name_len, val_len = 0; zval *cookies; - zval *this_ptr = getThis(); + zval *this_ptr = ZEND_THIS; if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|s", &name, &name_len, &val, &val_len) == FAILURE) { return; @@ -3124,7 +3141,7 @@ PHP_METHOD(SoapClient, __getCookies) } - if ((cookies = zend_hash_str_find(Z_OBJPROP_P(getThis()), "_cookies", sizeof("_cookies")-1)) != NULL && + if ((cookies = zend_hash_str_find(Z_OBJPROP_P(ZEND_THIS), "_cookies", sizeof("_cookies")-1)) != NULL && Z_TYPE_P(cookies) == IS_ARRAY) { RETURN_ARR(zend_array_dup(Z_ARRVAL_P(cookies))); } else { @@ -3140,7 +3157,7 @@ PHP_METHOD(SoapClient, __getCookies) PHP_METHOD(SoapClient, __setSoapHeaders) { zval *headers = NULL; - zval *this_ptr = getThis(); + zval *this_ptr = ZEND_THIS; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|z", &headers) == FAILURE) { return; @@ -3178,7 +3195,7 @@ PHP_METHOD(SoapClient, __setLocation) char *location = NULL; size_t location_len = 0; zval *tmp; - zval *this_ptr = getThis(); + zval *this_ptr = ZEND_THIS; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &location, &location_len) == FAILURE) { return; @@ -3398,37 +3415,43 @@ static sdlFunctionPtr find_function(sdlPtr sdl, xmlNodePtr func, zval* function_ } /* }}} */ -static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, char* actor, zval *function_name, int *num_params, zval **parameters, int *version, soapHeader **headers) /* {{{ */ -{ - char* envelope_ns = NULL; - xmlNodePtr trav,env,head,body,func; - xmlAttrPtr attr; - sdlFunctionPtr function; - - encode_reset_ns(); - - /* Get <Envelope> element */ - env = NULL; - trav = request->children; +static xmlNodePtr get_envelope(xmlNodePtr trav, int *version, char **envelope_ns) { while (trav != NULL) { if (trav->type == XML_ELEMENT_NODE) { - if (env == NULL && node_is_equal_ex(trav,"Envelope",SOAP_1_1_ENV_NAMESPACE)) { - env = trav; + if (node_is_equal_ex(trav,"Envelope",SOAP_1_1_ENV_NAMESPACE)) { *version = SOAP_1_1; - envelope_ns = SOAP_1_1_ENV_NAMESPACE; + *envelope_ns = SOAP_1_1_ENV_NAMESPACE; SOAP_GLOBAL(soap_version) = SOAP_1_1; - } else if (env == NULL && node_is_equal_ex(trav,"Envelope",SOAP_1_2_ENV_NAMESPACE)) { - env = trav; + return trav; + } + + if (node_is_equal_ex(trav,"Envelope",SOAP_1_2_ENV_NAMESPACE)) { *version = SOAP_1_2; - envelope_ns = SOAP_1_2_ENV_NAMESPACE; + *envelope_ns = SOAP_1_2_ENV_NAMESPACE; SOAP_GLOBAL(soap_version) = SOAP_1_2; - } else { - soap_server_fault("VersionMismatch", "Wrong Version", NULL, NULL, NULL); + return trav; } + + soap_server_fault("VersionMismatch", "Wrong Version", NULL, NULL, NULL); } trav = trav->next; } - if (env == NULL) { + + return NULL; +} + +static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, char* actor, zval *function_name, int *num_params, zval **parameters, int *version, soapHeader **headers) /* {{{ */ +{ + char* envelope_ns = NULL; + xmlNodePtr trav,env,head,body,func; + xmlAttrPtr attr; + sdlFunctionPtr function; + + encode_reset_ns(); + + /* Get <Envelope> element */ + env = get_envelope(request->children, version, &envelope_ns); + if (!env) { soap_server_fault("Client", "looks like we got XML without \"Envelope\" element", NULL, NULL, NULL); } @@ -3811,6 +3834,8 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function encode_reset_ns(); doc = xmlNewDoc(BAD_CAST("1.0")); + zend_try { + doc->charset = XML_CHAR_ENCODING_UTF8; doc->encoding = xmlCharStrdup("UTF-8"); @@ -4060,7 +4085,8 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function int hdr_use = SOAP_LITERAL; zval *hdr_ret = &h->retval; char *hdr_ns = h->hdr?h->hdr->ns:NULL; - char *hdr_name = Z_STRVAL(h->function_name); + char *hdr_name = Z_TYPE(h->function_name) == IS_STRING + ? Z_STRVAL(h->function_name) : NULL; HashTable *ht = NULL; if (Z_TYPE(h->retval) == IS_OBJECT && @@ -4151,6 +4177,12 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function encode_finish(); + } zend_catch { + /* Avoid persistent memory leak. */ + xmlFreeDoc(doc); + zend_bailout(); + } zend_end_try(); + if (function && function->responseName == NULL && body->children == NULL && head == NULL) { xmlFreeDoc(doc); @@ -4172,6 +4204,8 @@ static xmlDocPtr serialize_function_call(zval *this_ptr, sdlFunctionPtr function encode_reset_ns(); doc = xmlNewDoc(BAD_CAST("1.0")); + zend_try { + doc->encoding = xmlCharStrdup("UTF-8"); doc->charset = XML_CHAR_ENCODING_UTF8; if (version == SOAP_1_1) { @@ -4211,7 +4245,7 @@ static xmlDocPtr serialize_function_call(zval *this_ptr, sdlFunctionPtr function } } else { if ((zstyle = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "style", sizeof("style")-1)) != NULL && - Z_TYPE_P(zstyle) == IS_LONG) { + Z_TYPE_P(zstyle) == IS_LONG) { style = Z_LVAL_P(zstyle); } else { style = SOAP_RPC; @@ -4234,7 +4268,7 @@ static xmlDocPtr serialize_function_call(zval *this_ptr, sdlFunctionPtr function } if ((zuse = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "use", sizeof("use")-1)) != NULL && - Z_TYPE_P(zuse) == IS_LONG && Z_LVAL_P(zuse) == SOAP_LITERAL) { + Z_TYPE_P(zuse) == IS_LONG && Z_LVAL_P(zuse) == SOAP_LITERAL) { use = SOAP_LITERAL; } else { use = SOAP_ENCODED; @@ -4296,9 +4330,9 @@ static xmlDocPtr serialize_function_call(zval *this_ptr, sdlFunctionPtr function ht = Z_OBJPROP_P(header); if ((name = zend_hash_str_find(ht, "name", sizeof("name")-1)) != NULL && - Z_TYPE_P(name) == IS_STRING && - (ns = zend_hash_str_find(ht, "namespace", sizeof("namespace")-1)) != NULL && - Z_TYPE_P(ns) == IS_STRING) { + Z_TYPE_P(name) == IS_STRING && + (ns = zend_hash_str_find(ht, "namespace", sizeof("namespace")-1)) != NULL && + Z_TYPE_P(ns) == IS_STRING) { xmlNodePtr h; xmlNsPtr nsptr; int hdr_use = SOAP_LITERAL; @@ -4351,6 +4385,12 @@ static xmlDocPtr serialize_function_call(zval *this_ptr, sdlFunctionPtr function encode_finish(); + } zend_catch { + /* Avoid persistent memory leak. */ + xmlFreeDoc(doc); + zend_bailout(); + } zend_end_try(); + return doc; } /* }}} */ @@ -4861,14 +4901,3 @@ static void delete_hashtable(void *data) /* {{{ */ efree(ht); } /* }}} */ - - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * vim600: sw=4 ts=4 fdm=marker - * vim<600: sw=4 ts=4 - */ diff --git a/ext/soap/tests/any.phpt b/ext/soap/tests/any.phpt index 7c0b7ff252..d84443b06f 100644 --- a/ext/soap/tests/any.phpt +++ b/ext/soap/tests/any.phpt @@ -44,7 +44,7 @@ class TestSoapClient extends SoapClient { } } -$client = new TestSoapClient(dirname(__FILE__)."/interop/Round4/GroupI/round4_groupI_xsd.wsdl", +$client = new TestSoapClient(__DIR__."/interop/Round4/GroupI/round4_groupI_xsd.wsdl", array("trace"=>1,"exceptions"=>0, 'classmap' => array('SOAPComplexType'=>'SOAPComplexType'))); $ret = $client->echoAnyElement( diff --git a/ext/soap/tests/bug48557.phpt b/ext/soap/tests/bug48557.phpt index f9a68304b8..aa20c14610 100644 --- a/ext/soap/tests/bug48557.phpt +++ b/ext/soap/tests/bug48557.phpt @@ -12,7 +12,7 @@ function test($map) { var_dump($map, $map[1], $map[2]);die; } -$y = new SoapServer(dirname(__FILE__) . '/bug48557.wsdl'); +$y = new SoapServer(__DIR__ . '/bug48557.wsdl'); $y->addfunction("test"); $request = <<<XML <?xml version="1.0"?> @@ -54,7 +54,7 @@ $y->handle($request); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(6) { [1]=> int(123) diff --git a/ext/soap/tests/bug73037.phpt b/ext/soap/tests/bug73037.phpt index 4ceb694aea..897aec89d0 100644 --- a/ext/soap/tests/bug73037.phpt +++ b/ext/soap/tests/bug73037.phpt @@ -1,5 +1,7 @@ --TEST-- Bug #73037 SoapServer reports Bad Request when gzipped, var 0 +--CONFLICTS-- +server --SKIPIF-- <?php require_once('skipif.inc'); @@ -7,14 +9,14 @@ Bug #73037 SoapServer reports Bad Request when gzipped, var 0 echo "skip zlib is required for this test"; } - if (!file_exists(dirname(__FILE__) . "/../../../sapi/cli/tests/php_cli_server.inc")) { + if (!file_exists(__DIR__ . "/../../../sapi/cli/tests/php_cli_server.inc")) { echo "skip sapi/cli/tests/php_cli_server.inc required but not found"; } ?> --FILE-- <?php -include dirname(__FILE__) . "/../../../sapi/cli/tests/php_cli_server.inc"; +include __DIR__ . "/../../../sapi/cli/tests/php_cli_server.inc"; function get_data($max) { @@ -61,7 +63,8 @@ function get_data($max) } $router = "bug73037_server.php"; -$args = substr(PHP_OS, 0, 3) == 'WIN' ? "-d extension_dir=" . ini_get("extension_dir") . " -d extension=php_soap.dll" : ""; +$args = substr(PHP_OS, 0, 3) == 'WIN' + ? ["-d", "extension_dir=" . ini_get("extension_dir"), "-d", "extension=php_soap.dll"] : []; $code = <<<'PHP' $s = new SoapServer(NULL, array('uri' => 'http://here')); $s->setObject(new stdclass()); @@ -132,7 +135,7 @@ cleanup: ==DONE== --CLEAN-- <?php -unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug73037_server.php"); +unlink(__DIR__ . DIRECTORY_SEPARATOR . "bug73037_server.php"); ?> --EXPECT-- Iteration 0 diff --git a/ext/soap/tests/bugs/bug27722.phpt b/ext/soap/tests/bugs/bug27722.phpt index 3619fb12a3..847c09286c 100644 --- a/ext/soap/tests/bugs/bug27722.phpt +++ b/ext/soap/tests/bugs/bug27722.phpt @@ -8,7 +8,7 @@ wsdl soap.wsdl_cache_enabled=0 --FILE-- <?php -$x = new SoapClient(dirname(__FILE__)."/bug27722.wsdl"); +$x = new SoapClient(__DIR__."/bug27722.wsdl"); echo "ok\n"; ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug27742.phpt b/ext/soap/tests/bugs/bug27742.phpt index 5d9636fdf5..adc4fe582e 100644 --- a/ext/soap/tests/bugs/bug27742.phpt +++ b/ext/soap/tests/bugs/bug27742.phpt @@ -8,7 +8,7 @@ wsdl soap.wsdl_cache_enabled=0 --FILE-- <?php -$x = new SoapClient(dirname(__FILE__)."/bug27742.wsdl"); +$x = new SoapClient(__DIR__."/bug27742.wsdl"); echo "ok\n"; ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug28985.phpt b/ext/soap/tests/bugs/bug28985.phpt index 73ff899c39..0c3f1432aa 100644 --- a/ext/soap/tests/bugs/bug28985.phpt +++ b/ext/soap/tests/bugs/bug28985.phpt @@ -6,7 +6,7 @@ Bug #28985 (__getTypes() returning nothing on complex WSDL) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SOAPClient(dirname(__FILE__).'/bug28985.wsdl', array('trace'=>1)); +$client = new SOAPClient(__DIR__.'/bug28985.wsdl', array('trace'=>1)); var_dump($client->__getTypes()); ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug29061.phpt b/ext/soap/tests/bugs/bug29061.phpt index 42e4ed517b..7cefe44995 100644 --- a/ext/soap/tests/bugs/bug29061.phpt +++ b/ext/soap/tests/bugs/bug29061.phpt @@ -6,7 +6,7 @@ Bug #29061 (soap extension segfaults) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/bug29061.wsdl", array("exceptions"=>0)); +$client = new SoapClient(__DIR__."/bug29061.wsdl", array("exceptions"=>0)); $client->getQuote("ibm"); echo "ok\n"; ?> diff --git a/ext/soap/tests/bugs/bug29109.phpt b/ext/soap/tests/bugs/bug29109.phpt index acbc7d4cd1..969783ca29 100644 --- a/ext/soap/tests/bugs/bug29109.phpt +++ b/ext/soap/tests/bugs/bug29109.phpt @@ -6,7 +6,7 @@ Bug #29109 (Uncaught SoapFault exception: [WSDL] Out of memory) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/bug29109.wsdl"); +$client = new SoapClient(__DIR__."/bug29109.wsdl"); var_dump($client->__getFunctions()); ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug29236.phpt b/ext/soap/tests/bugs/bug29236.phpt index 659a8293db..f1d7b0e10f 100644 --- a/ext/soap/tests/bugs/bug29236.phpt +++ b/ext/soap/tests/bugs/bug29236.phpt @@ -6,7 +6,7 @@ Bug #29236 (memory error when wsdl-cache is enabled) soap.wsdl_cache_enabled=1 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/bug29236.wsdl"); +$client = new SoapClient(__DIR__."/bug29236.wsdl"); var_dump($client->__getFunctions()); ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug29795.phpt b/ext/soap/tests/bugs/bug29795.phpt index 388caa60b6..fce064ef43 100644 --- a/ext/soap/tests/bugs/bug29795.phpt +++ b/ext/soap/tests/bugs/bug29795.phpt @@ -23,10 +23,10 @@ EOF; } -$client = new LocalSoapClient(dirname(__FILE__)."/bug29795.wsdl",array("trace"=>1)); +$client = new LocalSoapClient(__DIR__."/bug29795.wsdl",array("trace"=>1)); $ar=$client->GetPrice(); echo "o"; -$client = new LocalSoapClient(dirname(__FILE__)."/bug29795.wsdl",array("trace"=>1)); +$client = new LocalSoapClient(__DIR__."/bug29795.wsdl",array("trace"=>1)); $ar=$client->GetPrice(); echo "k\n"; ?> diff --git a/ext/soap/tests/bugs/bug29839.phpt b/ext/soap/tests/bugs/bug29839.phpt index 8bead388fa..3d2bcfbfc2 100644 --- a/ext/soap/tests/bugs/bug29839.phpt +++ b/ext/soap/tests/bugs/bug29839.phpt @@ -29,7 +29,7 @@ class LocalSoapClient extends SoapClient { } -$client = new LocalSoapClient(dirname(__FILE__)."/bug29839.wsdl", array("trace"=>1)); +$client = new LocalSoapClient(__DIR__."/bug29839.wsdl", array("trace"=>1)); $client->EchoString(array("value"=>"hello","lang"=>"en")); echo $client->__getLastRequest(); echo $client->__getLastResponse(); diff --git a/ext/soap/tests/bugs/bug29844.phpt b/ext/soap/tests/bugs/bug29844.phpt index 26f1151a93..3e86c26840 100644 --- a/ext/soap/tests/bugs/bug29844.phpt +++ b/ext/soap/tests/bugs/bug29844.phpt @@ -31,7 +31,7 @@ class LocalSoapClient extends SoapClient { } -$client = new LocalSoapClient(dirname(__FILE__)."/bug29844.wsdl", array("trace"=>1)); +$client = new LocalSoapClient(__DIR__."/bug29844.wsdl", array("trace"=>1)); var_dump($client->hello('davey')); ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug30106.phpt b/ext/soap/tests/bugs/bug30106.phpt index 3444812623..b02b1bded2 100644 --- a/ext/soap/tests/bugs/bug30106.phpt +++ b/ext/soap/tests/bugs/bug30106.phpt @@ -30,7 +30,7 @@ class LocalSoapClient extends SoapClient { } } -$client = new LocalSoapClient(dirname(__FILE__)."/bug30106.wsdl"); +$client = new LocalSoapClient(__DIR__."/bug30106.wsdl"); var_dump($client->__getFunctions()); var_dump($client->__getTypes()); $x = $client->getContinentList(array("AFFILIATE_ID"=>1,"PASSWORD"=>"x")); diff --git a/ext/soap/tests/bugs/bug30175.phpt b/ext/soap/tests/bugs/bug30175.phpt index 8d721ea69d..9af18bc34d 100644 --- a/ext/soap/tests/bugs/bug30175.phpt +++ b/ext/soap/tests/bugs/bug30175.phpt @@ -33,7 +33,7 @@ EOF; } -$client = new LocalSoapClient(dirname(__FILE__)."/bug30175.wsdl"); +$client = new LocalSoapClient(__DIR__."/bug30175.wsdl"); var_dump($client->qwebGetHostInfo()); ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug30928.phpt b/ext/soap/tests/bugs/bug30928.phpt index e1fe17a359..ace71764f9 100644 --- a/ext/soap/tests/bugs/bug30928.phpt +++ b/ext/soap/tests/bugs/bug30928.phpt @@ -33,11 +33,11 @@ class LocalSoapClient extends SoapClient { } } -$x = new LocalSoapClient(dirname(__FILE__)."/bug30928.wsdl", +$x = new LocalSoapClient(__DIR__."/bug30928.wsdl", array()); var_dump($x->test(new foo())); -$x = new LocalSoapClient(dirname(__FILE__)."/bug30928.wsdl", +$x = new LocalSoapClient(__DIR__."/bug30928.wsdl", array("classmap" => array('testType'=>'foo'))); var_dump($x->test(new foo())); diff --git a/ext/soap/tests/bugs/bug30994.phpt b/ext/soap/tests/bugs/bug30994.phpt index 28e3b923cd..afd5018a38 100644 --- a/ext/soap/tests/bugs/bug30994.phpt +++ b/ext/soap/tests/bugs/bug30994.phpt @@ -20,16 +20,16 @@ soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> <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> - + <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> EOF; diff --git a/ext/soap/tests/bugs/bug31695.phpt b/ext/soap/tests/bugs/bug31695.phpt index 6d3fae0d25..708d489a0d 100644 --- a/ext/soap/tests/bugs/bug31695.phpt +++ b/ext/soap/tests/bugs/bug31695.phpt @@ -27,9 +27,9 @@ class LocalSoapClient extends SoapClient { } } -$client = new LocalSoapClient(dirname(__FILE__)."/bug31695.wsdl"); +$client = new LocalSoapClient(__DIR__."/bug31695.wsdl"); $client->Test("str"); -$client = new LocalSoapClient(dirname(__FILE__)."/bug31695.wsdl", array("location"=>"test://1")); +$client = new LocalSoapClient(__DIR__."/bug31695.wsdl", array("location"=>"test://1")); $client->Test("str"); $client->__soapCall("Test", array("arg1"), diff --git a/ext/soap/tests/bugs/bug32776.phpt b/ext/soap/tests/bugs/bug32776.phpt index ae863bd339..316b0e15ed 100644 --- a/ext/soap/tests/bugs/bug32776.phpt +++ b/ext/soap/tests/bugs/bug32776.phpt @@ -32,7 +32,7 @@ class LocalSoapClient extends SoapClient { } -$x = new LocalSoapClient(dirname(__FILE__)."/bug32776.wsdl",array("trace"=>true,"exceptions"=>false)); +$x = new LocalSoapClient(__DIR__."/bug32776.wsdl",array("trace"=>true,"exceptions"=>false)); var_dump($x->test("Hello")); var_dump($d); var_dump($x->__getLastRequest()); diff --git a/ext/soap/tests/bugs/bug32941.phpt b/ext/soap/tests/bugs/bug32941.phpt index d1e3fff85d..cbab7008d7 100644 --- a/ext/soap/tests/bugs/bug32941.phpt +++ b/ext/soap/tests/bugs/bug32941.phpt @@ -31,9 +31,9 @@ EOF; } ini_set("soap.wsdl_cache_enabled", 1); -$client = new TestSoapClient(dirname(__FILE__).'/bug32941.wsdl', array("trace" => 1, 'exceptions' => 0)); +$client = new TestSoapClient(__DIR__.'/bug32941.wsdl', array("trace" => 1, 'exceptions' => 0)); $ahoj = $client->echoString('exception'); -$client = new TestSoapClient(dirname(__FILE__).'/bug32941.wsdl', array("trace" => 1, 'exceptions' => 0)); +$client = new TestSoapClient(__DIR__.'/bug32941.wsdl', array("trace" => 1, 'exceptions' => 0)); $ahoj = $client->echoString('exception'); echo "ok\n"; ?> diff --git a/ext/soap/tests/bugs/bug32941.wsdl b/ext/soap/tests/bugs/bug32941.wsdl index 3e91a75c6a..3e91a75c6a 100755..100644 --- a/ext/soap/tests/bugs/bug32941.wsdl +++ b/ext/soap/tests/bugs/bug32941.wsdl diff --git a/ext/soap/tests/bugs/bug34453.phpt b/ext/soap/tests/bugs/bug34453.phpt index 0a9dd80179..cdaadd5c73 100644 --- a/ext/soap/tests/bugs/bug34453.phpt +++ b/ext/soap/tests/bugs/bug34453.phpt @@ -29,7 +29,7 @@ class LocalSoapClient extends SoapClient { } -$client = new LocalSoapClient(dirname(__FILE__)."/bug34453.wsdl", array("trace"=>1)); +$client = new LocalSoapClient(__DIR__."/bug34453.wsdl", array("trace"=>1)); $client->EchoString(array("value"=>"hello","lang"=>"en")); echo $client->__getLastRequest(); echo $client->__getLastResponse(); diff --git a/ext/soap/tests/bugs/bug34453.wsdl b/ext/soap/tests/bugs/bug34453.wsdl index 6b5ca48fe8..6b5ca48fe8 100755..100644 --- a/ext/soap/tests/bugs/bug34453.wsdl +++ b/ext/soap/tests/bugs/bug34453.wsdl diff --git a/ext/soap/tests/bugs/bug34643.phpt b/ext/soap/tests/bugs/bug34643.phpt index b99565129c..7430b34474 100644 --- a/ext/soap/tests/bugs/bug34643.phpt +++ b/ext/soap/tests/bugs/bug34643.phpt @@ -32,7 +32,7 @@ class LocalSoapClient extends SoapClient { } -$cl = new LocalSoapClient(dirname(__FILE__).'/bug34643.wsdl', array("trace"=>1)); +$cl = new LocalSoapClient(__DIR__.'/bug34643.wsdl', array("trace"=>1)); print_r($cl->__getFunctions()); echo $cl->get_it("aaa")."\n"; echo $cl->get_it()."\n"; diff --git a/ext/soap/tests/bugs/bug34643.wsdl b/ext/soap/tests/bugs/bug34643.wsdl index 304681509f..304681509f 100755..100644 --- a/ext/soap/tests/bugs/bug34643.wsdl +++ b/ext/soap/tests/bugs/bug34643.wsdl diff --git a/ext/soap/tests/bugs/bug35142.phpt b/ext/soap/tests/bugs/bug35142.phpt index 2e523030a9..f10885767c 100644 --- a/ext/soap/tests/bugs/bug35142.phpt +++ b/ext/soap/tests/bugs/bug35142.phpt @@ -8,7 +8,7 @@ soap.wsdl_cache_enabled=0 <?php ini_set("soap.wsdl_cache_enabled",0); $timestamp = "2005-11-08T11:22:07+03:00"; -$wsdl = dirname(__FILE__)."/bug35142.wsdl"; +$wsdl = __DIR__."/bug35142.wsdl"; function PostEvents($x) { var_dump($x); diff --git a/ext/soap/tests/bugs/bug35142.wsdl b/ext/soap/tests/bugs/bug35142.wsdl index bdb62bd8e4..bdb62bd8e4 100755..100644 --- a/ext/soap/tests/bugs/bug35142.wsdl +++ b/ext/soap/tests/bugs/bug35142.wsdl diff --git a/ext/soap/tests/bugs/bug35273.phpt b/ext/soap/tests/bugs/bug35273.phpt index e22ebd7dca..f04dc68646 100644 --- a/ext/soap/tests/bugs/bug35273.phpt +++ b/ext/soap/tests/bugs/bug35273.phpt @@ -14,7 +14,7 @@ class TestSoapClient extends SoapClient { } ini_set("soap.wsdl_cache_enabled", 0); -$client = new TestSoapClient(dirname(__FILE__).'/bug32941.wsdl', array("trace" => 1, 'exceptions' => 0)); +$client = new TestSoapClient(__DIR__.'/bug32941.wsdl', array("trace" => 1, 'exceptions' => 0)); $ahoj = $client->echoPerson(array("name"=>"Name","surname"=>"Surname")); echo "ok\n"; ?> diff --git a/ext/soap/tests/bugs/bug36226-2.phpt b/ext/soap/tests/bugs/bug36226-2.phpt index e14832db4b..bc9b05a856 100644 --- a/ext/soap/tests/bugs/bug36226-2.phpt +++ b/ext/soap/tests/bugs/bug36226-2.phpt @@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $timestamp = "2005-11-08T11:22:07+03:00"; -$wsdl = dirname(__FILE__)."/bug36226-2.wsdl"; +$wsdl = __DIR__."/bug36226-2.wsdl"; function PostEvents($x) { var_dump($x); diff --git a/ext/soap/tests/bugs/bug36226-2.wsdl b/ext/soap/tests/bugs/bug36226-2.wsdl index 327022d192..327022d192 100755..100644 --- a/ext/soap/tests/bugs/bug36226-2.wsdl +++ b/ext/soap/tests/bugs/bug36226-2.wsdl diff --git a/ext/soap/tests/bugs/bug36226.phpt b/ext/soap/tests/bugs/bug36226.phpt index 1e398c0c2c..a54b687f95 100644 --- a/ext/soap/tests/bugs/bug36226.phpt +++ b/ext/soap/tests/bugs/bug36226.phpt @@ -8,7 +8,7 @@ soap.wsdl_cache_enabled=0 <?php ini_set("soap.wsdl_cache_enabled",0); $timestamp = "2005-11-08T11:22:07+03:00"; -$wsdl = dirname(__FILE__)."/bug35142.wsdl"; +$wsdl = __DIR__."/bug35142.wsdl"; function PostEvents($x) { var_dump($x); diff --git a/ext/soap/tests/bugs/bug36575.phpt b/ext/soap/tests/bugs/bug36575.phpt index 9bf5415220..8e5f469546 100644 --- a/ext/soap/tests/bugs/bug36575.phpt +++ b/ext/soap/tests/bugs/bug36575.phpt @@ -29,7 +29,7 @@ function test( $a1 ) { $classMap = array("A1" => "CT_A1", "A2" => "CT_A2", "A3" => "CT_A3"); -$client = new SoapClient(dirname(__FILE__)."/bug36575.wsdl", array("trace" => 1, "exceptions" => 0, "classmap" => $classMap)); +$client = new SoapClient(__DIR__."/bug36575.wsdl", array("trace" => 1, "exceptions" => 0, "classmap" => $classMap)); $a2 = new CT_A2(); $a2->var1 = "one"; $a2->var2 = "two"; @@ -39,7 +39,7 @@ $soapRequest = $client->__getLastRequest(); echo $soapRequest; -$server = new SoapServer(dirname(__FILE__)."/bug36575.wsdl", array("classmap" => $classMap)); +$server = new SoapServer(__DIR__."/bug36575.wsdl", array("classmap" => $classMap)); $server->addFunction("test"); $server->handle($soapRequest); echo "ok\n"; diff --git a/ext/soap/tests/bugs/bug36575.wsdl b/ext/soap/tests/bugs/bug36575.wsdl index 1396eb1966..1396eb1966 100755..100644 --- a/ext/soap/tests/bugs/bug36575.wsdl +++ b/ext/soap/tests/bugs/bug36575.wsdl diff --git a/ext/soap/tests/bugs/bug36614.phpt b/ext/soap/tests/bugs/bug36614.phpt index ba6734812d..86d312dfe4 100644 --- a/ext/soap/tests/bugs/bug36614.phpt +++ b/ext/soap/tests/bugs/bug36614.phpt @@ -6,7 +6,7 @@ Bug #36614 (Segfault when using Soap) soap.wsdl_cache_enabled=0 --FILE-- <?php -$lo_soap = new SoapClient(dirname(__FILE__)."/bug36614.wsdl"); +$lo_soap = new SoapClient(__DIR__."/bug36614.wsdl"); echo "ok\n"; ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug36614.wsdl b/ext/soap/tests/bugs/bug36614.wsdl index ecf1b1b2fe..ecf1b1b2fe 100755..100644 --- a/ext/soap/tests/bugs/bug36614.wsdl +++ b/ext/soap/tests/bugs/bug36614.wsdl diff --git a/ext/soap/tests/bugs/bug36908.phpt b/ext/soap/tests/bugs/bug36908.phpt index 2d2a46410c..cc3f75847d 100644 --- a/ext/soap/tests/bugs/bug36908.phpt +++ b/ext/soap/tests/bugs/bug36908.phpt @@ -37,7 +37,7 @@ xsi:type="xsd:long">9</multiRef> </soapenv:Body> </soapenv:Envelope>'; ini_set('soap.wsdl_cache_enabled', false); -$server = new SoapServer(dirname(__FILE__)."/bug36908.wsdl"); +$server = new SoapServer(__DIR__."/bug36908.wsdl"); $server->setClass("PublisherService"); $server->handle($input); ?> diff --git a/ext/soap/tests/bugs/bug36908.wsdl b/ext/soap/tests/bugs/bug36908.wsdl index 6889df3aaa..6889df3aaa 100755..100644 --- a/ext/soap/tests/bugs/bug36908.wsdl +++ b/ext/soap/tests/bugs/bug36908.wsdl diff --git a/ext/soap/tests/bugs/bug36999.phpt b/ext/soap/tests/bugs/bug36999.phpt index eed02ecf0b..443e90418f 100644 --- a/ext/soap/tests/bugs/bug36999.phpt +++ b/ext/soap/tests/bugs/bug36999.phpt @@ -31,7 +31,7 @@ class LocalSoapClient extends SoapClient { } -$soap = new LocalSoapClient(dirname(__FILE__)."/bug36999.wsdl"); +$soap = new LocalSoapClient(__DIR__."/bug36999.wsdl"); function test($num) { global $soap; diff --git a/ext/soap/tests/bugs/bug36999.wsdl b/ext/soap/tests/bugs/bug36999.wsdl index 80d20b053b..80d20b053b 100755..100644 --- a/ext/soap/tests/bugs/bug36999.wsdl +++ b/ext/soap/tests/bugs/bug36999.wsdl diff --git a/ext/soap/tests/bugs/bug37013.phpt b/ext/soap/tests/bugs/bug37013.phpt index 7c0546ba2d..492242d7d5 100644 --- a/ext/soap/tests/bugs/bug37013.phpt +++ b/ext/soap/tests/bugs/bug37013.phpt @@ -49,7 +49,7 @@ class MultiRefTest { } -$server = new SoapServer(dirname(__FILE__)."/bug37013.wsdl"); +$server = new SoapServer(__DIR__."/bug37013.wsdl"); $server->setClass( "MultiRefTest"); $server->handle( $request ); ?> diff --git a/ext/soap/tests/bugs/bug37013.wsdl b/ext/soap/tests/bugs/bug37013.wsdl index aae7604233..aae7604233 100755..100644 --- a/ext/soap/tests/bugs/bug37013.wsdl +++ b/ext/soap/tests/bugs/bug37013.wsdl diff --git a/ext/soap/tests/bugs/bug37083.phpt b/ext/soap/tests/bugs/bug37083.phpt index d915ec0440..cfd698e4be 100644 --- a/ext/soap/tests/bugs/bug37083.phpt +++ b/ext/soap/tests/bugs/bug37083.phpt @@ -41,7 +41,7 @@ EOF; } } for ($i = 0; $i < 10; $i++) { - $ws=new TestSoapClient(dirname(__FILE__).'/bug37083.wsdl', + $ws=new TestSoapClient(__DIR__.'/bug37083.wsdl', array('encoding'=>'ISO-8859-1', 'cache_wsdl'=>WSDL_CACHE_BOTH)); $search=new stdClass(); diff --git a/ext/soap/tests/bugs/bug37083.wsdl b/ext/soap/tests/bugs/bug37083.wsdl index f7df3bea78..f7df3bea78 100755..100644 --- a/ext/soap/tests/bugs/bug37083.wsdl +++ b/ext/soap/tests/bugs/bug37083.wsdl diff --git a/ext/soap/tests/bugs/bug38004.phpt b/ext/soap/tests/bugs/bug38004.phpt index fea4f0379a..43d3e86d02 100644 --- a/ext/soap/tests/bugs/bug38004.phpt +++ b/ext/soap/tests/bugs/bug38004.phpt @@ -28,7 +28,7 @@ class TestSoapClient extends SoapClient { } } -$client = new TestSoapClient(dirname(__FILE__).'/bug38004.wsdl'); +$client = new TestSoapClient(__DIR__.'/bug38004.wsdl'); $strA = 'test & test'; $strB = 'test & test'; $res = $client->Test(array('strA'=>$strA, 'strB'=>$strB)); diff --git a/ext/soap/tests/bugs/bug38004.wsdl b/ext/soap/tests/bugs/bug38004.wsdl index 34c03d819d..34c03d819d 100755..100644 --- a/ext/soap/tests/bugs/bug38004.wsdl +++ b/ext/soap/tests/bugs/bug38004.wsdl diff --git a/ext/soap/tests/bugs/bug38055.phpt b/ext/soap/tests/bugs/bug38055.phpt index 82b6c76f77..7b5ed49a27 100644 --- a/ext/soap/tests/bugs/bug38055.phpt +++ b/ext/soap/tests/bugs/bug38055.phpt @@ -29,7 +29,7 @@ class TestSoapClient extends SoapClient { } } -$client = new TestSoapClient(dirname(__FILE__).'/bug38055.wsdl'); +$client = new TestSoapClient(__DIR__.'/bug38055.wsdl'); $boolA = 1; $boolB = '1'; $res = $client->Test(array('boolA'=>$boolA, 'boolB'=>$boolB)); diff --git a/ext/soap/tests/bugs/bug38055.wsdl b/ext/soap/tests/bugs/bug38055.wsdl index c06b496782..c06b496782 100755..100644 --- a/ext/soap/tests/bugs/bug38055.wsdl +++ b/ext/soap/tests/bugs/bug38055.wsdl diff --git a/ext/soap/tests/bugs/bug38067.phpt b/ext/soap/tests/bugs/bug38067.phpt index c9bf3c165c..7664135de3 100644 --- a/ext/soap/tests/bugs/bug38067.phpt +++ b/ext/soap/tests/bugs/bug38067.phpt @@ -28,7 +28,7 @@ class TestSoapClient extends SoapClient { } } -$client = new TestSoapClient(dirname(__FILE__).'/bug38067.wsdl', +$client = new TestSoapClient(__DIR__.'/bug38067.wsdl', array('encoding' => 'ISO-8859-1')); $str = 'test: Ä'; $res = $client->Test(array('str'=>$str)); diff --git a/ext/soap/tests/bugs/bug38067.wsdl b/ext/soap/tests/bugs/bug38067.wsdl index 0257effa42..0257effa42 100755..100644 --- a/ext/soap/tests/bugs/bug38067.wsdl +++ b/ext/soap/tests/bugs/bug38067.wsdl diff --git a/ext/soap/tests/bugs/bug38536.phpt b/ext/soap/tests/bugs/bug38536.phpt index feea46e97e..bbd166de42 100644 --- a/ext/soap/tests/bugs/bug38536.phpt +++ b/ext/soap/tests/bugs/bug38536.phpt @@ -36,7 +36,7 @@ EOF; } ini_set("soap.wsdl_cache_enabled", 0); -$SOAPObject = new LocalSoapClient(dirname(__FILE__).'/bug38536.wsdl'); +$SOAPObject = new LocalSoapClient(__DIR__.'/bug38536.wsdl'); print_r($SOAPObject->test()); ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug38536.wsdl b/ext/soap/tests/bugs/bug38536.wsdl index 0ef3fd43cd..0ef3fd43cd 100755..100644 --- a/ext/soap/tests/bugs/bug38536.wsdl +++ b/ext/soap/tests/bugs/bug38536.wsdl diff --git a/ext/soap/tests/bugs/bug39832.phpt b/ext/soap/tests/bugs/bug39832.phpt index 6abc2f0aff..a4c4639f49 100644 --- a/ext/soap/tests/bugs/bug39832.phpt +++ b/ext/soap/tests/bugs/bug39832.phpt @@ -20,7 +20,7 @@ function Test($x) { return $x->priority; } -$x = new SoapServer(dirname(__FILE__)."/bug39832.wsdl"); +$x = new SoapServer(__DIR__."/bug39832.wsdl"); $x->addFunction("Test"); $x->handle($HTTP_RAW_POST_DATA); ?> diff --git a/ext/soap/tests/bugs/bug39832.wsdl b/ext/soap/tests/bugs/bug39832.wsdl index 87c639aa38..87c639aa38 100755..100644 --- a/ext/soap/tests/bugs/bug39832.wsdl +++ b/ext/soap/tests/bugs/bug39832.wsdl diff --git a/ext/soap/tests/bugs/bug40609.phpt b/ext/soap/tests/bugs/bug40609.phpt index 198afc511e..ab07536c31 100644 --- a/ext/soap/tests/bugs/bug40609.phpt +++ b/ext/soap/tests/bugs/bug40609.phpt @@ -8,7 +8,7 @@ soap.wsdl_cache_enabled=0 <?php ini_set("soap.wsdl_cache_enabled", 0); -$c = new SoapClient(dirname(__FILE__)."/bug40609.wsdl", array('trace' => 1, 'exceptions' => 0)); +$c = new SoapClient(__DIR__."/bug40609.wsdl", array('trace' => 1, 'exceptions' => 0)); $c->update(array('symbol' => new SoapVar("<symbol>MSFT</symbol>", XSD_ANYXML), 'price' => new SoapVar("<price>1000</price>", XSD_ANYXML))); diff --git a/ext/soap/tests/bugs/bug40609.wsdl b/ext/soap/tests/bugs/bug40609.wsdl index 0474ff8169..0474ff8169 100755..100644 --- a/ext/soap/tests/bugs/bug40609.wsdl +++ b/ext/soap/tests/bugs/bug40609.wsdl diff --git a/ext/soap/tests/bugs/bug41004.phpt b/ext/soap/tests/bugs/bug41004.phpt index 87ab88598e..c38bf0d62b 100644 --- a/ext/soap/tests/bugs/bug41004.phpt +++ b/ext/soap/tests/bugs/bug41004.phpt @@ -20,7 +20,7 @@ class EchoResponse{ public $out; } -$wsdl = dirname(__FILE__)."/bug41004.wsdl"; +$wsdl = __DIR__."/bug41004.wsdl"; $classmap = array('EchoBean'=>'EchoBean','echo'=>'EchoRequest','echoResponse'=>'EchoResponse'); $client = new SoapClient($wsdl, array('location'=>'test://',"classmap" => $classmap, 'exceptions'=>0, 'trace'=>1)); $echo=new EchoRequest(); diff --git a/ext/soap/tests/bugs/bug41004.wsdl b/ext/soap/tests/bugs/bug41004.wsdl index 6c2a5f4879..6c2a5f4879 100755..100644 --- a/ext/soap/tests/bugs/bug41004.wsdl +++ b/ext/soap/tests/bugs/bug41004.wsdl diff --git a/ext/soap/tests/bugs/bug41337.phpt b/ext/soap/tests/bugs/bug41337.phpt index cd777d1dea..5a4586afe1 100644 --- a/ext/soap/tests/bugs/bug41337.phpt +++ b/ext/soap/tests/bugs/bug41337.phpt @@ -5,7 +5,7 @@ Bug #41337 (WSDL parsing doesn't ignore non soap bindings) --FILE-- <?php ini_set("soap.wsdl_cache_enabled",0); -$client = new SoapClient(dirname(__FILE__)."/bug41337.wsdl"); +$client = new SoapClient(__DIR__."/bug41337.wsdl"); echo "ok\n"; ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug41337.wsdl b/ext/soap/tests/bugs/bug41337.wsdl index 14e5dc4b4e..14e5dc4b4e 100755..100644 --- a/ext/soap/tests/bugs/bug41337.wsdl +++ b/ext/soap/tests/bugs/bug41337.wsdl diff --git a/ext/soap/tests/bugs/bug41337_2.phpt b/ext/soap/tests/bugs/bug41337_2.phpt index d594d2515d..61863d364c 100644 --- a/ext/soap/tests/bugs/bug41337_2.phpt +++ b/ext/soap/tests/bugs/bug41337_2.phpt @@ -5,7 +5,7 @@ Bug #41337 (WSDL parsing doesn't ignore non soap bindings) --FILE-- <?php ini_set("soap.wsdl_cache_enabled",0); -$client = new SoapClient(dirname(__FILE__)."/bug41337_2.wsdl"); +$client = new SoapClient(__DIR__."/bug41337_2.wsdl"); echo "ok\n"; ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug41337_2.wsdl b/ext/soap/tests/bugs/bug41337_2.wsdl index 46c078a0ea..46c078a0ea 100755..100644 --- a/ext/soap/tests/bugs/bug41337_2.wsdl +++ b/ext/soap/tests/bugs/bug41337_2.wsdl diff --git a/ext/soap/tests/bugs/bug41337_2_1.wsdl b/ext/soap/tests/bugs/bug41337_2_1.wsdl index 857dc6ccf6..857dc6ccf6 100755..100644 --- a/ext/soap/tests/bugs/bug41337_2_1.wsdl +++ b/ext/soap/tests/bugs/bug41337_2_1.wsdl diff --git a/ext/soap/tests/bugs/bug42086.phpt b/ext/soap/tests/bugs/bug42086.phpt index 35e5ef0e07..bdaf55ac83 100644 --- a/ext/soap/tests/bugs/bug42086.phpt +++ b/ext/soap/tests/bugs/bug42086.phpt @@ -21,7 +21,7 @@ function firstFunctionWithoutParam() { return $ret; } -$server = new SoapServer(dirname(__FILE__).'/bug42086.wsdl', +$server = new SoapServer(__DIR__.'/bug42086.wsdl', array('features'=>SOAP_SINGLE_ELEMENT_ARRAYS)); $server->addFunction('firstFunctionWithoutParam'); $server->handle($request); diff --git a/ext/soap/tests/bugs/bug42086.wsdl b/ext/soap/tests/bugs/bug42086.wsdl index d55883268f..d55883268f 100755..100644 --- a/ext/soap/tests/bugs/bug42086.wsdl +++ b/ext/soap/tests/bugs/bug42086.wsdl diff --git a/ext/soap/tests/bugs/bug42326.phpt b/ext/soap/tests/bugs/bug42326.phpt index a1d8d59fc0..1eabaa14da 100644 --- a/ext/soap/tests/bugs/bug42326.phpt +++ b/ext/soap/tests/bugs/bug42326.phpt @@ -38,7 +38,7 @@ class SOAP_Admin { } } -$soap = new SoapServer(dirname(__FILE__).'/bug42326.wsdl', array('classmap' => $soap_admin_classmap)); +$soap = new SoapServer(__DIR__.'/bug42326.wsdl', array('classmap' => $soap_admin_classmap)); $soap->setClass('SOAP_Admin'); ob_start(); $soap->handle($request); diff --git a/ext/soap/tests/bugs/bug42326.wsdl b/ext/soap/tests/bugs/bug42326.wsdl index a8e845b537..a8e845b537 100755..100644 --- a/ext/soap/tests/bugs/bug42326.wsdl +++ b/ext/soap/tests/bugs/bug42326.wsdl diff --git a/ext/soap/tests/bugs/bug42359.phpt b/ext/soap/tests/bugs/bug42359.phpt index 42ad8b8a06..0dff891803 100644 --- a/ext/soap/tests/bugs/bug42359.phpt +++ b/ext/soap/tests/bugs/bug42359.phpt @@ -6,7 +6,7 @@ Bug #42326 (SoapServer crash) soap.wsdl_cache_enabled=0 --FILE-- <?php -$soap = new SoapClient(dirname(__FILE__)."/bug42359.wsdl"); +$soap = new SoapClient(__DIR__."/bug42359.wsdl"); print_r($soap->__getTypes()); ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug42359.wsdl b/ext/soap/tests/bugs/bug42359.wsdl index e51db4bab0..e51db4bab0 100755..100644 --- a/ext/soap/tests/bugs/bug42359.wsdl +++ b/ext/soap/tests/bugs/bug42359.wsdl diff --git a/ext/soap/tests/bugs/bug42692.phpt b/ext/soap/tests/bugs/bug42692.phpt index 1436f881e5..b221a3a862 100644 --- a/ext/soap/tests/bugs/bug42692.phpt +++ b/ext/soap/tests/bugs/bug42692.phpt @@ -27,7 +27,7 @@ class TestSoap extends SoapClient { } } -$client = new TestSoap(dirname(__FILE__) . "/bug42692.wsdl", array("trace"=>1)); +$client = new TestSoap(__DIR__ . "/bug42692.wsdl", array("trace"=>1)); try { $result = $client->checkAuth(1,"two"); echo "Auth for 1 is $result\n"; diff --git a/ext/soap/tests/bugs/bug42692.wsdl b/ext/soap/tests/bugs/bug42692.wsdl index 5a6d02383d..5a6d02383d 100755..100644 --- a/ext/soap/tests/bugs/bug42692.wsdl +++ b/ext/soap/tests/bugs/bug42692.wsdl diff --git a/ext/soap/tests/bugs/bug44686.phpt b/ext/soap/tests/bugs/bug44686.phpt index 89a06a1b08..81ed1cf6ec 100644 --- a/ext/soap/tests/bugs/bug44686.phpt +++ b/ext/soap/tests/bugs/bug44686.phpt @@ -6,7 +6,7 @@ Bug #44686 (SOAP-ERROR: Parsing WSDL with references) soap.wsdl_cache_enabled=0 --FILE-- <?php -new SoapClient(dirname(__FILE__) . "/bug44686.wsdl"); +new SoapClient(__DIR__ . "/bug44686.wsdl"); echo "ok\n"; ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug44882.phpt b/ext/soap/tests/bugs/bug44882.phpt index 366ddde7c4..128011722f 100644 --- a/ext/soap/tests/bugs/bug44882.phpt +++ b/ext/soap/tests/bugs/bug44882.phpt @@ -38,7 +38,7 @@ XML; } } -$client = new TestSoapClient(dirname(__FILE__).'/bug44882.wsdl'); +$client = new TestSoapClient(__DIR__.'/bug44882.wsdl'); print_r($client->GetExpressCheckoutDetails()); ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug46427.phpt b/ext/soap/tests/bugs/bug46427.phpt index a49071e21a..38d53518b8 100644 --- a/ext/soap/tests/bugs/bug46427.phpt +++ b/ext/soap/tests/bugs/bug46427.phpt @@ -4,7 +4,6 @@ Bug #46427 (SoapClient() stumbles over its "stream_context" parameter) <?php require_once('skipif.inc'); ?> --FILE-- <?php -error_reporting(E_ALL|E_STRICT); function getSoapClient_1() { $ctx = stream_context_create(); diff --git a/ext/soap/tests/bugs/bug47049.phpt b/ext/soap/tests/bugs/bug47049.phpt index bdc16274e2..467df2b901 100644 --- a/ext/soap/tests/bugs/bug47049.phpt +++ b/ext/soap/tests/bugs/bug47049.phpt @@ -6,7 +6,7 @@ Bug #47049 (SoapClient::__soapCall causes a segmentation fault) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__) . '/bug47049.wsdl', +$client = new SoapClient(__DIR__ . '/bug47049.wsdl', array('trace' => 1 , 'exceptions' => 0)); $host = array('uuid' => 'foo'); $software_list = array(array('name' => 'package', 'version' => '1.2.3', 'state' => 'installed')); diff --git a/ext/soap/tests/bugs/bug50675.phpt b/ext/soap/tests/bugs/bug50675.phpt index c5feb173ac..017671620b 100644 --- a/ext/soap/tests/bugs/bug50675.phpt +++ b/ext/soap/tests/bugs/bug50675.phpt @@ -37,7 +37,7 @@ $parameters = [ 'trace' => 1, 'exceptions' => 0, ]; -$client = new TestSoapClient(dirname(__FILE__) . '/bug50675.wsdl', $parameters); +$client = new TestSoapClient(__DIR__ . '/bug50675.wsdl', $parameters); $person = new stdClass(); $person->name = 'name'; diff --git a/ext/soap/tests/bugs/bug50698_1.phpt b/ext/soap/tests/bugs/bug50698_1.phpt index eb5f1e028b..6f97b62e06 100644 --- a/ext/soap/tests/bugs/bug50698_1.phpt +++ b/ext/soap/tests/bugs/bug50698_1.phpt @@ -6,7 +6,7 @@ Request #50698_1 (SoapClient should handle wsdls with some incompatiable endpoin soap.wsdl_cache_enabled=0 --FILE-- <?php -new SoapClient(dirname(__FILE__) . '/bug50698_1.wsdl'); +new SoapClient(__DIR__ . '/bug50698_1.wsdl'); echo "ok\n"; ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug50698_2.phpt b/ext/soap/tests/bugs/bug50698_2.phpt index 79bbb3bd80..994d78dce9 100644 --- a/ext/soap/tests/bugs/bug50698_2.phpt +++ b/ext/soap/tests/bugs/bug50698_2.phpt @@ -7,13 +7,13 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php try { - new SoapClient(dirname(__FILE__) . '/bug50698_2.wsdl'); - echo "Call: \"new SoapClient(dirname(__FILE__).'/bug50698_2.wsdl');\" should throw an exception of type 'SoapFault'"; + new SoapClient(__DIR__ . '/bug50698_2.wsdl'); + echo "Call: \"new SoapClient(__DIR__.'/bug50698_2.wsdl');\" should throw an exception of type 'SoapFault'"; } catch (SoapFault $e) { if ($e->faultcode == 'WSDL' && $e->faultstring == 'SOAP-ERROR: Parsing WSDL: Could not find any usable binding services in WSDL.') { echo "ok\n"; } else { - echo "Call: \"new SoapClient(dirname(__FILE__).'/bug50698_2.wsdl');\" threw a SoapFault with an incorrect faultcode or faultmessage."; + echo "Call: \"new SoapClient(__DIR__.'/bug50698_2.wsdl');\" threw a SoapFault with an incorrect faultcode or faultmessage."; print_r($e); } } diff --git a/ext/soap/tests/bugs/bug50698_3.phpt b/ext/soap/tests/bugs/bug50698_3.phpt index 341a4afb97..c2f66a1618 100644 --- a/ext/soap/tests/bugs/bug50698_3.phpt +++ b/ext/soap/tests/bugs/bug50698_3.phpt @@ -7,13 +7,13 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php try { - new SoapClient(dirname(__FILE__) . '/bug50698_3.wsdl'); - echo "Call: \"new SoapClient(dirname(__FILE__).'/bug50698_3.wsdl');\" should throw an exception of type 'SoapFault'"; + new SoapClient(__DIR__ . '/bug50698_3.wsdl'); + echo "Call: \"new SoapClient(__DIR__.'/bug50698_3.wsdl');\" should throw an exception of type 'SoapFault'"; } catch (SoapFault $e) { if ($e->faultcode == 'WSDL' && $e->faultstring == 'SOAP-ERROR: Parsing WSDL: Could not find any usable binding services in WSDL.') { echo "ok\n"; } else { - echo "Call: \"new SoapClient(dirname(__FILE__).'/bug50698_3.wsdl');\" threw a SoapFault with an incorrect faultcode or faultmessage."; + echo "Call: \"new SoapClient(__DIR__.'/bug50698_3.wsdl');\" threw a SoapFault with an incorrect faultcode or faultmessage."; print_r($e); } } diff --git a/ext/soap/tests/bugs/bug50698_4.phpt b/ext/soap/tests/bugs/bug50698_4.phpt index bb02d00939..6240d11892 100644 --- a/ext/soap/tests/bugs/bug50698_4.phpt +++ b/ext/soap/tests/bugs/bug50698_4.phpt @@ -6,7 +6,7 @@ Request #50698_4 (SoapClient should handle wsdls with some incompatiable endpoin soap.wsdl_cache_enabled=0 --FILE-- <?php -new SoapClient(dirname(__FILE__) . '/bug50698_4.wsdl'); +new SoapClient(__DIR__ . '/bug50698_4.wsdl'); echo "ok\n"; ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug50762.phpt b/ext/soap/tests/bugs/bug50762.phpt index 77eb6ee6da..c48c761ea2 100644 --- a/ext/soap/tests/bugs/bug50762.phpt +++ b/ext/soap/tests/bugs/bug50762.phpt @@ -32,7 +32,7 @@ class LocalSoapClient extends SoapClient { } -$cl = new LocalSoapClient(dirname(__FILE__).'/bug50762.wsdl', array('cache_wsdl'=>WSDL_CACHE_NONE, 'trace'=>true)); +$cl = new LocalSoapClient(__DIR__.'/bug50762.wsdl', array('cache_wsdl'=>WSDL_CACHE_NONE, 'trace'=>true)); class authToken{ public function __construct($token){ diff --git a/ext/soap/tests/bugs/bug55323.phpt b/ext/soap/tests/bugs/bug55323.phpt index 7855dd845a..fddb434f4a 100644 --- a/ext/soap/tests/bugs/bug55323.phpt +++ b/ext/soap/tests/bugs/bug55323.phpt @@ -6,7 +6,7 @@ Bug #55323 (SoapClient segmentation fault when XSD_TYPEKIND_EXTENSION contains i <?php ini_set("soap.wsdl_cache_enabled",0); $timestamp = "2011-07-30T03:25:00-05:00"; -$wsdl = dirname(__FILE__)."/bug55323.wsdl"; +$wsdl = __DIR__."/bug55323.wsdl"; class TestSoapClient extends SoapClient { diff --git a/ext/soap/tests/bugs/bug66112.phpt b/ext/soap/tests/bugs/bug66112.phpt index 4d5be79296..743297ac23 100644 --- a/ext/soap/tests/bugs/bug66112.phpt +++ b/ext/soap/tests/bugs/bug66112.phpt @@ -6,7 +6,7 @@ Bug #66112 (Use after free condition in SOAP extension) soap.wsdl_cache_enabled=0 --FILE-- <?php -define('WSDL', dirname(__FILE__)."/bug66112.wsdl"); +define('WSDL', __DIR__."/bug66112.wsdl"); function Mist($p) { $client=new soapclient(WSDL, array('typemap'=>array(array("type_ns"=>"uri:mist", "type_name"=>"A")))); try{ diff --git a/ext/soap/tests/bugs/bug73237.phpt b/ext/soap/tests/bugs/bug73237.phpt index e97345fdaa..cbff30e612 100644 --- a/ext/soap/tests/bugs/bug73237.phpt +++ b/ext/soap/tests/bugs/bug73237.phpt @@ -13,7 +13,7 @@ class LocalSoapClient extends SoapClient { EOF; } } -$client = new LocalSoapClient(dirname(__FILE__)."/bug73237.wsdl"); +$client = new LocalSoapClient(__DIR__."/bug73237.wsdl"); var_dump($client->query("")); ?> --EXPECT-- diff --git a/ext/soap/tests/bugs/bug75502.phpt b/ext/soap/tests/bugs/bug75502.phpt index 43cd800556..d9630ed658 100644 --- a/ext/soap/tests/bugs/bug75502.phpt +++ b/ext/soap/tests/bugs/bug75502.phpt @@ -9,7 +9,7 @@ soap.wsdl_cache=2 <?php /* The important part is that restriction>enumeration is used together with mem cache. * Reuse a WSDL file contains this. */ -$client = new SoapClient(dirname(__FILE__)."/bug29236.wsdl"); +$client = new SoapClient(__DIR__."/bug29236.wsdl"); ?> ===DONE=== --EXPECT-- diff --git a/ext/soap/tests/bugs/bug76348.phpt b/ext/soap/tests/bugs/bug76348.phpt index a039955b8a..3049880dce 100644 --- a/ext/soap/tests/bugs/bug76348.phpt +++ b/ext/soap/tests/bugs/bug76348.phpt @@ -3,7 +3,7 @@ Bug #76348 (WSDL_CACHE_MEMORY causes Segmentation fault) --SKIPIF-- <?php if (!extension_loaded('soap')) die('skip soap extension not available'); -if (getenv('SKIP_ONLINE_TESTS')) die('skip online test'); +if (getenv("SKIP_ONLINE_TESTS")) die("skip online test"); ?> --FILE-- <?php diff --git a/ext/soap/tests/bugs/multiport.phpt b/ext/soap/tests/bugs/multiport.phpt index 90799cf492..53e281130f 100644 --- a/ext/soap/tests/bugs/multiport.phpt +++ b/ext/soap/tests/bugs/multiport.phpt @@ -6,7 +6,7 @@ Proper binding selection soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__).'/multiport.wsdl', +$client = new SoapClient(__DIR__.'/multiport.wsdl', array('trace' => true, 'exceptions' => false)); $response = $client->GetSessionId(array('userId'=>'user', 'password'=>'password')); echo $client->__getLastRequest(); diff --git a/ext/soap/tests/bugs/xml2.xsd b/ext/soap/tests/bugs/xml2.xsd index a8e2185f1d..a8e2185f1d 100755..100644 --- a/ext/soap/tests/bugs/xml2.xsd +++ b/ext/soap/tests/bugs/xml2.xsd diff --git a/ext/soap/tests/classmap001.phpt b/ext/soap/tests/classmap001.phpt index 7699aab2bc..1a3a472c27 100644 --- a/ext/soap/tests/classmap001.phpt +++ b/ext/soap/tests/classmap001.phpt @@ -41,7 +41,7 @@ $options=Array( 'classmap' => array('book'=>'book', 'wsdltype2'=>'classname2') ); -$server = new SoapServer(dirname(__FILE__)."/classmap.wsdl",$options); +$server = new SoapServer(__DIR__."/classmap.wsdl",$options); $server->setClass("test"); $server->handle($GLOBALS['HTTP_RAW_POST_DATA']); echo "ok\n"; diff --git a/ext/soap/tests/classmap002.phpt b/ext/soap/tests/classmap002.phpt index cbd74f2f74..2f16cf506a 100644 --- a/ext/soap/tests/classmap002.phpt +++ b/ext/soap/tests/classmap002.phpt @@ -31,7 +31,7 @@ $options=Array( 'classmap' => array('book'=>'book', 'wsdltype2'=>'classname2') ); -$client = new TestSoapClient(dirname(__FILE__)."/classmap.wsdl",$options); +$client = new TestSoapClient(__DIR__."/classmap.wsdl",$options); $ret = $client->dotest2("???"); var_dump($ret); echo "ok\n"; diff --git a/ext/soap/tests/classmap003.phpt b/ext/soap/tests/classmap003.phpt index 2f49bb4e34..3150c4be81 100644 --- a/ext/soap/tests/classmap003.phpt +++ b/ext/soap/tests/classmap003.phpt @@ -42,7 +42,7 @@ class LocalSoapClient extends SoapClient { } } -$client = new LocalSoapClient(dirname(__FILE__)."/classmap003.wsdl", +$client = new LocalSoapClient(__DIR__."/classmap003.wsdl", array('classmap'=>array('A'=>'A','B'=>'B'))); print_r($client->f()); ?> diff --git a/ext/soap/tests/classmap003.wsdl b/ext/soap/tests/classmap003.wsdl index 5fd4660444..5fd4660444 100755..100644 --- a/ext/soap/tests/classmap003.wsdl +++ b/ext/soap/tests/classmap003.wsdl diff --git a/ext/soap/tests/classmap004.phpt b/ext/soap/tests/classmap004.phpt index e8bf58a4f9..f2aad0175a 100644 --- a/ext/soap/tests/classmap004.phpt +++ b/ext/soap/tests/classmap004.phpt @@ -50,7 +50,7 @@ class LocalSoapClient extends SoapClient { } } -$client = new LocalSoapClient(dirname(__FILE__)."/classmap003.wsdl", +$client = new LocalSoapClient(__DIR__."/classmap003.wsdl", array('classmap'=>array('A'=>'A','B'=>'B'))); print_r($client->f()); ?> diff --git a/ext/soap/tests/custom_content_type.phpt b/ext/soap/tests/custom_content_type.phpt index b0dbc1d651..ef95be4ffc 100644 --- a/ext/soap/tests/custom_content_type.phpt +++ b/ext/soap/tests/custom_content_type.phpt @@ -8,18 +8,21 @@ SOAP customized Content-Type, eg. SwA use case echo "skip sapi/cli/tests/php_cli_server.inc required but not found"; } ?> +--CONFLICTS-- +server --FILE-- <?php include __DIR__ . "/../../../sapi/cli/tests/php_cli_server.inc"; -$args = substr(PHP_OS, 0, 3) == 'WIN' ? "-d extension_dir=" . ini_get("extension_dir") . " -d extension=php_soap.dll" : ""; +$args = substr(PHP_OS, 0, 3) == 'WIN' + ? ["-d", "extension_dir=" . ini_get("extension_dir"), "-d", "extension=php_soap.dll"] : []; $code = <<<'PHP' /* Receive */ $content = trim(file_get_contents("php://input")) . PHP_EOL; PHP; -php_cli_server_start($code, false, $args); +php_cli_server_start($code, null, $args); $client = new soapclient(NULL, [ 'location' => 'http://' . PHP_CLI_SERVER_ADDRESS, diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_001w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_001w.phpt index 2442933dae..4845155a33 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_001w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_001w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 001 (php/wsdl): echoString soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString("Hello World!"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_002w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_002w.phpt index b2a21f385c..ca36526947 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_002w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_002w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 002 (php/wsdl): echoString(empty) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString(""); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt index 154d57d104..be9307ea70 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_003w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 003 (php/wsdl): echoString(NULL) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString(NULL); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_004w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_004w.phpt index 2843519ea6..1ee282352c 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_004w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_004w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 004 (php/wsdl): echoString(entities) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString(">,<,&,\",',\\,\n"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt index 22bab4eae3..d8f91d328e 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_005p.phpt @@ -2,7 +2,6 @@ SOAP Interop Round2 base 005 (php/direct): echoString(utf-8) --SKIPIF-- <?php require_once('skipif.inc'); ?> -<?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not available'); ?> --FILE-- <?php $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0)); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt index f94c06f58c..116e14faac 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_005s.phpt @@ -2,7 +2,6 @@ SOAP Interop Round2 base 005 (soap/direct): echoString(utf-8) --SKIPIF-- <?php require_once('skipif.inc'); ?> -<?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not available'); ?> --FILE-- <?php $client = new SoapClient(NULL,array("location"=>"test://","uri"=>"http://soapinterop.org/","trace"=>1,"exceptions"=>0)); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt index 3bb1368b97..a629ab9b2b 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_005w.phpt @@ -2,12 +2,11 @@ SOAP Interop Round2 base 005 (php/wsdl): echoString(utf-8) --SKIPIF-- <?php require_once('skipif.inc'); ?> -<?php if (!function_exists('utf8_encode')) die('skip utf8_encode() not available'); ?> --INI-- soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString(utf8_encode('ỗÈéóÒ₧⅜ỗỸ')); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt index 6b63f45262..4425ec9502 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_006w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 006 (php/wsdl): echoStringArray soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStringArray(array('good','bad')); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt index 53a91614e6..3f669045a3 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_007w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 007 (php/wsdl): echoStringArray(one) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStringArray(array('good')); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt index a99a0fc6ac..df71a912c8 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_008w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 008 (php/wsdl): echoStringArray(empty) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStringArray(array()); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt index 16ae634465..7edc3207d2 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_009w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 009 (php/wsdl): echoStringArray(NULL) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStringArray(NULL); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_010w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_010w.phpt index c7689fa067..5dc4652a32 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_010w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_010w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 010 (php/wsdl): echoInteger soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoInteger(34345); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt index 05b27c8320..ebdef98cd7 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_011w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 011 (php/wsdl): echoIntegerArray soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoIntegerArray(array(1,234324324,2)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_012w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_012w.phpt index 63a506cafd..2badc6f6f4 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_012w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_012w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoFloat(342.23); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt index 6c28380a14..437119c1cf 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_013w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoFloatArray(array(1.3223,34.2,325.325)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt index da78659a13..49f64584e7 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_014w.phpt @@ -15,7 +15,7 @@ class SOAPStruct { } } -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStruct(new SOAPStruct('arg',34,325.325)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt index f4e24ad17b..4723a18216 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_015w.phpt @@ -17,7 +17,7 @@ class SOAPStruct { $struct1 = new SOAPStruct('arg',34,325.325); $struct2 = new SOAPStruct('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStructArray(array($struct1,$struct2)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt index 11e379c800..2bc07cc695 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_016w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 016 (php/wsdl): echoVoid soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoVoid(); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_017w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_017w.phpt index e82360e6d0..2467fb57d4 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_017w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_017w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 017 (php/wsdl): echoBase64 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoBase64('Nebraska'); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_018w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_018w.phpt index 2c0380f4a9..4d7f4d0f0a 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_018w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_018w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 018 (php/wsdl): echoHexBinary soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoHexBinary('soapx4'); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_019w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_019w.phpt index 45278ef92e..6153a01386 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_019w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_019w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 019 (php/wsdl): echoDecimal soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoDecimal('12345.67890'); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_020w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_020w.phpt index 787d1e96ff..4383f732ee 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_020w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_020w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 020 (php/wsdl): echoDate soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoDate('2001-05-24T17:31:41Z'); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_021w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_021w.phpt index 140a823a4f..843b23301e 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_021w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_021w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 021 (php/wsdl): echoBoolean soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoBoolean(true); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_022w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_022w.phpt index 699a5f5f3a..bbc1ef6892 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_022w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_022w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 022 (php/wsdl): echoBoolean soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoBoolean(false); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_023w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_023w.phpt index 356cdcc1a1..6699243a60 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_023w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_023w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 023 (php/wsdl): echoBoolean soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoBoolean(1); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/Base/r2_base_024w.phpt b/ext/soap/tests/interop/Round2/Base/r2_base_024w.phpt index 9fde8369c5..323fbeedfa 100644 --- a/ext/soap/tests/interop/Round2/Base/r2_base_024w.phpt +++ b/ext/soap/tests/interop/Round2/Base/r2_base_024w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round2 base 024 (php/wsdl): echoBoolean soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_base.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoBoolean(0); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt index 2d7fb6385d..747614f74e 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_001w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStructAsSimpleTypes((object)array('varString'=>"arg",'varInt'=>34,'varFloat'=>34.345)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt index c2b0c05fb3..e990789bfb 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_002w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoSimpleTypesAsStruct("arg",34,34.345); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt index cb89dc0b11..aa216da802 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_003w.phpt @@ -9,7 +9,7 @@ soap.wsdl_cache_enabled=0 $param = array( array('row0col0', 'row0col1', 'row0col2'), array('row1col0', 'row1col1', 'row1col2')); -$client = new SoapClient(dirname(__FILE__)."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echo2DStringArray($param); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt index a51ab2be96..6a42867c6e 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_004w.phpt @@ -17,7 +17,7 @@ $param = (object)array( 'varFloat' => 123.452, )); -$client = new SoapClient(dirname(__FILE__)."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoNestedStruct($param); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt index e11051f507..a772e14011 100644 --- a/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt +++ b/ext/soap/tests/interop/Round2/GroupB/r2_groupB_005w.phpt @@ -12,7 +12,7 @@ $param = (object)array( 'varInt'=>34, 'varFloat'=>325.325, 'varArray' => array('red','blue','green')); -$client = new SoapClient(dirname(__FILE__)."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round2_groupB.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoNestedArray($param); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_001w.phpt index c27c783b35..243c1bc34e 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_001w.phpt @@ -16,7 +16,7 @@ class Person { } } $person = new Person(32,12345,'Shane',TRUE); -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_compound1.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_compound1.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoPerson($person); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_002w.phpt index 9b80248dde..91dcf5c80b 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_002w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_002w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupD Compound1 002 (php/wsdl): echoDocument soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_compound1.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_compound1.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoDocument("Test Document Here"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_003w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_003w.phpt index d8dbf28390..2feb31661c 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_003w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound1_003w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupD Compound1 003 (php/wsdl): echoDocument soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_compound1.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_compound1.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoDocument((object)array("_"=>"Test Document Here","ID"=>1)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt index 8e418e1c00..43c6f8e007 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt @@ -25,7 +25,7 @@ class Employee { $person = new Person(32,12345,'Shane',TRUE); $employee = new Employee($person,12345,1000000.00); -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_compound2.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_compound2.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoEmployee($employee); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_001w.phpt index 9f6fc41c36..3cd78f4664 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_001w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupD Doc Lit 001 (php/wsdl): echoString soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString("Hello World"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_002w.phpt index f3e035e480..0d1cb99c3e 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_002w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_002w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupD Doc Lit 002 (php/wsdl): echoStringArray soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStringArray(array("one","two","three")); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_003w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_003w.phpt index 74f0ec0728..a81219e744 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_003w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_003w.phpt @@ -15,7 +15,7 @@ class SOAPStruct { } } $struct = new SOAPStruct('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStruct($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_004w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_004w.phpt index 32fedea52d..28f0e9c90f 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_004w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclit_004w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupD Doc Lit 004 (php/wsdl): echoVoid soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoVoid(); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_001w.phpt index 3fd9c5e372..0541cce622 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_001w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupD Doc Lit Parameters 001 (php/wsdl): echoString soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclitparams.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_doclitparams.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString(array("param0"=>"Hello World")); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_002w.phpt index 564407d529..1b347ff4db 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_002w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_002w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupD Doc Lit Parameters 002 (php/wsdl): echoStringArray soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclitparams.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_doclitparams.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStringArray(array("param0"=>array("one","two","three"))); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_003w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_003w.phpt index e788ffefa3..f9d721fc60 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_003w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_003w.phpt @@ -15,7 +15,7 @@ class SOAPStruct { } } $struct = new SOAPStruct('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclitparams.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_doclitparams.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStruct(array("param0"=>$struct)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_004w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_004w.phpt index 79b0ced347..8c22336aeb 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_004w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_doclitparams_004w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupD Doc Lit Parameters 004 (php/wsdl): echoVoid soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_doclitparams.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_doclitparams.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoVoid(); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_emptysa_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_emptysa_001w.phpt index 47e2900e3e..6504d2dcba 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_emptysa_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_emptysa_001w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupD EmptySA 001 (php/wsdl): echoString soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_emptysa.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_emptysa.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString("Hello World"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import1_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import1_001w.phpt index 34eac1cb24..3bbc0cbe55 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import1_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import1_001w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupD Import1 001 (php/wsdl): echoString soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_import1.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_import1.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString("Hello World"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt index ed0387a17e..756c49deb1 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import2_001w.phpt @@ -15,7 +15,7 @@ class SOAPStruct { } } $struct = new SOAPStruct('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_import2.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_import2.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStruct($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt index f732115b76..4fca5b8169 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_001w.phpt @@ -15,7 +15,7 @@ class SOAPStruct { } } $struct = new SOAPStruct('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_import3.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_import3.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStruct($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt index b2f740ce09..3f05d4159e 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_import3_002w.phpt @@ -16,7 +16,7 @@ class SOAPStruct { } $struct1 = new SOAPStruct('arg',34,325.325); $struct2 = new SOAPStruct('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_import3.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_import3.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStructArray(array($struct1,$struct2)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_001w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_001w.phpt index c70eae01ce..7fe35b0529 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_001w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupD RPC Encoded 001 (php/wsdl): echoString soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString("Hello World"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt index 839afdef97..638ce76600 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_002w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupD RPC Encoded 002 (php/wsdl): echoStringArray soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStringArray(array("one","two","three")); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt index 63bd4c7cf1..5db899cc23 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_003w.phpt @@ -15,7 +15,7 @@ class SOAPStruct { } } $struct = new SOAPStruct('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStruct($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt index a6cbbe854e..6c919b796e 100644 --- a/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt +++ b/ext/soap/tests/interop/Round3/GroupD/r3_groupD_rpcenc_004w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupD RPC Encoded 004 (php/wsdl): echoVoid soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupD_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupD_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoVoid(); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2_absolute.wsdl b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2_absolute.wsdl deleted file mode 100644 index fc0f8ae7fa..0000000000 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2_absolute.wsdl +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name="SoapInterop" targetNamespace="http://soapinterop.org/main/" - xmlns:wsdlns1="http://soapinterop.org/definitions/" - xmlns:wsdlns="http://soapinterop.org/main/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns="http://schemas.xmlsoap.org/wsdl/"> - <import location="imported/import2B.wsdl" namespace="http://soapinterop.org/definitions/" /> - - <binding name="SoapInteropImport2Binding" type="wsdlns1:SoapInteropImport2PortType"> - <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="echoStruct"> - <soap:operation soapAction="http://soapinterop.org/"/> - <input> - <soap:body use="encoded" namespace="http://soapinterop/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://soapinterop/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - </binding> - <service name="Import2"> - <port name="SoapInteropImport2Port" binding="wsdlns:SoapInteropImport2Binding"> - <soap:address location="round3_groupD_import2.inc"/> - </port> - </service> -</definitions> diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt index 11039c0f32..df576c4205 100644 --- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt @@ -14,7 +14,7 @@ class SOAPList { } } $struct = new SOAPList('arg1',1,NULL); -$client = new SoapClient(dirname(__FILE__)."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoLinkedList($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt index 053581dfa0..13341e06eb 100644 --- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt +++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt @@ -14,7 +14,7 @@ class SOAPList { } } $struct = new SOAPList('arg1',1, new SOAPList('arg2',2,NULL)); -$client = new SoapClient(dirname(__FILE__)."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoLinkedList($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt index 982114cded..3e84283d69 100644 --- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt +++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt @@ -14,7 +14,7 @@ class SOAPList { } } $struct = new SOAPList('arg1',1,new SOAPList('arg2',2,new SOAPList('arg3',3,NULL))); -$client = new SoapClient(dirname(__FILE__)."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoLinkedList($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt index 1c798aaf97..57e649a5fe 100644 --- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt +++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_004w.phpt @@ -14,7 +14,7 @@ class SOAPList { } } $struct = NULL; -$client = new SoapClient(dirname(__FILE__)."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoLinkedList($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt index 4a0e047856..68047e4645 100644 --- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt +++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_005w.phpt @@ -15,7 +15,7 @@ class SOAPList { } $struct = new SOAPList('arg1',1,new SOAPList('arg2',2,new SOAPList('arg3',3,NULL))); $struct->child->child->child = $struct; -$client = new SoapClient(dirname(__FILE__)."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoLinkedList($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt index 694eb1a7f2..ee74830b31 100644 --- a/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt +++ b/ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_006w.phpt @@ -15,7 +15,7 @@ class SOAPList { } $struct = new SOAPList('arg1',1,new SOAPList('arg2',2,new SOAPList('arg3',3,NULL))); $struct->child->child->child = $struct->child; -$client = new SoapClient(dirname(__FILE__)."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupE_list.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoLinkedList($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_ext_001w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_ext_001w.phpt index bc6af1a94a..e1425d58c6 100644 --- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_ext_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_ext_001w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupF Extensibility 001 (php/wsdl): echoString soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupF_ext.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupF_ext.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString("Hello World"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_extreq_001w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_extreq_001w.phpt index fa8940e338..fa75ade912 100644 --- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_extreq_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_extreq_001w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupF Extensibility Required 001 (php/wsdl): echoString soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupF_extreq.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupF_extreq.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString("Hello World"); echo $client->__getlastrequest(); //$HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_001w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_001w.phpt index 65bda0ccce..2920fa8526 100644 --- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_001w.phpt +++ b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_001w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round3 GroupF Headers 001 (php/wsdl): echoString soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round3_groupF_headers.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupF_headers.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString("Hello World"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_002w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_002w.phpt index ae723a3b1c..131a4cb3d0 100644 --- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_002w.phpt +++ b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_002w.phpt @@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $hdr = new SoapHeader("http://soapinterop.org/xsd","Header1", array("int"=>34,"string"=>"arg")); -$client = new SoapClient(dirname(__FILE__)."/round3_groupF_headers.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupF_headers.wsdl",array("trace"=>1,"exceptions"=>0)); $client->__soapCall("echoString",array("Hello World"),null,$hdr); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_003w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_003w.phpt index b4cb283264..eb9745dec1 100644 --- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_003w.phpt +++ b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_003w.phpt @@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $hdr = new SoapHeader("http://soapinterop.org/xsd","Header2", array("int"=>34,"string"=>"arg")); -$client = new SoapClient(dirname(__FILE__)."/round3_groupF_headers.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupF_headers.wsdl",array("trace"=>1,"exceptions"=>0)); $client->__soapCall("echoString",array("Hello World"),null,$hdr); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_004w.phpt b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_004w.phpt index f0a427a700..2861def542 100644 --- a/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_004w.phpt +++ b/ext/soap/tests/interop/Round3/GroupF/r3_groupF_headers_004w.phpt @@ -10,7 +10,7 @@ $hdr = array( new SoapHeader("http://soapinterop.org/xsd","Header1", array("int"=>34,"string"=>"arg1")), new SoapHeader("http://soapinterop.org/xsd","Header2", array("int"=>43,"string"=>"arg2")) ); -$client = new SoapClient(dirname(__FILE__)."/round3_groupF_headers.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round3_groupF_headers.wsdl",array("trace"=>1,"exceptions"=>0)); $client->__soapCall("echoString",array("Hello World"),null,$hdr); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimedoc.wsdl b/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimedoc.wsdl deleted file mode 100644 index 9cedcfce69..0000000000 --- a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimedoc.wsdl +++ /dev/null @@ -1,185 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<wsdl:definitions name="SOAPBuilders" - xmlns="http://soapinterop.org/attachments/wsdl" - xmlns:types="http://soapinterop.org/attachments/xsd" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/" - targetNamespace="http://soapinterop.org/attachments/wsdl"> - <wsdl:types> - <schema - xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://soapinterop.org/attachments/xsd" - elementFormDefault="qualified" - attributeFormDefault="qualified"> - - <complexType name="binary"> - <simpleContent> - <extension base="xsd:base64Binary"> - <attribute name="href" type="xsd:anyURI"/> - </extension> - </simpleContent> - </complexType > - - <element name="EchoAttachment" type="types:EchoAttachment"/> - <element name="EchoAttachmentResponse" type="types:EchoAttachmentResponse"/> - <complexType name="EchoAttachment"> - <sequence> - <element name="In" type="types:binary"/> - </sequence> - </complexType> - <complexType name="EchoAttachmentResponse"> - <sequence> - <element name="Out" type="types:binary"/> - </sequence> - </complexType> - - <element name="EchoAttachments" type="types:Attachments"/> - <element name="EchoAttachmentsResponse" type="types:Attachments"/> - <complexType name="Attachments"> - <sequence> - <element name="Item" minOccurs="0" maxOccurs="unbounded" type="types:binary"> - </element> - </sequence> - </complexType> - - <element name="EchoAttachmentAsBase64" type="types:EchoAttachment"/> - <element name="EchoAttachmentAsBase64Response" type="types:EchoAttachmentResponse"/> - - <element name="EchoBase64AsAttachment" type="types:EchoAttachment"/> - <element name="EchoBase64AsAttachmentResponse" type="types:EchoAttachmentResponse"/> - </schema> - </wsdl:types> - - <wsdl:message name="EchoAttachmentIn"> - <wsdl:part name="In" element="types:EchoAttachment"/> - </wsdl:message> - <wsdl:message name="EchoAttachmentOut"> - <wsdl:part name="Out" element="types:EchoAttachmentResponse"/> - </wsdl:message> - <wsdl:message name="EchoAttachmentsIn"> - <wsdl:part name="In" element="types:EchoAttachments"/> - </wsdl:message> - <wsdl:message name="EchoAttachmentsOut"> - <wsdl:part name="Out" element="types:EchoAttachmentsResponse"/> - </wsdl:message> - <wsdl:message name="EchoAttachmentAsBase64In"> - <wsdl:part name="In" element="types:EchoAttachmentAsBase64"/> - </wsdl:message> - <wsdl:message name="EchoAttachmentAsBase64Out"> - <wsdl:part name="Out" element="types:EchoAttachmentAsBase64Response"/> - </wsdl:message> - <wsdl:message name="EchoBase64AsAttachmentIn"> - <wsdl:part name="In" element="types:EchoBase64AsAttachment"/> - </wsdl:message> - <wsdl:message name="EchoBase64AsAttachmentOut"> - <wsdl:part name="Out" element="types:EchoBase64AsAttachmentResponse"/> - </wsdl:message> - - <wsdl:portType name="AttachmentsPortType"> - <wsdl:operation name="EchoAttachment"> - <wsdl:input name="EchoAttachmentInput" message="EchoAttachmentIn"/> - <wsdl:output name="EchoAttachmentOutput" message="EchoAttachmentOut"/> - </wsdl:operation> - <wsdl:operation name="EchoAttachments"> - <wsdl:input name="EchoAttachmentsInput" message="EchoAttachmentsIn"/> - <wsdl:output name="EchoAttachmentsOutput" message="EchoAttachmentsOut"/> - </wsdl:operation> - <wsdl:operation name="EchoAttachmentAsBase64"> - <wsdl:input name="EchoAttachmentAsBase64Input" message="EchoAttachmentAsBase64In"/> - <wsdl:output name="EchoAttachmentAsBase64Output" message="EchoAttachmentAsBase64Out"/> - </wsdl:operation> - <wsdl:operation name="EchoBase64AsAttachment"> - <wsdl:input name="EchoBase64AsAttachmentInput" message="EchoBase64AsAttachmentIn"/> - <wsdl:output name="EchoBase64AsAttachmentOutput" message="EchoBase64AsAttachmentOut"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AttachmentsBinding" type="AttachmentsPortType"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="EchoAttachment"> - <soap:operation soapAction="http://soapinterop.org/attachments/"/> - <wsdl:input name="EchoAttachmentInput"> - <mime:multipartRelated> - <mime:part> - <soap:body use="literal"/> - </mime:part> - <mime:part> - <mime:content part="In" type="application/octetstream"/> - </mime:part> - </mime:multipartRelated> - </wsdl:input> - <wsdl:output name="EchoAttachmentOutput"> - <mime:multipartRelated> - <mime:part> - <soap:body use="literal" /> - </mime:part> - <mime:part> - <mime:content part="Out" type="application/octetstream"/> - </mime:part> - </mime:multipartRelated> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="EchoAttachments"> - <soap:operation soapAction="http://soapinterop.org/attachments/"/> - <wsdl:input name="EchoAttachmentsInput"> - <mime:multipartRelated> - <mime:part> - <soap:body use="literal"/> - </mime:part> - <mime:part> - <mime:content part="In" type="application/octetstream"/> - </mime:part> - </mime:multipartRelated> - </wsdl:input> - <wsdl:output name="EchoAttachmentsOutput"> - <mime:multipartRelated> - <mime:part> - <soap:body use="literal"/> - </mime:part> - <mime:part> - <mime:content part="Out" type="application/octetstream"/> - </mime:part> - </mime:multipartRelated> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="EchoAttachmentAsBase64"> - <soap:operation soapAction="http://soapinterop.org/attachments/"/> - <wsdl:input name="EchoAttachmentAsBase64Input"> - <mime:multipartRelated> - <mime:part> - <soap:body use="literal"/> - </mime:part> - <mime:part> - <mime:content part="In" type="application/octetstream"/> - </mime:part> - </mime:multipartRelated> - </wsdl:input> - <wsdl:output name="EchoAttachmentAsBase64Output"> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="EchoBase64AsAttachment"> - <soap:operation soapAction="http://soapinterop.org/attachments/"/> - <wsdl:input name="EchoBase64AsAttachmentInput"> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output name="EchoBase64AsAttachmentOutput"> - <mime:multipartRelated> - <mime:part> - <soap:body use="literal"/> - </mime:part> - <mime:part> - <mime:content part="Out" type="application/octetstream"/> - </mime:part> - </mime:multipartRelated> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="Round4MIMEDOC"> - <wsdl:port name="Round4MIMEDOCTestSoap" binding="AttachmentsBinding"> - <soap:address location="test://" /> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimerpc.wsdl b/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimerpc.wsdl deleted file mode 100644 index 30a56d12f6..0000000000 --- a/ext/soap/tests/interop/Round4/GroupG/round4_groupG_mimerpc.wsdl +++ /dev/null @@ -1,151 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<wsdl:definitions name="SOAPBuilders" - xmlns="http://soapinterop.org/attachments/wsdl" - xmlns:types="http://soapinterop.org/attachments/xsd" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/" - targetNamespace="http://soapinterop.org/attachments/wsdl"> - <wsdl:types> - <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://soapinterop.org/attachments/xsd"> - <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/> - <complexType name="ArrayOfBinary"> - <complexContent> - <restriction base="soap-enc:Array"> - <attribute ref="soap-enc:arrayType" wsdl:arrayType="soap-enc:base64Binary[]"/> - </restriction> - </complexContent> - </complexType> - </schema> - </wsdl:types> - <wsdl:message name="EchoAttachmentIn"> - <wsdl:part name="In" type="xsd:base64Binary"/> - </wsdl:message> - <wsdl:message name="EchoAttachmentOut"> - <wsdl:part name="Out" type="xsd:base64Binary"/> - </wsdl:message> - <wsdl:message name="EchoAttachmentsIn"> - <wsdl:part name="In" type="types:ArrayOfBinary"/> - </wsdl:message> - <wsdl:message name="EchoAttachmentsOut"> - <wsdl:part name="Out" type="types:ArrayOfBinary"/> - </wsdl:message> - <wsdl:message name="EchoAttachmentAsBase64In"> - <wsdl:part name="In" type="xsd:base64Binary"/> - </wsdl:message> - <wsdl:message name="EchoAttachmentAsBase64Out"> - <wsdl:part name="Out" type="xsd:base64Binary"/> - </wsdl:message> - <wsdl:message name="EchoBase64AsAttachmentIn"> - <wsdl:part name="In" type="xsd:base64Binary"/> - </wsdl:message> - <wsdl:message name="EchoBase64AsAttachmentOut"> - <wsdl:part name="Out" type="xsd:base64Binary"/> - </wsdl:message> - <wsdl:portType name="AttachmentsPortType"> - <wsdl:operation name="EchoAttachment"> - <wsdl:input name="EchoAttachmentInput" message="EchoAttachmentIn"/> - <wsdl:output name="EchoAttachmentOutput" message="EchoAttachmentOut"/> - </wsdl:operation> - <wsdl:operation name="EchoAttachments"> - <wsdl:input name="EchoAttachmentsInput" message="EchoAttachmentsIn"/> - <wsdl:output name="EchoAttachmentsOutput" message="EchoAttachmentsOut"/> - </wsdl:operation> - <wsdl:operation name="EchoAttachmentAsBase64"> - <wsdl:input name="EchoAttachmentAsBase64Input" message="EchoAttachmentAsBase64In"/> - <wsdl:output name="EchoAttachmentAsBase64Output" message="EchoAttachmentAsBase64Out"/> - </wsdl:operation> - <wsdl:operation name="EchoBase64AsAttachment"> - <wsdl:input name="EchoBase64AsAttachmentInput" message="EchoBase64AsAttachmentIn"/> - <wsdl:output name="EchoBase64AsAttachmentOutput" message="EchoBase64AsAttachmentOut"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AttachmentsBinding" type="AttachmentsPortType"> - <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="EchoAttachment"> - <soap:operation soapAction="http://soapinterop.org/attachments/"/> - <wsdl:input name="EchoAttachmentInput"> - <mime:multipartRelated> - <mime:part> - <soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </mime:part> - <mime:part> - <mime:content part="In" type="application/octetstream"/> - </mime:part> - </mime:multipartRelated> - </wsdl:input> - <wsdl:output name="EchoAttachmentOutput"> - <mime:multipartRelated> - <mime:part> - <soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </mime:part> - <mime:part> - <mime:content part="Out" type="application/octetstream"/> - </mime:part> - </mime:multipartRelated> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="EchoAttachments"> - <soap:operation soapAction="http://soapinterop.org/attachments/"/> - <wsdl:input name="EchoAttachmentsInput"> - <mime:multipartRelated> - <mime:part> - <soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </mime:part> - <mime:part> - <mime:content part="In" type="application/octetstream"/> - </mime:part> - </mime:multipartRelated> - </wsdl:input> - <wsdl:output name="EchoAttachmentsOutput"> - <mime:multipartRelated> - <mime:part> - <soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </mime:part> - <mime:part> - <mime:content part="Out" type="application/octetstream"/> - </mime:part> - </mime:multipartRelated> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="EchoAttachmentAsBase64"> - <soap:operation soapAction="http://soapinterop.org/attachments/"/> - <wsdl:input name="EchoAttachmentAsBase64Input"> - <mime:multipartRelated> - <mime:part> - <soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </mime:part> - <mime:part> - <mime:content part="In" type="application/octetstream"/> - </mime:part> - </mime:multipartRelated> - </wsdl:input> - <wsdl:output name="EchoAttachmentAsBase64Output"> - <soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="EchoBase64AsAttachment"> - <soap:operation soapAction="http://soapinterop.org/attachments/"/> - <wsdl:input name="EchoBase64AsAttachmentInput"> - <soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </wsdl:input> - <wsdl:output name="EchoBase64AsAttachmentOutput"> - <mime:multipartRelated> - <mime:part> - <soap:body use="encoded" namespace="http://soapinterop.org/attachments/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </mime:part> - <mime:part> - <mime:content part="Out" type="application/octetstream"/> - </mime:part> - </mime:multipartRelated> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="Round4MIMERPC"> - <wsdl:port name="Round4MIMERPCTestSoap" binding="AttachmentsBinding"> - <soap:address location="test://" /> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt index 3e1593382b..e3b4615a6b 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_001w.phpt @@ -15,7 +15,7 @@ class SOAPStruct { } } $struct = new SOAPStruct('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoSOAPStructFault($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt index b2cb8161f6..61cf4ea078 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_002w.phpt @@ -21,7 +21,7 @@ class BaseStruct { } } $struct = new BaseStruct(new SOAPStruct("a1",11,12.345),11); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoBaseStructFault($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt index 3cf1236fc2..aafd26787a 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_003w.phpt @@ -29,7 +29,7 @@ class ExtendedStruct extends BaseStruct { } } $struct = new ExtendedStruct(new SOAPStruct("a1",11,12.345),12,"arg",-3,5); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoExtendedStructFault($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt index 1c07c32009..16ff9d703e 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_004w.phpt @@ -22,7 +22,7 @@ class BaseStruct { } $s1 = new SOAPStruct('arg1',34,325.325); $s2 = new BaseStruct(new SOAPStruct('arg2',34,325.325),12); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(array("whichFault" => 1, "param1" => $s1, "param2" => $s2)); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt index c2710fc742..d62f33264f 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_005w.phpt @@ -22,7 +22,7 @@ class BaseStruct { } $s1 = new SOAPStruct('arg1',34,325.325); $s2 = new BaseStruct(new SOAPStruct('arg2',34,325.325),12); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(array("whichFault" => 2, "param1" => $s1, "param2" => $s2)); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt index 31976b740f..5d280e1c3d 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_006w.phpt @@ -22,7 +22,7 @@ class BaseStruct { } $s1 = new SOAPStruct('arg1',34,325.325); $s2 = new BaseStruct(new SOAPStruct('arg2',34,325.325),12); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(array("whichFault" => 3, "param1" => $s1, "param2" => $s2)); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt index 9db050ad67..eda7e18f68 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_007w.phpt @@ -36,7 +36,7 @@ class MoreExtendedStruct extends ExtendedStruct { $s1 = new BaseStruct(new SOAPStruct("s1",1,1.1),1); $s2 = new ExtendedStruct(new SOAPStruct("s2",2,2.2),2,"arg",-3,5); $s3 = new MoreExtendedStruct(new SOAPStruct("s3",3,3.3),3,"arg",-3,5,true); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(array("whichFault" => 1, "param1" => $s1, "param2" => $s2, diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt index d420abe183..154736e75b 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_008w.phpt @@ -36,7 +36,7 @@ class MoreExtendedStruct extends ExtendedStruct { $s1 = new BaseStruct(new SOAPStruct("s1",1,1.1),1); $s2 = new ExtendedStruct(new SOAPStruct("s2",2,2.2),2,"arg",-3,5); $s3 = new MoreExtendedStruct(new SOAPStruct("s3",3,3.3),3,"arg",-3,5,true); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(array("whichFault" => 2, "param1" => $s1, "param2" => $s2, diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt index 53c6b7fbc7..f1d56f055c 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_009w.phpt @@ -36,7 +36,7 @@ class MoreExtendedStruct extends ExtendedStruct { $s1 = new BaseStruct(new SOAPStruct("s1",1,1.1),1); $s2 = new ExtendedStruct(new SOAPStruct("s2",2,2.2),2,"arg",-3,5); $s3 = new MoreExtendedStruct(new SOAPStruct("s3",3,3.3),3,"arg",-3,5,true); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(array("whichFault" => 3, "param1" => $s1, "param2" => $s2, diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt index 2e966e9a36..caa70d53ad 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_doclit_010w.phpt @@ -36,7 +36,7 @@ class MoreExtendedStruct extends ExtendedStruct { $s1 = new BaseStruct(new SOAPStruct("s1",1,1.1),1); $s2 = new ExtendedStruct(new SOAPStruct("s2",2,2.2),2,"arg",-3,5); $s3 = new MoreExtendedStruct(new SOAPStruct("s3",3,3.3),3,"arg",-3,5,true); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(array("whichFault" => 4, "param1" => $s1, "param2" => $s2, diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt index c1695268d7..25814f6bc7 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_001w.phpt @@ -15,7 +15,7 @@ class SOAPStruct { } } $struct = new SOAPStruct('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoSOAPStructFault(array("soapStruct"=>$struct)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt index 4bcdf1f441..ad8d2d8147 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_002w.phpt @@ -14,7 +14,7 @@ class BaseStruct { } } $struct = new BaseStruct(12.345,12); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoBaseStructFault($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt index ec52aece46..76859d4e18 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_003w.phpt @@ -22,7 +22,7 @@ class ExtendedStruct extends BaseStruct { } } $struct = new ExtendedStruct(12.345,12,"arg",-3,5); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoExtendedStructFault($struct); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt index 07cde239e8..13cf2dfe7f 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_004w.phpt @@ -22,7 +22,7 @@ class BaseStruct { } $s1 = new SOAPStruct('arg',34,325.325); $s2 = new BaseStruct(12.345,12); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(1,$s1,$s2); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt index a68957441f..f092a7c5b9 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_005w.phpt @@ -22,7 +22,7 @@ class BaseStruct { } $s1 = new SOAPStruct('arg',34,325.325); $s2 = new BaseStruct(12.345,12); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(2,$s1,$s2); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt index bc0cef2ea2..eabe960f91 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_006w.phpt @@ -22,7 +22,7 @@ class BaseStruct { } $s1 = new SOAPStruct('arg',34,325.325); $s2 = new BaseStruct(12.345,12); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(3,$s1,$s2); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt index fd2df8f425..cdd19b8223 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_007w.phpt @@ -30,7 +30,7 @@ class MoreExtendedStruct extends ExtendedStruct { $s1 = new BaseStruct(12.345,1); $s2 = new ExtendedStruct(12.345,2,"arg",-3,5); $s3 = new MoreExtendedStruct(12.345,3,"arg",-3,5,true); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(1,$s1,$s2,$s3); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt index cc1fc72b9c..c0fcefd538 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_008w.phpt @@ -30,7 +30,7 @@ class MoreExtendedStruct extends ExtendedStruct { $s1 = new BaseStruct(12.345,1); $s2 = new ExtendedStruct(12.345,2,"arg",-3,5); $s3 = new MoreExtendedStruct(12.345,3,"arg",-3,5,true); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(2,$s1,$s2,$s3); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt index 1a2d950577..75ceb24368 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_009w.phpt @@ -30,7 +30,7 @@ class MoreExtendedStruct extends ExtendedStruct { $s1 = new BaseStruct(12.345,1); $s2 = new ExtendedStruct(12.345,2,"arg",-3,5); $s3 = new MoreExtendedStruct(12.345,3,"arg",-3,5,true); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(3,$s1,$s2,$s3); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt index 906812e6b7..a4f51a041c 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_complex_rpcenc_010w.phpt @@ -30,7 +30,7 @@ class MoreExtendedStruct extends ExtendedStruct { $s1 = new BaseStruct(12.345,1); $s2 = new ExtendedStruct(12.345,2,"arg",-3,5); $s3 = new MoreExtendedStruct(12.345,3,"arg",-3,5,true); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_complex_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(4,$s1,$s2,$s3); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt index 104f7f58bd..5e2bbbc3bb 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_001w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple Doc Lit 001 (php/wsdl): echoEmptyFault soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoEmptyFault(); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt index b713aed722..deb67b3ba6 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_002w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple Doc Lit 002 (php/wsdl): echoStringFault soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStringFault("Hello World"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt index e203ea0312..7933409d50 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_003w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple Doc Lit 003 (php/wsdl): echoIntArrayFault soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoIntArrayFault(array(34,12.345)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt index f673ec0184..3a1b49cc42 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_004w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(array("whichFault" => 1, "param1" => "Hello world", "param2" => array(12.345,45,678))); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt index 67db5044f9..fc58dfa67f 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_005w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(array("whichFault" => 2, "param1" => "Hello world", "param2" => array(12.345,45,678))); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt index 7c6c1b5a5a..465bd19d99 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_006w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(array("whichFault" => 3, "param1" => "Hello world", "param2" => array(12.345,45,678))); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt index e8e9bba26a..69d78fe920 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_007w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(array("whichFault" => 4, "param1" => "Hello world", "param2" => array(12.345,45,678))); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt index 5bd6b4c7e7..1443812a2c 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_008w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(array("whichFault" => 1, "param1" => "Hello world", "param2" => 12.345, diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt index 461a4770c6..a4d4280925 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_009w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(array("whichFault" => 2, "param1" => "Hello world", "param2" => 12.345, diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt index f312c3630d..fc66a7fb89 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_010w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(array("whichFault" => 3, "param1" => "Hello world", "param2" => 12.345, diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt index 403cfaade8..8b62ff3bad 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_011w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(array("whichFault" => 4, "param1" => "Hello world", "param2" => 12.345, diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt index e97976592c..49594bfb20 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_012w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple Doc Lit 012 (php/wsdl): echoMultipleFaults3(1) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults3(array("whichFault" => 1, "param1" => "arg1", "param2" => "arg2")); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt index 92e3e3d4f2..4f6851a73c 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_013w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple Doc Lit 013 (php/wsdl): echoMultipleFaults3(2) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults3(array("whichFault" => 2, "param1" => "arg1", "param2" => "arg2")); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt index 84875bd972..c87ac861d8 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_014w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple Doc Lit 014 (php/wsdl): echoMultipleFaults3(3) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults3(array("whichFault" => 3, "param1" => "arg1", "param2" => "arg2")); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt index 0f61447197..13316d4cfa 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_015w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple Doc Lit 015 (php/wsdl): echoMultipleFaults4(1) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults4(array("whichFault" => 1, "param1" => 162, "param2" => 1)); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt index 1b2379a273..03e5afd8df 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_016w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple Doc Lit 016 (php/wsdl): echoMultipleFaults4(2) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults4(array("whichFault" => 2, "param1" => 162, "param2" => 1)); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt index 003f3aca29..c6e67049e1 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_doclit_017w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple Doc Lit 017 (php/wsdl): echoMultipleFaults4(3) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_doclit.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults4(array("whichFault" => 3, "param1" => 162, "param2" => 1)); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt index ba76cfe11d..457e6fdcf2 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_001w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple RPC Enc 001 (php/wsdl): echoEmptyFault soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoEmptyFault(); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt index 0d82b6752e..55bde2cdb7 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_002w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple RPC Enc 002 (php/wsdl): echoStringFault soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStringFault("Hello World"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt index 29251977b2..2d4f3da6a4 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_003w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple RPC Enc 003 (php/wsdl): echoIntArrayFault soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoIntArrayFault(array(34,12.345)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt index 7926e154a4..6b03648b0a 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_004w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(1,"Hello world",array(12.345,45,678)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt index fb332a4f04..8b30f552fe 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_005w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(2,"Hello world",array(12.345,45,678)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt index 2ed546fcb9..a02b785e6d 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_006w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(3,"Hello world",array(12.345,45,678)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt index bd31aa3659..4e827700ec 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_007w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults1(4,"Hello world",array(12.345,45,678)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt index e61e374dca..170434bae1 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_008w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(1, "Hello World", 12.345, array("one","two","three")); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt index d1869478f7..412e50b55a 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_009w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(2, "Hello World", 12.345, array("one","two","three")); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt index 3431180b17..410a683341 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_010w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(3, "Hello World", 12.345, array("one","two","three")); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt index 1d66e0cbe3..4d13ee9e12 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_011w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults2(4, "Hello World", 12.345, array("one","two","three")); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt index e6bbcc7053..48aad38d22 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_012w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple RPC Enc 012 (php/wsdl): echoMultipleFaults3(1) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults3(1,"arg1","arg2"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt index ba93028f9f..a24ed8778a 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_013w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple RPC Enc 013 (php/wsdl): echoMultipleFaults3(2) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults3(2,"arg1","arg2"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt index e7449d93dd..9c7902c3fb 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_014w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple RPC Enc 014 (php/wsdl): echoMultipleFaults3(3) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults3(3,"arg1","arg2"); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt index 7da5cd560f..f24c90e259 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_015w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple RPC Enc 015 (php/wsdl): echoMultipleFaults4(1) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults4(1, 162, 1); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt index e44b743409..49235700f5 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_016w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple RPC Enc 016 (php/wsdl): echoMultipleFaults4(2) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults4(2, 162, 1); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt index f7de4aaa8c..5b52cceb23 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_simple_rpcenc_017w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH Simple RPC Enc 017 (php/wsdl): echoMultipleFaults4(3) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_simple_rpcenc.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoMultipleFaults4(3, 162, 1); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt index d7c5172262..77ed867fb8 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_001w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH SoapFault 001 (php/wsdl): echoVersionMismatchFault(SO soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_soapfault.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_soapfault.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoVersionMismatchFault(); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt index 64ebf7071d..af90e15c79 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_002w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupH SoapFault 002 (php/wsdl): echoVersionMismatchFault(SO soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_soapfault.wsdl",array("trace"=>1,"exceptions"=>0,"soap_version"=>SOAP_1_2)); +$client = new SoapClient(__DIR__."/round4_groupH_soapfault.wsdl",array("trace"=>1,"exceptions"=>0,"soap_version"=>SOAP_1_2)); $client->echoVersionMismatchFault(); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt index ad791ddf1b..31ca13ee1a 100644 --- a/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt +++ b/ext/soap/tests/interop/Round4/GroupH/r4_groupH_soapfault_004w.phpt @@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $hdr = new SoapHeader("http://soapinterop.org/wsdl", "UnknownHeaderRequest", "Hello World", 1); -$client = new SoapClient(dirname(__FILE__)."/round4_groupH_soapfault.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupH_soapfault.wsdl",array("trace"=>1,"exceptions"=>0)); $client->__soapCall("echoVersionMismatchFault",array(), null, $hdr); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_001w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_001w.phpt index 98ed58d992..77b8c8e7b3 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_001w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_001w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 001 (php/wsdl): echoVoid soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoVoid(); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_002w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_002w.phpt index 67929f8a07..9f1ee78d77 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_002w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_002w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 002 (php/wsdl): echoInteger soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoInteger(array("inputInteger"=>22)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_003w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_003w.phpt index 8ee9418f24..f161268eac 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_003w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_003w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoFloat(array("inputFloat"=>12.345)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_004w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_004w.phpt index 25b056d6dd..f36c3baa5c 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_004w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_004w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 004 (php/wsdl): echoString soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString(array("inputString"=>"Hello World")); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_005w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_005w.phpt index 8d552dc1bc..f27bb8b455 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_005w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_005w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 005 (php/wsdl): echoString(empty) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoString(array()); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_006w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_006w.phpt Binary files differindex 2cc37b55b4..2a863f469d 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_006w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_006w.phpt diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_007w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_007w.phpt index 6f1edbe852..615fa43c39 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_007w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_007w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 007 (php/wsdl): echoDate soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoDate(array("inputDate"=>"2002-12-22T21:41:17Z")); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_008w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_008w.phpt index 2ebcabd1db..0930f87001 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_008w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_008w.phpt @@ -15,7 +15,7 @@ class SOAPComplexType { } } $struct = new SOAPComplexType('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoComplexType(array("inputComplexType"=>$struct)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_009w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_009w.phpt index af0040f783..884ea17387 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_009w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_009w.phpt @@ -16,7 +16,7 @@ class SOAPComplexType { } $struct = new SOAPComplexType('arg',34,325.325); unset($struct->varString); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoComplexType(array("inputComplexType"=>$struct)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_010w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_010w.phpt index 0621716d64..b185b931f3 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_010w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_010w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 010 (php/wsdl): echoIntegerMultiOccurs soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoIntegerMultiOccurs(array("inputIntegerMultiOccurs"=>array(22,29,36))); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_011w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_011w.phpt index 9e064e893a..930542708c 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_011w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_011w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoFloatMultiOccurs(array("inputFloatMultiOccurs"=>array(22.5,12.345))); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_012w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_012w.phpt index ecf1d53316..8f7a616f49 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_012w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_012w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 012 (php/wsdl): echoStringMultiOccurs soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStringMultiOccurs(array("inputStringMultiOccurs"=>array("arg1","arg2","arg3"))); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_013w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_013w.phpt index c237ae22e6..c44c5472ff 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_013w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_013w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 013 (php/wsdl): echoStringMultiOccurs(nil) soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoStringMultiOccurs(array("inputStringMultiOccurs"=>array("arg1",NULL,"arg3"))); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt index 4bcda95e38..6d3b344448 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_014w.phpt @@ -17,7 +17,7 @@ class SOAPComplexType { $struct1 = new SOAPComplexType('arg',34,325.325); $struct2 = new SOAPComplexType('arg',34,325.325); $struct3 = new SOAPComplexType('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoComplexTypeMultiOccurs(array("inputComplexTypeMultiOccurs"=>array($struct1,$struct2,$struct3))); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt index 490d903e5a..239045c564 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_015w.phpt @@ -16,7 +16,7 @@ class SOAPComplexType { } $struct1 = new SOAPComplexType('arg',34,325.325); $struct2 = new SOAPComplexType('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoComplexTypeMultiOccurs(array("inputComplexTypeMultiOccurs"=>array($struct1,null,$struct2))); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_016w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_016w.phpt index 55366c7353..bc78b3d5c8 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_016w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_016w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 016 (php/wsdl): echoDecimal soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoDecimal(array("inputDecimal"=>"123456789.123456789")); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_017w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_017w.phpt index 20e3051bc8..18bc7bd23c 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_017w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_017w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 017 (php/wsdl): echoBoolean soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoBoolean(array("inputBoolean"=>true)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_018w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_018w.phpt index 1b60add22b..2be7297ce0 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_018w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_018w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 018 (php/wsdl): echoHexBinary soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoHexBinary(array("inputHexBinary"=>"\x80\xFF\x00\x01\x7F")); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_019w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_019w.phpt index 4630add1c4..aecfe79a9d 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_019w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_019w.phpt @@ -15,7 +15,7 @@ class SOAPComplexType { } } $struct = new SOAPComplexType('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoComplexTypeAsSimpleTypes(array("inputComplexType"=>$struct)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_020w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_020w.phpt index 0034ba82b0..9fc63c6dd3 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_020w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_020w.phpt @@ -16,7 +16,7 @@ class SOAPComplexType { } $struct = new SOAPComplexType('arg',34,325.325); unset($struct->varString); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoComplexTypeAsSimpleTypes(array("inputComplexType"=>$struct)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_021w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_021w.phpt index ad1e60abb3..3e9ee065ee 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_021w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_021w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoSimpleTypesAsComplexType(array("inputInteger"=>34, "inputFloat"=>12.345, "inputString"=>"arg")); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_022w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_022w.phpt index e9ad5d78ce..86523bd1ed 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_022w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_022w.phpt @@ -7,7 +7,7 @@ precision=14 soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoSimpleTypesAsComplexType(array("inputInteger"=>34, "inputFloat"=>12.345)); echo $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_023w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_023w.phpt index 4afa56485b..b9c2a3bd05 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_023w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_023w.phpt @@ -23,7 +23,7 @@ class SOAPComplexTypeComplexType { } } $struct = new SOAPComplexTypeComplexType("arg",34,12.345,new SOAPComplexType("arg",43,54.321)); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoNestedComplexType(array("inputComplexType"=>$struct)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_024w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_024w.phpt index f30f1afb31..4af5375fed 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_024w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_024w.phpt @@ -17,7 +17,7 @@ class SOAPComplexTypeComplexType { } $struct = new SOAPComplexTypeComplexType("arg",34,12.345,NULL); unset($struct->varComplexType); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoNestedComplexType(array("inputComplexType"=>$struct)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_025w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_025w.phpt index 7b6d8eceb2..b4bf0519a8 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_025w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_025w.phpt @@ -16,7 +16,7 @@ class SOAPMultiOccursComplexType { } } $struct = new SOAPMultiOccursComplexType("arg",34,12.345,array("red","green","blue")); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoNestedMultiOccurs(array("inputComplexType"=>$struct)); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_026w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_026w.phpt index 3cec539569..89e40e0d0f 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_026w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_026w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 026 (php/wsdl): echoChoice soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoChoice(array("inputChoice"=>(object)array("name1"=>"Hello World"))); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_027w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_027w.phpt index c53b7aa657..ff9ad3abfb 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_027w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_027w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 027 (php/wsdl): echoEnum soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoEnum(array("inputEnum"=>"bitTwo")); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_028w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_028w.phpt index a5ff11a7b3..41e5da71e3 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_028w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_028w.phpt @@ -15,7 +15,7 @@ class SOAPComplexType { } } $struct = new SOAPComplexType('arg',34,325.325); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoAnyType(array('inputAnyType'=>new SoapVar($struct,SOAP_ENC_OBJECT,"SOAPComplexType","http://soapinterop.org/xsd"))); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_029w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_029w.phpt index ddbe23a0bb..ad69b2f136 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_029w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_029w.phpt @@ -6,7 +6,7 @@ SOAP Interop Round4 GroupI XSD 029 (php/wsdl): echoAnyElement soap.wsdl_cache_enabled=0 --FILE-- <?php -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->echoAnyElement(array("inputAny"=>array("any"=>"<bold>Hello World</bold>"))); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_030w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_030w.phpt index 48c8c444af..58e359788a 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_030w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_030w.phpt @@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $hdr = new SoapHeader("http://soapinterop.org/","echoMeStringRequest", array("varString"=>"Hello World"), 1); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->__soapCall("echoVoidSoapHeader",array(),null,$hdr); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_031w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_031w.phpt index c108fb63cd..67da316d56 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_031w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_031w.phpt @@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $hdr = new SoapHeader("http://soapinterop.org/","echoMeStringRequest", array(), 1); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->__soapCall("echoVoidSoapHeader",array(),null,$hdr); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_032w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_032w.phpt index 03b03852a6..aa37a913b2 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_032w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_032w.phpt @@ -8,7 +8,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $hdr = new SoapHeader("http://soapinterop.org/","echoMeComplexTypeRequest", array("varInt"=>34,"varString"=>"arg","varFloat"=>12.345), 1); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->__soapCall("echoVoidSoapHeader",array(),null,$hdr); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_033w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_033w.phpt index e28f1808e2..2433a90b6b 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_033w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_033w.phpt @@ -8,7 +8,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $hdr = new SoapHeader("http://soapinterop.org/","echoMeComplexTypeRequest", array("varInt"=>34,"varFloat"=>12.345), 1); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->__soapCall("echoVoidSoapHeader",array(),null,$hdr); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_034w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_034w.phpt index 3639400fcc..0a3bec4c68 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_034w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_034w.phpt @@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $hdr = new SoapHeader("http://soapinterop.org/","echoMeStringRequest", array("varString"=>"Hello World"), 1, SOAP_ACTOR_NEXT); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->__soapCall("echoVoidSoapHeader",array(),null,$hdr); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_035w.phpt b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_035w.phpt index 2b894a7aab..670b0b116b 100644 --- a/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_035w.phpt +++ b/ext/soap/tests/interop/Round4/GroupI/r4_groupI_xsd_035w.phpt @@ -8,7 +8,7 @@ soap.wsdl_cache_enabled=0 --FILE-- <?php $hdr = new SoapHeader("http://soapinterop.org/","echoMeComplexTypeRequest", array("varInt"=>34,"varString"=>"arg","varFloat"=>12.345), 1, SOAP_ACTOR_NEXT); -$client = new SoapClient(dirname(__FILE__)."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); +$client = new SoapClient(__DIR__."/round4_groupI_xsd.wsdl",array("trace"=>1,"exceptions"=>0)); $client->__soapCall("echoVoidSoapHeader",array(),null,$hdr); echo $client->__getlastrequest(); $HTTP_RAW_POST_DATA = $client->__getlastrequest(); diff --git a/ext/soap/tests/schema/schema085.phpt b/ext/soap/tests/schema/schema085.phpt index 9a93ac7235..1a1ab15999 100644 --- a/ext/soap/tests/schema/schema085.phpt +++ b/ext/soap/tests/schema/schema085.phpt @@ -33,10 +33,10 @@ class B extends A { test_schema($schema,'type="tns:testType"',new B()); echo "ok"; ?> ---EXPECT-- +--EXPECTF-- <?xml version="1.0" encoding="UTF-8"?> <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test-uri/" 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:test><testParam xsi:type="ns1:testType"><int xsi:type="xsd:int">1</int><int2 xsi:type="xsd:int">2</int2></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope> -object(stdClass)#5 (2) { +object(stdClass)#%d (2) { ["int"]=> int(1) ["int2"]=> diff --git a/ext/soap/tests/server011.phpt b/ext/soap/tests/server011.phpt index 5b76a81299..1c367d7d56 100644 --- a/ext/soap/tests/server011.phpt +++ b/ext/soap/tests/server011.phpt @@ -12,12 +12,12 @@ function Add($x,$y) { return $x+$y; } -$server = new soapserver(dirname(__FILE__)."/test.wsdl"); +$server = new soapserver(__DIR__."/test.wsdl"); ob_start(); $server->handle(); $wsdl = ob_get_contents(); ob_end_clean(); -if ($wsdl == file_get_contents(dirname(__FILE__)."/test.wsdl")) { +if ($wsdl == file_get_contents(__DIR__."/test.wsdl")) { echo "ok\n"; } else { echo "fail\n"; diff --git a/ext/soap/tests/server025.phpt b/ext/soap/tests/server025.phpt index ed56750a0b..5366c7ad91 100644 --- a/ext/soap/tests/server025.phpt +++ b/ext/soap/tests/server025.phpt @@ -25,7 +25,7 @@ function test() { return "Hello Body!"; } -$server = new soapserver(dirname(__FILE__)."/server025.wsdl"); +$server = new soapserver(__DIR__."/server025.wsdl"); $server->addfunction("test"); $HTTP_RAW_POST_DATA = <<<EOF diff --git a/ext/soap/tests/server025.wsdl b/ext/soap/tests/server025.wsdl index 2870f4e70d..2870f4e70d 100755..100644 --- a/ext/soap/tests/server025.wsdl +++ b/ext/soap/tests/server025.wsdl diff --git a/ext/soap/tests/server030.phpt b/ext/soap/tests/server030.phpt index ed5aad832a..bafb01f575 100644 --- a/ext/soap/tests/server030.phpt +++ b/ext/soap/tests/server030.phpt @@ -30,7 +30,7 @@ class handlerClass { } } -$server = new SoapServer(dirname(__FILE__)."/server030.wsdl"); +$server = new SoapServer(__DIR__."/server030.wsdl"); $server->setClass('handlerClass'); $HTTP_RAW_POST_DATA = <<<EOF diff --git a/ext/soap/tests/server031.phpt b/ext/soap/tests/server031.phpt index 23275796d8..c9f8d95f8e 100644 --- a/ext/soap/tests/server031.phpt +++ b/ext/soap/tests/server031.phpt @@ -46,7 +46,7 @@ class handlerClass { } } -$server = new SoapServer(dirname(__FILE__)."/server030.wsdl"); +$server = new SoapServer(__DIR__."/server030.wsdl"); $server->setClass('handlerClass'); $HTTP_RAW_POST_DATA = <<<EOF diff --git a/ext/soap/tests/soap12/T68.phpt b/ext/soap/tests/soap12/T68.phpt index a7915196cb..acf4230973 100644 --- a/ext/soap/tests/soap12/T68.phpt +++ b/ext/soap/tests/soap12/T68.phpt @@ -12,15 +12,15 @@ $HTTP_RAW_POST_DATA = <<<EOF <test:echoOk xmlns:test="http://example.org/ts-tests" env:role="http://www.w3.org/2003/05/soap-envelope/role/next" >foo</test:echoOk> - + </env:Header> <env:Body> - - + + </env:Body> - - + + </env:Envelope> EOF; diff --git a/ext/soap/tests/typemap001.phpt b/ext/soap/tests/typemap001.phpt index 3268c694ae..c582406f41 100644 --- a/ext/soap/tests/typemap001.phpt +++ b/ext/soap/tests/typemap001.phpt @@ -52,7 +52,7 @@ $options=Array( "from_xml" => "book_from_xml")) ); -$server = new SoapServer(dirname(__FILE__)."/classmap.wsdl",$options); +$server = new SoapServer(__DIR__."/classmap.wsdl",$options); $server->setClass("test"); $server->handle($HTTP_RAW_POST_DATA); echo "ok\n"; diff --git a/ext/soap/tests/typemap002.phpt b/ext/soap/tests/typemap002.phpt index 41bbc1505e..84ef043ac3 100644 --- a/ext/soap/tests/typemap002.phpt +++ b/ext/soap/tests/typemap002.phpt @@ -47,7 +47,7 @@ $options=Array( "to_xml" => "book_to_xml")) ); -$server = new SoapServer(dirname(__FILE__)."/classmap.wsdl",$options); +$server = new SoapServer(__DIR__."/classmap.wsdl",$options); $server->setClass("test"); $server->handle($HTTP_RAW_POST_DATA); echo "ok\n"; diff --git a/ext/soap/tests/typemap003.phpt b/ext/soap/tests/typemap003.phpt index 85a6369313..0770d1be67 100644 --- a/ext/soap/tests/typemap003.phpt +++ b/ext/soap/tests/typemap003.phpt @@ -42,7 +42,7 @@ $options=Array( "from_xml" => "book_from_xml")) ); -$client = new TestSoapClient(dirname(__FILE__)."/classmap.wsdl",$options); +$client = new TestSoapClient(__DIR__."/classmap.wsdl",$options); $ret = $client->dotest2("???"); var_dump($ret); echo "ok\n"; diff --git a/ext/soap/tests/typemap004.phpt b/ext/soap/tests/typemap004.phpt index ffd24c6a38..07d489db95 100644 --- a/ext/soap/tests/typemap004.phpt +++ b/ext/soap/tests/typemap004.phpt @@ -30,7 +30,7 @@ $options=Array( "to_xml" => "book_to_xml")) ); -$client = new TestSoapClient(dirname(__FILE__)."/classmap.wsdl",$options); +$client = new TestSoapClient(__DIR__."/classmap.wsdl",$options); $book = new book(); $book->a = "foo"; $book->b = "bar"; diff --git a/ext/soap/tests/typemap009.phpt b/ext/soap/tests/typemap009.phpt index 7c7cd6fee7..37e73edeca 100644 --- a/ext/soap/tests/typemap009.phpt +++ b/ext/soap/tests/typemap009.phpt @@ -47,7 +47,7 @@ $options=Array( "from_xml" => "book_from_xml")) ); -$server = new SoapServer(dirname(__FILE__)."/classmap.wsdl",$options); +$server = new SoapServer(__DIR__."/classmap.wsdl",$options); $server->setClass("test"); $server->handle($HTTP_RAW_POST_DATA); echo "ok\n"; diff --git a/ext/soap/tests/typemap010.phpt b/ext/soap/tests/typemap010.phpt index 0d27ba4936..46e9909a62 100644 --- a/ext/soap/tests/typemap010.phpt +++ b/ext/soap/tests/typemap010.phpt @@ -47,7 +47,7 @@ $options=Array( "to_xml" => "book_to_xml")) ); -$server = new SoapServer(dirname(__FILE__)."/classmap.wsdl",$options); +$server = new SoapServer(__DIR__."/classmap.wsdl",$options); $server->setClass("test"); $server->handle($HTTP_RAW_POST_DATA); echo "ok\n"; diff --git a/ext/soap/tests/typemap011.phpt b/ext/soap/tests/typemap011.phpt index 7d89b71e06..ac6b9f3924 100644 --- a/ext/soap/tests/typemap011.phpt +++ b/ext/soap/tests/typemap011.phpt @@ -37,7 +37,7 @@ $options=Array( "from_xml" => "book_from_xml")) ); -$client = new TestSoapClient(dirname(__FILE__)."/classmap.wsdl",$options); +$client = new TestSoapClient(__DIR__."/classmap.wsdl",$options); try { $ret = $client->dotest2("???"); } catch (SoapFault $e) { diff --git a/ext/soap/tests/typemap012.phpt b/ext/soap/tests/typemap012.phpt index 79e2319085..837ae1fd80 100644 --- a/ext/soap/tests/typemap012.phpt +++ b/ext/soap/tests/typemap012.phpt @@ -30,7 +30,7 @@ $options=Array( "to_xml" => "book_to_xml")) ); -$client = new TestSoapClient(dirname(__FILE__)."/classmap.wsdl",$options); +$client = new TestSoapClient(__DIR__."/classmap.wsdl",$options); $book = new book(); $book->a = "foo"; $book->b = "bar"; diff --git a/ext/soap/tests/typemap013.phpt b/ext/soap/tests/typemap013.phpt index 4ebeac71d8..6d414fdbc0 100644 --- a/ext/soap/tests/typemap013.phpt +++ b/ext/soap/tests/typemap013.phpt @@ -47,7 +47,7 @@ $options=Array( "to_xml" => "book_to_xml")) ); -$server = new SoapServer(dirname(__FILE__)."/classmap.wsdl",$options); +$server = new SoapServer(__DIR__."/classmap.wsdl",$options); $server->setClass("test"); $server->handle($HTTP_RAW_POST_DATA); echo "ok\n"; |