From: Antony Dovgal <tony2001@php.net>
Date: Sat, 20 Jan 2007 22:12:55 +0000 (+0000)
Subject: use getenv()
X-Git-Tag: RELEASE_1_2_3~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b002cf39f9f1d155624e3bd410b94a3260b436b;p=php

use getenv()
---

diff --git a/sapi/cli/tests/001.phpt b/sapi/cli/tests/001.phpt
index 0adb5c6788..6fbd608a6f 100644
--- 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 4217cab13a..be2b6331b3 100644
--- 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 c11bc1d221..d62360e1f6 100644
--- 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 69eacc6a43..b6630f39e7 100644
--- 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 018304f3c6..ef550c6bb6 100644
--- 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 71c08a53ce..f8577b11fb 100644
--- 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 44d9e78dbb..12fddee01d 100644
--- 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 e897b7b8de..a833043096 100644
--- 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 7ff8b7a4fb..d476f8d644 100644
--- 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 54f09342fe..bd33d2cc94 100644
--- 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 7089632639..e465e37973 100644
--- 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 271d852467..e78057a1ef 100644
--- 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 3102c0957a..7dab58c6c0 100644
--- 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 dfd332b23a..99bfe5e7bb 100644
--- 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 5c4d75a1d6..202bbac476 100644
--- 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 = '