use getenv()

diff --git a/sapi/cli/tests/001.phpt b/sapi/cli/tests/001.phpt
index 0adb5c678842f039be0318c153fd2b0dbfc2016d..6fbd608a6fbf4b12086df879b8dc37c94f0f660f 100644 (file)
--- a/sapi/cli/tests/001.phpt
+++ b/sapi/cli/tests/001.phpt
@@ -5,7 +5,7 @@ version string
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 var_dump(`$php -n -v`);
 

diff --git a/sapi/cli/tests/002.phpt b/sapi/cli/tests/002.phpt
index 4217cab13a7ea1bbc27e74bfe35854d0c10f33d1..be2b6331b31ce9b965acb5d58ae2f2c0ddcbfd6b 100644 (file)
--- a/sapi/cli/tests/002.phpt
+++ b/sapi/cli/tests/002.phpt
@@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 var_dump(`$php -n -r 'var_dump("hello");'`);
 

diff --git a/sapi/cli/tests/003.phpt b/sapi/cli/tests/003.phpt
index c11bc1d22122287b9fde78afb0218026e8d94aca..d62360e1f6fa33a52daae58a08d2d51445bdb4cb 100644 (file)
--- a/sapi/cli/tests/003.phpt
+++ b/sapi/cli/tests/003.phpt
@@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 var_dump(`$php -n -d max_execution_time=111 -r 'var_dump(ini_get("max_execution_time"));'`);
 var_dump(`$php -n -d max_execution_time=500 -r 'var_dump(ini_get("max_execution_time"));'`);

diff --git a/sapi/cli/tests/004.phpt b/sapi/cli/tests/004.phpt
index 69eacc6a43cbd6ae4ee00c28bf5786032fa87516..b6630f39e7f39ce2bebc99545941fdb9899fc14c 100644 (file)
--- a/sapi/cli/tests/004.phpt
+++ b/sapi/cli/tests/004.phpt
@@ -5,7 +5,7 @@ show information about function
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 var_dump(`$php -n --rf unknown`);
 var_dump(`$php -n --rf echo`);

diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt
index 018304f3c63d851c326d2c29ecf147260aab99ed..ef550c6bb6e375f45eb6aaa6f6e753545d7f6c98 100644 (file)
--- a/sapi/cli/tests/005.phpt
+++ b/sapi/cli/tests/005.phpt
@@ -5,7 +5,7 @@ show information about class
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 var_dump(`$php -n --rc unknown`);
 var_dump(`$php -n --rc stdclass`);

diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index 71c08a53ced9ccf14b924779567e786f5f681200..f8577b11fb47db89978b11cdb84bde281a8471bb 100644 (file)
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -5,7 +5,7 @@ show information about extension
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 var_dump(`$php -n --re unknown`);
 var_dump(`$php -n --re ""`);

diff --git a/sapi/cli/tests/007.phpt b/sapi/cli/tests/007.phpt
index 44d9e78dbbe1c21f1f373f95bb8a09de05a01852..12fddee01df72a61fadb84eab1570108f2962212 100644 (file)
--- a/sapi/cli/tests/007.phpt
+++ b/sapi/cli/tests/007.phpt
@@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 $filename = dirname(__FILE__).'/007.test.php';
 $code ='

diff --git a/sapi/cli/tests/008.phpt b/sapi/cli/tests/008.phpt
index e897b7b8de220848fd9b7c52d8d2f13e33942e39..a833043096d45a504e7c231f872c8e713809f2a7 100644 (file)
--- a/sapi/cli/tests/008.phpt
+++ b/sapi/cli/tests/008.phpt
@@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 $filename = dirname(__FILE__).'/008.test.php';
 $code ='

diff --git a/sapi/cli/tests/009.phpt b/sapi/cli/tests/009.phpt
index 7ff8b7a4fb7fa18ae1e32ba2db9cdfc71f3544a5..d476f8d64496002cd5594d96789ead56e90b3d24 100644 (file)
--- a/sapi/cli/tests/009.phpt
+++ b/sapi/cli/tests/009.phpt
@@ -5,7 +5,7 @@ using invalid combinations of cmdline options
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 var_dump(`$php -n -c -r 'echo hello;'`);
 var_dump(`$php -n -a -r 'echo hello;'`);

diff --git a/sapi/cli/tests/010-2.phpt b/sapi/cli/tests/010-2.phpt
index 54f09342fe7bf08a876aca24602031c2bcb72289..bd33d2cc94331680512e9e74aaa36b1701c83f5e 100644 (file)
--- a/sapi/cli/tests/010-2.phpt
+++ b/sapi/cli/tests/010-2.phpt
@@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 $filename_txt = dirname(__FILE__)."/010.test.txt";
 

diff --git a/sapi/cli/tests/010.phpt b/sapi/cli/tests/010.phpt
index 7089632639d6c3d886e5501a0fe11f64b674960f..e465e37973fced000f76740f6bb53f3aeaf846a4 100644 (file)
--- a/sapi/cli/tests/010.phpt
+++ b/sapi/cli/tests/010.phpt
@@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 $filename = dirname(__FILE__)."/010.test.php";
 $filename_txt = dirname(__FILE__)."/010.test.txt";

diff --git a/sapi/cli/tests/011.phpt b/sapi/cli/tests/011.phpt
index 271d8524670f38b1f1ae05d0363ed797dda853b5..e78057a1ef270edd1e270d03d832e75951d9fa96 100644 (file)
--- a/sapi/cli/tests/011.phpt
+++ b/sapi/cli/tests/011.phpt
@@ -5,7 +5,7 @@ syntax check
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 $filename = dirname(__FILE__)."/011.test.php";
 

diff --git a/sapi/cli/tests/012.phpt b/sapi/cli/tests/012.phpt
index 3102c0957a9179f90d4c0d3529904f8828beb91a..7dab58c6c06f79155937fb8e51ae26a7476e9abd 100644 (file)
--- a/sapi/cli/tests/012.phpt
+++ b/sapi/cli/tests/012.phpt
@@ -5,7 +5,7 @@ invalid arguments and error messages
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 var_dump(`"$php" -n -F some.php -F some.php`);
 var_dump(`"$php" -n -F some.php -R some.php`);

diff --git a/sapi/cli/tests/013.phpt b/sapi/cli/tests/013.phpt
index dfd332b23ab56477405e07734bcb19d626c0a4a5..99bfe5e7bb07f578be86d6ea565bc604f0a29107 100644 (file)
--- a/sapi/cli/tests/013.phpt
+++ b/sapi/cli/tests/013.phpt
@@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 $filename_txt = dirname(__FILE__)."/013.test.txt";
 file_put_contents($filename_txt, "test\nfile\ncontents\n");

diff --git a/sapi/cli/tests/014.phpt b/sapi/cli/tests/014.phpt
index 5c4d75a1d6e00e70c8fae21cb2286728c8c433af..202bbac476829281d587c6d5df40162d29bcc720 100644 (file)
--- a/sapi/cli/tests/014.phpt
+++ b/sapi/cli/tests/014.phpt
@@ -5,7 +5,7 @@ syntax highlighting
 --FILE--
 <?php
 
-$php = $_ENV['TEST_PHP_EXECUTABLE'];
+$php = getenv('TEST_PHP_EXECUTABLE');
 
 $filename = dirname(__FILE__)."/014.test.php";
 $code = '