Permalink
Browse files

Fix references.

git-svn-id: http://svn.php.net/repository/pear/packages/SOAP_Interop/trunk@227760 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
1 parent df5f9c7 commit 2fd728bf233b5e9111551d7e31b3850bc9449d03 Jan Schneider committed Jan 21, 2007
Showing with 31 additions and 35 deletions.
  1. +1 −1 interop_client.php
  2. +25 −26 params_classes.php
  3. +4 −7 params_values.php
  4. +1 −1 registrationAndNotification.php
View
@@ -488,7 +488,7 @@ function doTest() {
$this->totals['servers']++;
#$endpoint_info['tests'] = array();
- if ($this->show) print "Processing {$endpoint_info->name} at {$endpoint_info->endpointURL}<br>\n";
+ if ($this->show) print "Processing {$endpoint_info->name} at {$endpoint_info->endpointURL}\n";
$tc = count($soap_tests[$this->currentTest]);
for($ti=0; $ti<$tc; $ti++) {
View
@@ -30,11 +30,11 @@ function SOAPStruct($s=NULL, $i=NULL, $f=NULL) {
$this->varFloat = $f;
}
- function &__to_soap($name = 'inputStruct', $header=false, $mustUnderstand=0, $actor='http://schemas.xmlsoap.org/soap/actor/next')
+ function __to_soap($name = 'inputStruct', $header=false, $mustUnderstand=0, $actor='http://schemas.xmlsoap.org/soap/actor/next')
{
- $inner[] =& new SOAP_Value('varString','string',$this->varString);
- $inner[] =& new SOAP_Value('varInt','int',$this->varInt);
- $inner[] =& new SOAP_Value('varFloat','float',$this->varFloat);
+ $inner[] = new SOAP_Value('varString','string',$this->varString);
+ $inner[] = new SOAP_Value('varInt','int',$this->varInt);
+ $inner[] = new SOAP_Value('varFloat','float',$this->varFloat);
if ($header) {
return new SOAP_Header($name,'{http://soapinterop.org/xsd}SOAPStruct',$inner,$mustUnderstand,$actor);
}
@@ -57,12 +57,12 @@ function SOAPStructStruct($s=NULL, $i=NULL, $f=NULL, $ss=NULL) {
$this->varStruct = $ss;
}
- function &__to_soap($name = 'inputStruct')
+ function __to_soap($name = 'inputStruct')
{
- $v[] =& new SOAP_Value('varString','string',$this->varString);
- $v[] =& new SOAP_Value('varInt','int',$this->varInt);
- $v[] =& new SOAP_Value('varFloat','float',$this->varFloat);
- $v[] =& $this->varStruct->__to_soap('varStruct');
+ $v[] = new SOAP_Value('varString','string',$this->varString);
+ $v[] = new SOAP_Value('varInt','int',$this->varInt);
+ $v[] = new SOAP_Value('varFloat','float',$this->varFloat);
+ $v[] = $this->varStruct->__to_soap('varStruct');
return new SOAP_Value($name,'{http://soapinterop.org/xsd}SOAPStructStruct',$v);
}
}
@@ -81,17 +81,17 @@ function SOAPArrayStruct($s=NULL, $i=NULL, $f=NULL, $ss=NULL) {
$this->varArray = $ss;
}
- function &__to_soap($name = 'inputStruct')
+ function __to_soap($name = 'inputStruct')
{
$ar = array();
$c = count($this->varArray);
for ($i=0; $i<$c; $i++) {
- $ar[] =& new SOAP_Value('item','string',$this->varArray[$i]);
+ $ar[] = new SOAP_Value('item','string',$this->varArray[$i]);
}
- $v[] =& new SOAP_Value('varString','string',$this->varString);
- $v[] =& new SOAP_Value('varInt','int',$this->varInt);
- $v[] =& new SOAP_Value('varFloat','float',$this->varFloat);
- $v[] =& new SOAP_Value('varArray',false,$ar);
+ $v[] = new SOAP_Value('varString','string',$this->varString);
+ $v[] = new SOAP_Value('varInt','int',$this->varInt);
+ $v[] = new SOAP_Value('varFloat','float',$this->varFloat);
+ $v[] = new SOAP_Value('varArray',false,$ar);
return new SOAP_Value($name,'{http://soapinterop.org/xsd}SOAPArrayStruct',$v);
}
@@ -114,16 +114,16 @@ function __set_attribute($key, $value)
$this->$key = $value;
}
- function &__to_soap($name = 'x_Person',$ns = 'http://soapinterop.org/xsd', $compound2=false)
+ function __to_soap($name = 'x_Person',$ns = 'http://soapinterop.org/xsd', $compound2=false)
{
if (!$compound2) {
- $v[] =& new SOAP_Value("\{$ns}Age",'double',$this->Age);
- $v[] =& new SOAP_Value("\{$ns}ID",'float',$this->ID);
+ $v[] = new SOAP_Value("\{$ns}Age",'double',$this->Age);
+ $v[] = new SOAP_Value("\{$ns}ID",'float',$this->ID);
return new SOAP_Value("\{$ns}$name",'Person',
$v,array('Name'=>$this->Name,'Male'=>$this->Male));
} else
- $v[] =& new SOAP_Value("\{$ns}Name",'string',$this->Name);
- $v[] =& new SOAP_Value("\{$ns}Male",'boolean',$this->Male);
+ $v[] = new SOAP_Value("\{$ns}Name",'string',$this->Name);
+ $v[] = new SOAP_Value("\{$ns}Male",'boolean',$this->Male);
return new SOAP_Value("\{$ns}$name",'Person',$v);
}
}
@@ -144,13 +144,13 @@ function Employee($person=NULL,$id=NULL,$salary=NULL) {
$this->salary = $salary;
}
- function &__to_soap($name = 'x_Employee', $ns='http://soapinterop.org/employee')
+ function __to_soap($name = 'x_Employee', $ns='http://soapinterop.org/employee')
{
- $person =& $this->person->__to_soap('person','http://soapinterop.org/person',true);
+ $person = $this->person->__to_soap('person','http://soapinterop.org/person',true);
$person->namespace = $ns;
- $va[] = &$person;
- $va[] =& new SOAP_Value("\{$ns}salary",'double',$this->salary);
- $va[] =& new SOAP_Value("\{$ns}ID",'int',$this->ID);
+ $va[] = $person;
+ $va[] = new SOAP_Value("\{$ns}salary",'double',$this->salary);
+ $va[] = new SOAP_Value("\{$ns}ID",'int',$this->ID);
return new SOAP_Value("\{$ns}$name",'Employee',$va);
}
}
@@ -160,4 +160,3 @@ function x_Employee($person=NULL,$id=NULL,$salary=NULL) {
$parent->Employee($person,$id,$salary);
}
}
-?>
View
@@ -79,13 +79,13 @@
array(&$soapstruct_soapval,&$soapstruct_soapval,&$soapstruct_soapval));
$soapstructstruct =& new SOAPStructStruct('arg',34,325.325,$soapstruct);
-$soapstructstruct_soapval = &$soapstructstruct->__to_soap();
+$soapstructstruct_soapval = $soapstructstruct->__to_soap();
$soapstructstruct_array = array(&$soapstructstruct, &$soapstructstruct, &$soapstructstruct);
$soapstructstruct_array_soapval =& new SOAP_Value('inputStructArray','Array',
array(&$soapstructstruct_soapval,&$soapstructstruct_soapval,&$soapstructstruct_soapval));
$soaparraystruct =& new SOAPArrayStruct('arg',34,325.325,array('good','bad','ugly'));
-$soaparraystruct_soapval = &$soaparraystruct->__to_soap();
+$soaparraystruct_soapval = $soaparraystruct->__to_soap();
$soaparraystruct_array = array(&$soaparraystruct, &$soaparraystruct, &$soaparraystruct);
$soaparraystruct_array_soapval =& new SOAP_Value('inputStructArray','Array',
array(&$soaparraystruct_soapval,&$soaparraystruct_soapval,&$soaparraystruct_soapval));
@@ -150,9 +150,6 @@ function &make_2d($x, $y)
// Round2GroupC values
$_person =& new Person(32,12345,'Shane',TRUE);
-$person =& $_person->__to_soap();
+$person = $_person->__to_soap();
$_employee =& new Employee($_person,12345,1000000.00);
-$employee =& $_employee->__to_soap();
-
-
-?>
+$employee = $_employee->__to_soap();
@@ -63,7 +63,7 @@ class ChangeItem {
var $url;
}
-function &getLocalInteropServer($testname,$id,$localBaseUrl='http://localhost/soap_interop/') {
+function getLocalInteropServer($testname,$id,$localBaseUrl='http://localhost/soap_interop/') {
$localServer = array();
$localServer['service_id']=$id;
$localServer['name']='Local PEAR::SOAP';

0 comments on commit 2fd728b

Please sign in to comment.