Skip to content

Commit e869186

Browse files
kocsismatekocsismate
committed
EXPECTFize ext/soap tests where exact object IDs are displayed
These cause test failures when we migrate resources to objects. But anyway, hardcoding the object IDs and the number of properties is hardly ever useful, so it's fine to get rid of them. Related to #14121
1 parent ad16767 commit e869186

10 files changed

+27
-27
lines changed

‎ext/soap/tests/bugs/bug36226-2.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ class IVREvents {
9393

9494
}
9595
?>
96-
--EXPECT--
96+
--EXPECTF--
9797
<?xml version="1.0" encoding="UTF-8"?>
9898
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://testurl/Message" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><SOAP-ENV:Body><ns1:ivrEvents version="1.0" activityId="101" messageId="12345" source="IVR"><ns1:logOffEvent audienceMemberId="34567" timestamp="2005-11-08T11:22:07+03:00" smokeStatus="Smoked" callInitiator="IVR"/><ns1:logOnEvent xsi:nil="true"/></ns1:ivrEvents></SOAP-ENV:Body></SOAP-ENV:Envelope>
9999

100-
object(IVREvents)#5 (6) {
100+
object(IVREvents)#%d (%d) {
101101
["version"]=>
102102
string(3) "1.0"
103103
["activityId"]=>
@@ -111,7 +111,7 @@ object(IVREvents)#5 (6) {
111111
["logOffEvent"]=>
112112
array(1) {
113113
[0]=>
114-
object(LogOffEvent)#6 (4) {
114+
object(LogOffEvent)#%d (%d) {
115115
["audienceMemberId"]=>
116116
int(34567)
117117
["timestamp"]=>

‎ext/soap/tests/bugs/bug36226.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ object(IVREvents)#%d (6) {
105105
["logOnEvent"]=>
106106
array(1) {
107107
[0]=>
108-
object(LogOnEvent)#10 (2) {
108+
object(LogOnEvent)#%d (%d) {
109109
["audienceMemberId"]=>
110110
int(34567)
111111
["timestamp"]=>

‎ext/soap/tests/bugs/bug73237.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ EOF;
1616
$client = new LocalSoapClient(__DIR__."/bug73237.wsdl");
1717
var_dump($client->query(""));
1818
?>
19-
--EXPECT--
20-
object(stdClass)#2 (1) {
19+
--EXPECTF--
20+
object(stdClass)#%d (%d) {
2121
["result"]=>
22-
object(stdClass)#3 (4) {
22+
object(stdClass)#%d (%d) {
2323
["done"]=>
2424
string(4) "true"
2525
["queryLocator"]=>
2626
NULL
2727
["records"]=>
28-
object(SoapVar)#6 (6) {
28+
object(SoapVar)#%d (%d) {
2929
["enc_type"]=>
3030
int(0)
3131
["enc_value"]=>
32-
object(stdClass)#4 (3) {
32+
object(stdClass)#%d (%d) {
3333
["type"]=>
3434
string(14) "CampaignMember"
3535
["Id"]=>
@@ -44,7 +44,7 @@ object(stdClass)#2 (1) {
4444
[0]=>
4545
string(175) "<sf:CampaignId>701i0000001lreeAAA</sf:CampaignId><sf:Status>Sent</sf:Status><sf:ContactId xsi:nil="true"/><sf:LeadId>00Qi000001UrbYFEAZ</sf:LeadId><sf:Contact xsi:nil="true"/>"
4646
["Lead"]=>
47-
object(stdClass)#5 (3) {
47+
object(stdClass)#%d (%d) {
4848
["type"]=>
4949
string(4) "Lead"
5050
["Id"]=>

‎ext/soap/tests/bugs/segfault_assertion_props.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class DummyClass {
3232
$client = new TestSoapClient(__DIR__."/../classmap.wsdl", ['classmap' => ['Struct' => 'DummyClass']]);
3333
var_dump($client->dotest2("???"));
3434
?>
35-
--EXPECT--
36-
object(DummyClass)#2 (2) {
35+
--EXPECTF--
36+
object(DummyClass)#%d (%d) {
3737
["a"]=>
3838
array(2) {
3939
[0]=>

‎ext/soap/tests/classmap002.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ $ret = $client->dotest2("???");
3636
var_dump($ret);
3737
echo "ok\n";
3838
?>
39-
--EXPECT--
40-
object(book)#2 (2) {
39+
--EXPECTF--
40+
object(book)#%d (%d) {
4141
["a"]=>
4242
string(5) "Blaat"
4343
["b"]=>

‎ext/soap/tests/classmap005.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ $ret = $client->dotest2("???");
4040
var_dump($ret);
4141
echo "ok\n";
4242
?>
43-
--EXPECT--
44-
object(bookNs)#2 (2) {
43+
--EXPECTF--
44+
object(bookNs)#%d (%d) {
4545
["a"]=>
4646
string(5) "Blaat"
4747
["b"]=>

‎ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_001w.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ $HTTP_RAW_POST_DATA = $client->__getlastrequest();
1717
include("round3_groupE_list.inc");
1818
echo "ok\n";
1919
?>
20-
--EXPECT--
20+
--EXPECTF--
2121
<?xml version="1.0" encoding="UTF-8"?>
2222
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:nil="true" xsi:type="ns2:List"/></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
2323
<?xml version="1.0" encoding="UTF-8"?>
2424
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:nil="true" xsi:type="ns2:List"/></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
25-
object(stdClass)#5 (3) {
25+
object(stdClass)#%d (%d) {
2626
["varInt"]=>
2727
int(1)
2828
["varString"]=>

‎ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_002w.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ $HTTP_RAW_POST_DATA = $client->__getlastrequest();
1717
include("round3_groupE_list.inc");
1818
echo "ok\n";
1919
?>
20-
--EXPECT--
20+
--EXPECTF--
2121
<?xml version="1.0" encoding="UTF-8"?>
2222
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:nil="true" xsi:type="ns2:List"/></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
2323
<?xml version="1.0" encoding="UTF-8"?>
2424
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:nil="true" xsi:type="ns2:List"/></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
25-
object(stdClass)#6 (3) {
25+
object(stdClass)#%d (%d) {
2626
["varInt"]=>
2727
int(1)
2828
["varString"]=>
2929
string(4) "arg1"
3030
["child"]=>
31-
object(stdClass)#7 (3) {
31+
object(stdClass)#%d (%d) {
3232
["varInt"]=>
3333
int(2)
3434
["varString"]=>

‎ext/soap/tests/interop/Round3/GroupE/r3_groupE_list_003w.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@ $HTTP_RAW_POST_DATA = $client->__getlastrequest();
1717
include("round3_groupE_list.inc");
1818
echo "ok\n";
1919
?>
20-
--EXPECT--
20+
--EXPECTF--
2121
<?xml version="1.0" encoding="UTF-8"?>
2222
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedList><param0 xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child xsi:nil="true" xsi:type="ns2:List"/></child></child></param0></ns1:echoLinkedList></SOAP-ENV:Body></SOAP-ENV:Envelope>
2323
<?xml version="1.0" encoding="UTF-8"?>
2424
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://soapinterop.org/WSDLInteropTestRpcEnc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns2="http://soapinterop.org/xsd" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Body><ns1:echoLinkedListResponse><return xsi:type="ns2:List"><varInt xsi:type="xsd:int">1</varInt><varString xsi:type="xsd:string">arg1</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">2</varInt><varString xsi:type="xsd:string">arg2</varString><child xsi:type="ns2:List"><varInt xsi:type="xsd:int">3</varInt><varString xsi:type="xsd:string">arg3</varString><child xsi:nil="true" xsi:type="ns2:List"/></child></child></return></ns1:echoLinkedListResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
25-
object(stdClass)#7 (3) {
25+
object(stdClass)#%d (%d) {
2626
["varInt"]=>
2727
int(1)
2828
["varString"]=>
2929
string(4) "arg1"
3030
["child"]=>
31-
object(stdClass)#8 (3) {
31+
object(stdClass)#%d (%d) {
3232
["varInt"]=>
3333
int(2)
3434
["varString"]=>
3535
string(4) "arg2"
3636
["child"]=>
37-
object(stdClass)#9 (3) {
37+
object(stdClass)#%d (%d) {
3838
["varInt"]=>
3939
int(3)
4040
["varString"]=>

‎ext/soap/tests/schema/schema086.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ object(stdClass)#%d (8) {
6464
}
6565
<?xml version="1.0" encoding="UTF-8"?>
6666
<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"><dateTime xsi:type="xsd:dateTime">2023-10-14T13:37:42.123400+02:00</dateTime><time xsi:type="xsd:time">13:37:42.123400+02:00</time><date xsi:type="xsd:date">2023-10-14+02:00</date><gYearMonth xsi:type="xsd:gYearMonth">2023-10+02:00</gYearMonth><gYear xsi:type="xsd:gYear">2023+02:00</gYear><gMonthDay xsi:type="xsd:gMonthDay">--10-14+02:00</gMonthDay><gDay xsi:type="xsd:gDay">---14+02:00</gDay><gMonth xsi:type="xsd:gMonth">--10--+02:00</gMonth></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
67-
object(stdClass)#9 (8) {
67+
object(stdClass)#%d (%d) {
6868
["dateTime"]=>
6969
string(32) "2023-10-14T13:37:42.123400+02:00"
7070
["time"]=>
@@ -84,7 +84,7 @@ object(stdClass)#9 (8) {
8484
}
8585
<?xml version="1.0" encoding="UTF-8"?>
8686
<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"><dateTime xsi:type="xsd:dateTime">2023-10-14T13:37:42.123400Z</dateTime><time xsi:type="xsd:time">13:37:42.123400Z</time><date xsi:type="xsd:date">2023-10-14Z</date><gYearMonth xsi:type="xsd:gYearMonth">2023-10Z</gYearMonth><gYear xsi:type="xsd:gYear">2023Z</gYear><gMonthDay xsi:type="xsd:gMonthDay">--10-14Z</gMonthDay><gDay xsi:type="xsd:gDay">---14Z</gDay><gMonth xsi:type="xsd:gMonth">--10--Z</gMonth></testParam></ns1:test></SOAP-ENV:Body></SOAP-ENV:Envelope>
87-
object(stdClass)#8 (8) {
87+
object(stdClass)#%d (%d) {
8888
["dateTime"]=>
8989
string(27) "2023-10-14T13:37:42.123400Z"
9090
["time"]=>

0 commit comments

Comments
 (0)