Merge branch 'v1.15'

alcaeus · alcaeus · commit 7a0359dc3b4b · 2023-04-26T15:15:24.000+02:00
* v1.15: PHPC-2208: Fix fragile assertion on session IDs (#1414)
diff --git a/tests/session/session-debug-001.phpt b/tests/session/session-debug-001.phpt
@@ -23,7 +23,7 @@ object(MongoDB\Driver\Session)#%d (%d) {
     ["id"]=>
     object(MongoDB\BSON\Binary)#%d (%d) {
       ["data"]=>
-      string(16) "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c"
+      string(16) "%a"
       ["type"]=>
       int(4)
     }
diff --git a/tests/session/session-debug-002.phpt b/tests/session/session-debug-002.phpt
@@ -26,7 +26,7 @@ object(MongoDB\Driver\Session)#%d (%d) {
     ["id"]=>
     object(MongoDB\BSON\Binary)#%d (%d) {
       ["data"]=>
-      string(16) "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c"
+      string(16) "%a"
       ["type"]=>
       int(4)
     }
diff --git a/tests/session/session-debug-003.phpt b/tests/session/session-debug-003.phpt
@@ -23,7 +23,7 @@ object(MongoDB\Driver\Session)#%d (%d) {
     ["id"]=>
     object(MongoDB\BSON\Binary)#%d (%d) {
       ["data"]=>
-      string(16) "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c"
+      string(16) "%a"
       ["type"]=>
       int(4)
     }
diff --git a/tests/session/session-debug-005.phpt b/tests/session/session-debug-005.phpt
@@ -34,7 +34,7 @@ object(MongoDB\Driver\Session)#%d (%d) {
     ["id"]=>
     object(MongoDB\BSON\Binary)#%d (%d) {
       ["data"]=>
-      string(16) "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c"
+      string(16) "%a"
       ["type"]=>
       int(4)
     }
diff --git a/tests/session/session-debug-006.phpt b/tests/session/session-debug-006.phpt
@@ -32,7 +32,7 @@ object(MongoDB\Driver\Session)#%d (%d) {
     ["id"]=>
     object(MongoDB\BSON\Binary)#%d (%d) {
       ["data"]=>
-      string(16) "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c"
+      string(16) "%a"
       ["type"]=>
       int(4)
     }
diff --git a/tests/session/session-debug-007.phpt b/tests/session/session-debug-007.phpt
@@ -23,7 +23,7 @@ object(MongoDB\Driver\Session)#%d (%d) {
     ["id"]=>
     object(MongoDB\BSON\Binary)#%d (%d) {
       ["data"]=>
-      string(16) "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c"
+      string(16) "%a"
       ["type"]=>
       int(4)
     }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ object(MongoDB\Driver\Session)#%d (%d) {`
`23`	`23`	`["id"]=>`
`24`	`24`	`object(MongoDB\BSON\Binary)#%d (%d) {`
`25`	`25`	`["data"]=>`
`26`		`- string(16) "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c"`
	`26`	`+ string(16) "%a"`
`27`	`27`	`["type"]=>`
`28`	`28`	`int(4)`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ object(MongoDB\Driver\Session)#%d (%d) {`
`26`	`26`	`["id"]=>`
`27`	`27`	`object(MongoDB\BSON\Binary)#%d (%d) {`
`28`	`28`	`["data"]=>`
`29`		`- string(16) "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c"`
	`29`	`+ string(16) "%a"`
`30`	`30`	`["type"]=>`
`31`	`31`	`int(4)`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ object(MongoDB\Driver\Session)#%d (%d) {`
`34`	`34`	`["id"]=>`
`35`	`35`	`object(MongoDB\BSON\Binary)#%d (%d) {`
`36`	`36`	`["data"]=>`
`37`		`- string(16) "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c"`
	`37`	`+ string(16) "%a"`
`38`	`38`	`["type"]=>`
`39`	`39`	`int(4)`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ object(MongoDB\Driver\Session)#%d (%d) {`
`32`	`32`	`["id"]=>`
`33`	`33`	`object(MongoDB\BSON\Binary)#%d (%d) {`
`34`	`34`	`["data"]=>`
`35`		`- string(16) "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c"`
	`35`	`+ string(16) "%a"`
`36`	`36`	`["type"]=>`
`37`	`37`	`int(4)`
`38`	`38`	`}`