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

use getenv()
---

diff --git a/sapi/cli/tests/001.phpt b/sapi/cli/tests/001.phpt
index cbf9eedf44..2270c04cfd 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 1e3b42cc19..ea2d421b65 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 8a23587840..aeb6a69472 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 4a265255d8..3b2cf0147f 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 85e2c743a1..12f46d1b40 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 db39887a1a..0ea14692d9 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 372d1059d4..ca0200ec7b 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 60fc389917..1f77a5bb2f 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 8f049b70c4..64ce1f221f 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 a2b5333858..da966f7114 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 212bcdd381..0d20d505b7 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 e1018644e6..4cf91eb935 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 b79de83edc..81b9e4c020 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 = '