From 61330b0faf5dfbed79cba012744dabce9d20cc8f Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sat, 6 Oct 2018 12:01:22 +0200
Subject: [PATCH] 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.
---
 ext/filter/tests/bug49184.phpt      | 2 --
 ext/snmp/tests/snmp2_set-nomib.phpt | 2 --
 ext/snmp/tests/snmpset-nomib.phpt   | 2 --
 3 files changed, 6 deletions(-)

diff --git a/ext/filter/tests/bug49184.phpt b/ext/filter/tests/bug49184.phpt
index 86d35db0d5b..8ed142d73ad 100644
--- 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 af0baa3fdde..e1714d6ab9d 100644
--- 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 7428e57c788..7b72bff9792 100644
--- 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');