use getenv()

diff --git a/sapi/cli/tests/001.phpt b/sapi/cli/tests/001.phpt
index cbf9eedf44f377070849ccc60c5c144e0d56bce0..2270c04cfdd7c9d81cca6856782bd06d22113d7f 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 1e3b42cc193f7dac01db1bba35ae67c8ec868626..ea2d421b6595352a9d67cdff67def586129dd647 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 8a23587840a725c7cd3f9661fa19ee139ac84321..aeb6a694721c9a61412d0d7471513232c219e0ee 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 4a265255d81cd9c13492a961aa184925cc020889..3b2cf0147ff09355bb3fe15c35eadbae9bb4f02a 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 85e2c743a169e1432293a81c048eb6baa609d718..12f46d1b40ce7b464eeffa9dbe9abd02c162c8b5 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 db39887a1ae7b6504f8d60ea92a7f8be138440c2..0ea14692d9efd9250172f52201ea6e67b87c25df 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 372d1059d4865df5365f683558d5a270c24ad7b6..ca0200ec7bc09cb568afffd2a86d4b9864fddf1e 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 60fc3899171cca978446f529d54e8a58a7e8153d..1f77a5bb2f8587c44ef2a5f1b76cbc362c35bf8f 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 8f049b70c45545c6943b81898ec49d21bec94490..64ce1f221fece7210807c4772fac601a77373bbe 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 a2b5333858d800494f3c7851f31e4fc1c12343c1..da966f7114fa9daf6a7aaebd03eba3db2ec46d5f 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 212bcdd38138f2f56b159891ea797909a55de5eb..0d20d505b7ae5427fef662464669abfd20074fd3 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 e1018644e6b7bba8d007f5253352de24d78c04b8..4cf91eb935a40b6ceeb4bda28e2f6e9900c5b61e 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 b79de83edce388a194b4915cc06904e37a0887ea..81b9e4c0205cb98c834106feb4b1f884a6809e1a 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 = '