Make some session tests more robust

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 460552a6203f5280de73d4950e9a8436956fa72c..456ea55dff3151369671957e20feb8bac72895d5 100644 (file)
--- 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 c0b2eb61bf103779018644909741b3ecb17076d8..7336b4ae88dbd98f5dc04caba2b580ef9b3f2ef4 100644 (file)
--- 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 5a73d6d5f56e78dd915cc81f028057a88f660afb..40474cb72efc7b1c732c6ffda789b38e5f3e6275 100644 (file)
--- 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 4d297d98f76521d9cc5fb63863113a56ab752475..bd8c18424f06a530f19a545554a4a5158500d588 100644 (file)
--- 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"]=>