diff options
Diffstat (limited to 'ext/session')
15 files changed, 16 insertions, 16 deletions
diff --git a/ext/session/tests/bug42596.phpt b/ext/session/tests/bug42596.phpt index 6902d124b4..adc1503949 100644 --- a/ext/session/tests/bug42596.phpt +++ b/ext/session/tests/bug42596.phpt @@ -15,7 +15,7 @@ session.serialize_handler=php session.save_handler=files --FILE-- <?php -$sessdir = dirname(__FILE__).'/sessions/'; +$sessdir = __DIR__.'/sessions/'; @rmdir($sessdir); mkdir($sessdir); $save_path = '0;0777;'.$sessdir; diff --git a/ext/session/tests/session_basic1.phpt b/ext/session/tests/session_basic1.phpt index fbce0890c4..658c8e7287 100644 --- a/ext/session/tests/session_basic1.phpt +++ b/ext/session/tests/session_basic1.phpt @@ -25,7 +25,7 @@ echo "*** Testing basic session functionality : variation1 ***\n"; $session_id = 'testid'; session_id($session_id); -$path = dirname(__FILE__); +$path = __DIR__; var_dump(session_save_path($path)); echo "*** Without lazy_write ***\n"; diff --git a/ext/session/tests/session_basic2.phpt b/ext/session/tests/session_basic2.phpt index bafe3454eb..30ac946c1e 100644 --- a/ext/session/tests/session_basic2.phpt +++ b/ext/session/tests/session_basic2.phpt @@ -27,7 +27,7 @@ echo "*** Testing basic session functionality : variation2 ***\n"; $session_id = 'testid'; session_id($session_id); -$path = dirname(__FILE__); +$path = __DIR__; var_dump(session_save_path($path)); echo "*** Without lazy_write ***\n"; diff --git a/ext/session/tests/session_module_name_variation4.phpt b/ext/session/tests/session_module_name_variation4.phpt index 00e6975045..303a5f8939 100644 --- a/ext/session/tests/session_module_name_variation4.phpt +++ b/ext/session/tests/session_module_name_variation4.phpt @@ -20,7 +20,7 @@ ob_start(); echo "*** Testing session_module_name() : variation ***\n"; require_once "save_handler.inc"; -$path = dirname(__FILE__); +$path = __DIR__; session_save_path($path); session_module_name("files"); diff --git a/ext/session/tests/session_regenerate_id_cookie.phpt b/ext/session/tests/session_regenerate_id_cookie.phpt index 9558beb814..c3c5464860 100644 --- a/ext/session/tests/session_regenerate_id_cookie.phpt +++ b/ext/session/tests/session_regenerate_id_cookie.phpt @@ -26,7 +26,7 @@ require __DIR__.'/../../../sapi/cgi/tests/include.inc'; $php = get_cgi_path(); reset_env_vars(); -$file = dirname(__FILE__)."/session_regenerate_id_cookie.test.php"; +$file = __DIR__."/session_regenerate_id_cookie.test.php"; file_put_contents($file, '<?php ob_start(); diff --git a/ext/session/tests/session_save_path_basic.phpt b/ext/session/tests/session_save_path_basic.phpt index 4db8effdaa..15027631cc 100644 --- a/ext/session/tests/session_save_path_basic.phpt +++ b/ext/session/tests/session_save_path_basic.phpt @@ -19,7 +19,7 @@ ob_start(); echo "*** Testing session_save_path() : error functionality ***\n"; -$directory = dirname(__FILE__); +$directory = __DIR__; var_dump(session_save_path()); var_dump(session_save_path($directory)); var_dump(session_save_path()); diff --git a/ext/session/tests/session_save_path_variation1.phpt b/ext/session/tests/session_save_path_variation1.phpt index 75533c8100..20ed9301ce 100644 --- a/ext/session/tests/session_save_path_variation1.phpt +++ b/ext/session/tests/session_save_path_variation1.phpt @@ -20,7 +20,7 @@ ob_start(); echo "*** Testing session_save_path() : variation ***\n"; -$directory = dirname(__FILE__); +$directory = __DIR__; var_dump(session_save_path()); var_dump(session_save_path($directory)); var_dump(session_save_path()); diff --git a/ext/session/tests/session_save_path_variation5.phpt b/ext/session/tests/session_save_path_variation5.phpt index 5d93a573b2..557634c903 100644 --- a/ext/session/tests/session_save_path_variation5.phpt +++ b/ext/session/tests/session_save_path_variation5.phpt @@ -20,7 +20,7 @@ ob_start(); */ echo "*** Testing session_save_path() : variation ***\n"; -$directory = dirname(__FILE__); +$directory = __DIR__; $sessions = ($directory."/sessions"); chdir($directory); @@ -40,7 +40,7 @@ echo "Done"; ob_end_flush(); ?> --CLEAN-- -$directory = dirname(__FILE__); +$directory = __DIR__; $sessions = ($directory."/sessions"); var_dump(rmdir($sessions)); --EXPECTF-- diff --git a/ext/session/tests/session_set_save_handler_basic.phpt b/ext/session/tests/session_set_save_handler_basic.phpt index bf77e77a6e..c1c763f68b 100644 --- a/ext/session/tests/session_set_save_handler_basic.phpt +++ b/ext/session/tests/session_set_save_handler_basic.phpt @@ -26,7 +26,7 @@ var_dump(session_module_name(FALSE)); var_dump(session_module_name("blah")); var_dump(session_module_name("foo")); -$path = dirname(__FILE__); +$path = __DIR__; session_save_path($path); session_set_save_handler("open", "close", "read", "write", "destroy", "gc"); diff --git a/ext/session/tests/session_set_save_handler_closures.phpt b/ext/session/tests/session_set_save_handler_closures.phpt index 77bbf6caff..e490e1780e 100644 --- a/ext/session/tests/session_set_save_handler_closures.phpt +++ b/ext/session/tests/session_set_save_handler_closures.phpt @@ -25,7 +25,7 @@ var_dump(session_module_name(FALSE)); var_dump(session_module_name("blah")); var_dump(session_module_name("foo")); -$path = dirname(__FILE__); +$path = __DIR__; session_save_path($path); session_set_save_handler($open_closure, $close_closure, $read_closure, $write_closure, $destroy_closure, $gc_closure); diff --git a/ext/session/tests/session_set_save_handler_variation2.phpt b/ext/session/tests/session_set_save_handler_variation2.phpt index 251b042d02..a4e1cdfa6d 100644 --- a/ext/session/tests/session_set_save_handler_variation2.phpt +++ b/ext/session/tests/session_set_save_handler_variation2.phpt @@ -16,7 +16,7 @@ ob_start(); echo "*** Testing session_set_save_handler() : variation ***\n"; require_once "save_handler.inc"; -$path = dirname(__FILE__); +$path = __DIR__; session_save_path($path); var_dump(session_start()); var_dump(session_set_save_handler("open", "close", "read", "write", "destroy", "gc")); diff --git a/ext/session/tests/session_set_save_handler_variation3.phpt b/ext/session/tests/session_set_save_handler_variation3.phpt index 9af87dd170..90c270c644 100644 --- a/ext/session/tests/session_set_save_handler_variation3.phpt +++ b/ext/session/tests/session_set_save_handler_variation3.phpt @@ -18,7 +18,7 @@ ob_start(); echo "*** Testing session_set_save_handler() : variation ***\n"; require_once "save_handler.inc"; -$path = dirname(__FILE__); +$path = __DIR__; var_dump(session_status()); session_save_path($path); var_dump(session_set_save_handler("open", "close", "read", "write", "destroy", "gc")); diff --git a/ext/session/tests/session_set_save_handler_variation4.phpt b/ext/session/tests/session_set_save_handler_variation4.phpt index 3fb18d9bf8..bf74385839 100644 --- a/ext/session/tests/session_set_save_handler_variation4.phpt +++ b/ext/session/tests/session_set_save_handler_variation4.phpt @@ -29,7 +29,7 @@ function noisy_gc($maxlifetime) { } require_once "save_handler.inc"; -$path = dirname(__FILE__); +$path = __DIR__; session_save_path($path); session_set_save_handler("open", "close", "read", "write", "destroy", "noisy_gc"); diff --git a/ext/session/tests/session_set_save_handler_variation5.phpt b/ext/session/tests/session_set_save_handler_variation5.phpt index aac9cc4e99..23847aadf4 100644 --- a/ext/session/tests/session_set_save_handler_variation5.phpt +++ b/ext/session/tests/session_set_save_handler_variation5.phpt @@ -30,7 +30,7 @@ function noisy_gc($maxlifetime) { echo "*** Testing session_set_save_handler() : variation ***\n"; require_once "save_handler.inc"; -$path = dirname(__FILE__); +$path = __DIR__; var_dump(session_save_path($path)); echo "*** Without lazy_write ***\n"; diff --git a/ext/session/tests/session_set_save_handler_variation6.phpt b/ext/session/tests/session_set_save_handler_variation6.phpt index 244a71ca13..7a37198c70 100644 --- a/ext/session/tests/session_set_save_handler_variation6.phpt +++ b/ext/session/tests/session_set_save_handler_variation6.phpt @@ -23,7 +23,7 @@ ob_start(); echo "*** Testing session_set_save_handler() : test write short circuit ***\n"; require_once "save_handler.inc"; -$path = dirname(__FILE__); +$path = __DIR__; session_save_path($path); session_set_save_handler("open", "close", "read", "write", "destroy", "gc", "create_sid", "validate_sid", "update"); |