Make some session tests more robust

Fabien Villepinte · cmb69 · commit 7e8f11531ebe · 2019-09-16T15:20:32.000+02:00
diff --git a/ext/session/tests/session_set_save_handler_class_017.phpt b/ext/session/tests/session_set_save_handler_class_017.phpt
@@ -55,7 +55,7 @@ class MySession2 extends SessionHandler {
 	}
 
 	public function create_sid() {
-		return 'my_sid';
+		return pathinfo(__FILE__)['filename'];
 	}
 }
 
@@ -72,12 +72,12 @@ session_unset();
 
 session_start();
 var_dump($_SESSION);
-
-session_write_close();
-session_unset();
---EXPECTF--
+--CLEAN--
+<?php
+@unlink(session_save_path().'/u_sess_PHPSESSIDsession_set_save_handler_class_017');
+--EXPECT--
 *** Testing session_set_save_handler() function: class with create_sid ***
-string(%d) "my_sid"
+string(34) "session_set_save_handler_class_017"
 string(4) "user"
 array(1) {
   ["foo"]=>
diff --git a/ext/session/tests/session_set_save_handler_class_018.phpt b/ext/session/tests/session_set_save_handler_class_018.phpt
@@ -34,7 +34,7 @@ class MySession2 extends SessionHandler {
 	}
 
 	public function read($id) {
-		return @file_get_contents($this->path . $id);
+		return (string)@file_get_contents($this->path . $id);
 	}
 
 	public function write($id, $data) {
@@ -55,11 +55,11 @@ class MySession2 extends SessionHandler {
 	}
 
 	public function create_sid() {
-		return 'my_sid';
+		return pathinfo(__FILE__)['filename'];
 	}
 
 	public function validate_sid($id) {
-		return 'my_sid'===$id;
+		return pathinfo(__FILE__)['filename']===$id;
 	}
 }
 
@@ -76,12 +76,12 @@ session_unset();
 
 session_start();
 var_dump($_SESSION);
-
-session_write_close();
-session_unset();
---EXPECTF--
+--CLEAN--
+<?php
+@unlink(session_save_path().'/u_sess_PHPSESSIDsession_set_save_handler_class_018');
+--EXPECT--
 *** Testing session_set_save_handler() function: class with validate_sid ***
-string(%d) "my_sid"
+string(34) "session_set_save_handler_class_018"
 string(4) "user"
 array(1) {
   ["foo"]=>
diff --git a/ext/session/tests/session_set_save_handler_iface_003.phpt b/ext/session/tests/session_set_save_handler_iface_003.phpt
@@ -34,7 +34,7 @@ class MySession2 implements SessionHandlerInterface, SessionIdInterface {
 	}
 
 	public function read($id) {
-		return @file_get_contents($this->path . $id);
+		return (string)@file_get_contents($this->path . $id);
 	}
 
 	public function write($id, $data) {
@@ -56,7 +56,7 @@ class MySession2 implements SessionHandlerInterface, SessionIdInterface {
 	}
 
 	public function create_sid() {
-		return 'my_sid';
+		return pathinfo(__FILE__)['filename'];
 	}
 }
 
@@ -73,12 +73,12 @@ session_unset();
 
 session_start();
 var_dump($_SESSION);
-
-session_write_close();
-session_unset();
---EXPECTF--
+--CLEAN--
+<?php
+@unlink(session_save_path().'/u_sess_PHPSESSIDsession_set_save_handler_iface_003');
+--EXPECT--
 *** Testing session_set_save_handler() function: id interface ***
-string(%d) "my_sid"
+string(34) "session_set_save_handler_iface_003"
 string(4) "user"
 array(1) {
   ["foo"]=>
diff --git a/ext/session/tests/session_set_save_handler_sid_001.phpt b/ext/session/tests/session_set_save_handler_sid_001.phpt
@@ -28,7 +28,7 @@ class MySession2 {
 	}
 
 	public function read($id) {
-		return @file_get_contents($this->path . $id);
+		return (string)@file_get_contents($this->path . $id);
 	}
 
 	public function write($id, $data) {
@@ -50,7 +50,7 @@ class MySession2 {
 	}
 
 	public function create_sid() {
-		return 'my_sid';
+		return pathinfo(__FILE__)['filename'];
 	}
 }
 
@@ -68,12 +68,12 @@ session_unset();
 
 session_start();
 var_dump($_SESSION);
-
-session_write_close();
-session_unset();
---EXPECTF--
+--CLEAN--
+<?php
+@unlink(session_save_path().'/u_sess_PHPSESSIDsession_set_save_handler_sid_001');
+--EXPECT--
 *** Testing session_set_save_handler() function: create_sid ***
-string(%d) "my_sid"
+string(32) "session_set_save_handler_sid_001"
 string(4) "user"
 array(1) {
   ["foo"]=>

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class MySession2 extends SessionHandler {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public function read($id) {`
`37`		`- return @file_get_contents($this->path . $id);`
	`37`	`+ return (string)@file_get_contents($this->path . $id);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public function write($id, $data) {`
`@@ -55,11 +55,11 @@ class MySession2 extends SessionHandler {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public function create_sid() {`
`58`		`- return 'my_sid';`
	`58`	`+ return pathinfo(__FILE__)['filename'];`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public function validate_sid($id) {`
`62`		`- return 'my_sid'===$id;`
	`62`	`+ return pathinfo(__FILE__)['filename']===$id;`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`@@ -76,12 +76,12 @@ session_unset();`
`76`	`76`
`77`	`77`	`session_start();`
`78`	`78`	`var_dump($_SESSION);`
`79`		`-`
`80`		`-session_write_close();`
`81`		`-session_unset();`
`82`		`---EXPECTF--`
	`79`	`+--CLEAN--`
	`80`	`+<?php`
	`81`	`+@unlink(session_save_path().'/u_sess_PHPSESSIDsession_set_save_handler_class_018');`
	`82`	`+--EXPECT--`
`83`	`83`	`* Testing session_set_save_handler() function: class with validate_sid *`
`84`		`-string(%d) "my_sid"`
	`84`	`+string(34) "session_set_save_handler_class_018"`
`85`	`85`	`string(4) "user"`
`86`	`86`	`array(1) {`
`87`	`87`	`["foo"]=>`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class MySession2 implements SessionHandlerInterface, SessionIdInterface {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public function read($id) {`
`37`		`- return @file_get_contents($this->path . $id);`
	`37`	`+ return (string)@file_get_contents($this->path . $id);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public function write($id, $data) {`
`@@ -56,7 +56,7 @@ class MySession2 implements SessionHandlerInterface, SessionIdInterface {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public function create_sid() {`
`59`		`- return 'my_sid';`
	`59`	`+ return pathinfo(__FILE__)['filename'];`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`@@ -73,12 +73,12 @@ session_unset();`
`73`	`73`
`74`	`74`	`session_start();`
`75`	`75`	`var_dump($_SESSION);`
`76`		`-`
`77`		`-session_write_close();`
`78`		`-session_unset();`
`79`		`---EXPECTF--`
	`76`	`+--CLEAN--`
	`77`	`+<?php`
	`78`	`+@unlink(session_save_path().'/u_sess_PHPSESSIDsession_set_save_handler_iface_003');`
	`79`	`+--EXPECT--`
`80`	`80`	`* Testing session_set_save_handler() function: id interface *`
`81`		`-string(%d) "my_sid"`
	`81`	`+string(34) "session_set_save_handler_iface_003"`
`82`	`82`	`string(4) "user"`
`83`	`83`	`array(1) {`
`84`	`84`	`["foo"]=>`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class MySession2 {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public function read($id) {`
`31`		`- return @file_get_contents($this->path . $id);`
	`31`	`+ return (string)@file_get_contents($this->path . $id);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public function write($id, $data) {`
`@@ -50,7 +50,7 @@ class MySession2 {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public function create_sid() {`
`53`		`- return 'my_sid';`
	`53`	`+ return pathinfo(__FILE__)['filename'];`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`@@ -68,12 +68,12 @@ session_unset();`
`68`	`68`
`69`	`69`	`session_start();`
`70`	`70`	`var_dump($_SESSION);`
`71`		`-`
`72`		`-session_write_close();`
`73`		`-session_unset();`
`74`		`---EXPECTF--`
	`71`	`+--CLEAN--`
	`72`	`+<?php`
	`73`	`+@unlink(session_save_path().'/u_sess_PHPSESSIDsession_set_save_handler_sid_001');`
	`74`	`+--EXPECT--`
`75`	`75`	`* Testing session_set_save_handler() function: create_sid *`
`76`		`-string(%d) "my_sid"`
	`76`	`+string(32) "session_set_save_handler_sid_001"`
`77`	`77`	`string(4) "user"`
`78`	`78`	`array(1) {`
`79`	`79`	`["foo"]=>`