Fix PHPT ENV sections

run-tests.php assumes the contents of an ENV section are a simple list
of key-value-pairs, instead of evaluating the section contents as PHP
script which server-tests.php did.  Since server-tests.php is gone, we
remove the superfluous and confusing scripting.

diff --git a/ext/filter/tests/bug49184.phpt b/ext/filter/tests/bug49184.phpt
index 86d35db0d5bd71ef899a04f93bd7f6976836f425..8ed142d73ad5cb326554f3b49163f7e9ba741b0d 100644 (file)
--- a/ext/filter/tests/bug49184.phpt
+++ b/ext/filter/tests/bug49184.phpt
@@ -5,9 +5,7 @@ See Bug #49184
 --SKIPIF--
 <?php if (!extension_loaded("filter")) die("skip needs filter ext"); ?>
 --ENV--
-return <<<END
 HTTP_X_FORWARDED_FOR=example.com
-END;
 --FILE--
 <?php
   var_dump(filter_input(INPUT_SERVER, "HTTP_X_FORWARDED_FOR", FILTER_UNSAFE_RAW));

diff --git a/ext/snmp/tests/snmp2_set-nomib.phpt b/ext/snmp/tests/snmp2_set-nomib.phpt
index af0baa3fdde0e36d4510513211a7ab1b9c8b13b8..e1714d6ab9d8615d41392fe4f6376357512bfda7 100644 (file)
--- a/ext/snmp/tests/snmp2_set-nomib.phpt
+++ b/ext/snmp/tests/snmp2_set-nomib.phpt
@@ -7,9 +7,7 @@ Boris Lytockin
 require_once(dirname(__FILE__).'/skipif.inc');
 ?>
 --ENV--
-return <<<END
 MIBS=
-END;
 --FILE--
 <?php
 require_once(dirname(__FILE__).'/snmp_include.inc');

diff --git a/ext/snmp/tests/snmpset-nomib.phpt b/ext/snmp/tests/snmpset-nomib.phpt
index 7428e57c788290a74261916f0a302c9de0b60c21..7b72bff979281271230ac211f6e72b2db0f5a41d 100644 (file)
--- a/ext/snmp/tests/snmpset-nomib.phpt
+++ b/ext/snmp/tests/snmpset-nomib.phpt
@@ -7,9 +7,7 @@ Boris Lytochkin
 require_once(dirname(__FILE__).'/skipif.inc');
 ?>
 --ENV--
-return <<<END
 MIBS=
-END;
 --FILE--
 <?php
 require_once(dirname(__FILE__).'/snmp_include.inc');