From 7e8f11531ebe26ebf5c9a7c823865660f0607c99 Mon Sep 17 00:00:00 2001
From: Fabien Villepinte <fabien.villepinte@displayce.com>
Date: Mon, 16 Sep 2019 10:43:39 +0200
Subject: [PATCH] Make some session tests more robust

---
 .../session_set_save_handler_class_017.phpt      | 12 ++++++------
 .../session_set_save_handler_class_018.phpt      | 16 ++++++++--------
 .../session_set_save_handler_iface_003.phpt      | 14 +++++++-------
 .../tests/session_set_save_handler_sid_001.phpt  | 14 +++++++-------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/ext/session/tests/session_set_save_handler_class_017.phpt b/ext/session/tests/session_set_save_handler_class_017.phpt
index 460552a620..456ea55dff 100644
--- 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
index c0b2eb61bf..7336b4ae88 100644
--- 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
index 5a73d6d5f5..40474cb72e 100644
--- 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
index 4d297d98f7..bd8c18424f 100644
--- 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"]=>
-- 
2.40.0