Skip to content

Commit c982a4c

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: use {TMP} placeholder in phpt tests
2 parents e2f8d90 + 11740ab commit c982a4c

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

ext/opcache/tests/bug71443.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bug #71443 (Segfault using built-in webserver with intl using symfony)
33
--INI--
44
opcache.enable=1
55
opcache.enable_cli=1
6-
opcache.file_cache=/tmp/
6+
opcache.file_cache={TMP}
77
opcache.file_cache_only=1
88
--SKIPIF--
99
<?php require_once('skipif.inc'); ?>

ext/opcache/tests/bug76275.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bug #76275: Assertion failure in file cache when unserializing empty try_catch_a
33
--INI--
44
opcache.enabled=1
55
opcache.enable_cli=1
6-
opcache.file_cache=/tmp
6+
opcache.file_cache={TMP}
77
--FILE--
88
<?php
99
if (PHP_VERSION_ID >= 70000) {

ext/readline/tests/bug69054.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bug #69054 (Null dereference in readline_(read|write)_history() without paramete
33
--SKIPIF--
44
<?php if (!extension_loaded("readline") || !function_exists('readline_add_history')) die("skip"); ?>
55
--INI--
6-
open_basedir=/tmp
6+
open_basedir={TMP}
77
--FILE--
88
<?php readline_read_history(); ?>
99
==DONE==

ext/session/tests/bug32330.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Bug #32330 (session_destroy, "Failed to initialize storage module", custom sessi
66
session.use_trans_sid=0
77
session.use_cookies=1
88
session.name=sid
9-
session.save_path=/tmp
9+
session.save_path={TMP}
1010
session.gc_probability=1
1111
session.gc_divisor=1
1212
session.save_handler=files
@@ -69,17 +69,17 @@ $_SESSION['E'] = 'F';
6969

7070
?>
7171
--EXPECTF--
72-
open: path = /tmp, name = sid
72+
open: path = %s, name = sid
7373
read: id = %s
7474
gc: maxlifetime = %d
7575
write: id = %s, data = A|s:1:"B";
7676
close
77-
open: path = /tmp, name = sid
77+
open: path = %s, name = sid
7878
read: id = %s
7979
gc: maxlifetime = %d
8080
destroy: id = %s
8181
close
82-
open: path = /tmp, name = sid
82+
open: path = %s, name = sid
8383
read: id = %s
8484
gc: maxlifetime = %d
8585
write: id = %s, data = E|s:1:"F";

ext/session/tests/session_set_save_handler_sid_002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Test session_set_save_handler() function: create_sid
33
--INI--
44
session.save_handler=files
55
session.name=PHPSESSID
6-
session.save_path=/tmp
6+
session.save_path={TMP}
77
--SKIPIF--
88
<?php include('skipif.inc'); ?>
99
--FILE--

ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SQLite3::loadExtension with empty extension test
44
Jelle Lampaert
55
#Belgian Testfest 2009
66
--INI--
7-
sqlite3.extension_dir=/tmp
7+
sqlite3.extension_dir={TMP}
88
--SKIPIF--
99
<?php
1010
require_once(__DIR__ . '/skipif.inc');

ext/standard/tests/file/bug41655_1-win32.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
99
--CREDITS--
1010
Dave Kelsey <d_kelsey@uk.ibm.com>
1111
--INI--
12-
open_basedir=/tmp
12+
open_basedir={TMP}
1313
--FILE--
1414
<?php
1515
$a=glob("./*.jpeg");

ext/standard/tests/file/bug41655_1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
99
--CREDITS--
1010
Dave Kelsey <d_kelsey@uk.ibm.com>
1111
--INI--
12-
open_basedir=/tmp
12+
open_basedir={TMP}
1313
--FILE--
1414
<?php
1515
$a=glob("./*.jpeg");

0 commit comments

Comments
 (0)