From 491c43cf2e969b03d39e459b9c9f4ab6e8282e91 Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Tue, 6 Dec 2005 19:15:02 +0000
Subject: nuke erroneous --ENV-- tag add new tests for oci_bind_array_by_name()

---
 ext/oci8/tests/array_bind_date.phpt                |  74 +++++++++++++++++++++
 ext/oci8/tests/array_bind_float.phpt               |  74 +++++++++++++++++++++
 ext/oci8/tests/array_bind_int.phpt                 |  74 +++++++++++++++++++++
 ext/oci8/tests/array_bind_str.phpt                 |  74 +++++++++++++++++++++
 ext/oci8/tests/bind_empty.phpt                     |   7 +-
 ext/oci8/tests/bug26133.phpt                       |   7 +-
 ext/oci8/tests/bug27303.phpt                       |   7 +-
 ext/oci8/tests/bug27303_2.phpt                     |   7 +-
 ext/oci8/tests/bug27303_3.phpt                     |   7 +-
 ext/oci8/tests/bug27303_4.phpt                     |   7 +-
 ext/oci8/tests/bug32325.phpt                       |   7 +-
 ext/oci8/tests/close.phpt                          |   7 +-
 ext/oci8/tests/coll_001.phpt                       |   8 +--
 ext/oci8/tests/coll_002.phpt                       |   8 +--
 ext/oci8/tests/coll_002_func.phpt                  |   8 +--
 ext/oci8/tests/coll_003.phpt                       |   8 +--
 ext/oci8/tests/coll_003_func.phpt                  |   8 +--
 ext/oci8/tests/coll_004.phpt                       |   8 +--
 ext/oci8/tests/coll_004_func.phpt                  |   8 +--
 ext/oci8/tests/coll_005.phpt                       |   8 +--
 ext/oci8/tests/coll_006.phpt                       |   8 +--
 ext/oci8/tests/coll_006_func.phpt                  |   8 +--
 ext/oci8/tests/coll_007.phpt                       |   8 +--
 ext/oci8/tests/coll_008.phpt                       |   8 +--
 ext/oci8/tests/coll_009.phpt                       |   8 +--
 ext/oci8/tests/coll_009_func.phpt                  |   8 +--
 ext/oci8/tests/coll_010.phpt                       |   8 +--
 ext/oci8/tests/coll_010_func.phpt                  |   8 +--
 ext/oci8/tests/coll_011.phpt                       |   8 +--
 ext/oci8/tests/coll_011_func.phpt                  |   8 +--
 ext/oci8/tests/coll_012.phpt                       |   8 +--
 ext/oci8/tests/coll_012_func.phpt                  |   8 +--
 ext/oci8/tests/coll_013.phpt                       |   8 +--
 ext/oci8/tests/coll_013_func.phpt                  |   8 +--
 ext/oci8/tests/coll_014.phpt                       |   8 +--
 ext/oci8/tests/coll_014_func.phpt                  |   8 +--
 ext/oci8/tests/coll_015.phpt                       |   8 +--
 ext/oci8/tests/coll_015_func.phpt                  |   8 +--
 ext/oci8/tests/coll_016.phpt                       |   8 +--
 ext/oci8/tests/coll_016_func.phpt                  |   8 +--
 ext/oci8/tests/coll_017.phpt                       |   8 +--
 ext/oci8/tests/coll_017_func.phpt                  |   8 +--
 ext/oci8/tests/commit.phpt                         |   7 +-
 ext/oci8/tests/commit_old.phpt                     |   7 +-
 ext/oci8/tests/connect.phpt                        |   7 +-
 ext/oci8/tests/connect_1.phpt                      |   7 +-
 ext/oci8/tests/connect_1_old.phpt                  |   7 +-
 ext/oci8/tests/connect_old.phpt                    |   7 +-
 ext/oci8/tests/connect_without_oracle_home.phpt    |   2 +-
 .../tests/connect_without_oracle_home_old.phpt     |   2 +-
 ext/oci8/tests/cursor_bind_err.phpt                |   7 +-
 ext/oci8/tests/cursors.phpt                        |   7 +-
 ext/oci8/tests/cursors_old.phpt                    |   7 +-
 ext/oci8/tests/debug.phpt                          |   7 +-
 ext/oci8/tests/default_prefetch.phpt               |   7 +-
 ext/oci8/tests/default_prefetch1.phpt              |   7 +-
 ext/oci8/tests/default_prefetch2.phpt              |   7 +-
 ext/oci8/tests/define.phpt                         |   7 +-
 ext/oci8/tests/define_old.phpt                     |   7 +-
 ext/oci8/tests/error.phpt                          |   7 +-
 ext/oci8/tests/error1.phpt                         |   7 +-
 ext/oci8/tests/error_old.phpt                      |   7 +-
 ext/oci8/tests/exec_fetch.phpt                     |   7 +-
 ext/oci8/tests/fetch.phpt                          |   7 +-
 ext/oci8/tests/fetch_all.phpt                      |   7 +-
 ext/oci8/tests/fetch_array.phpt                    |   7 +-
 ext/oci8/tests/fetch_assoc.phpt                    |   7 +-
 ext/oci8/tests/fetch_into.phpt                     |   7 +-
 ext/oci8/tests/fetch_into1.phpt                    |   7 +-
 ext/oci8/tests/fetch_into2.phpt                    |   7 +-
 ext/oci8/tests/fetch_object.phpt                   |   7 +-
 ext/oci8/tests/fetch_row.phpt                      |   7 +-
 ext/oci8/tests/field_funcs.phpt                    |   7 +-
 ext/oci8/tests/field_funcs_old.phpt                |   7 +-
 ext/oci8/tests/lob_001.phpt                        | Bin 1415 -> 1257 bytes
 ext/oci8/tests/lob_002.phpt                        |   7 +-
 ext/oci8/tests/lob_003.phpt                        | Bin 1787 -> 1629 bytes
 ext/oci8/tests/lob_004.phpt                        |   7 +-
 ext/oci8/tests/lob_005.phpt                        |   7 +-
 ext/oci8/tests/lob_006.phpt                        | Bin 1853 -> 1695 bytes
 ext/oci8/tests/lob_007.phpt                        |   7 +-
 ext/oci8/tests/lob_008.phpt                        |   7 +-
 ext/oci8/tests/lob_009.phpt                        |   7 +-
 ext/oci8/tests/lob_010.phpt                        |   7 +-
 ext/oci8/tests/lob_011.phpt                        |   7 +-
 ext/oci8/tests/lob_012.phpt                        |   7 +-
 ext/oci8/tests/lob_013.phpt                        |   7 +-
 ext/oci8/tests/lob_014.phpt                        |   7 +-
 ext/oci8/tests/lob_015.phpt                        |   7 +-
 ext/oci8/tests/lob_016.phpt                        |   7 +-
 ext/oci8/tests/lob_017.phpt                        |   7 +-
 ext/oci8/tests/lob_018.phpt                        |   7 +-
 ext/oci8/tests/lob_temp.phpt                       |   7 +-
 ext/oci8/tests/lob_temp1.phpt                      |   7 +-
 ext/oci8/tests/num.phpt                            |   7 +-
 ext/oci8/tests/oci_execute_segfault.phpt           |   7 +-
 ext/oci8/tests/old_oci_close.phpt                  |   7 +-
 ext/oci8/tests/old_oci_close1.phpt                 |   7 +-
 ext/oci8/tests/password.phpt                       |   7 +-
 ext/oci8/tests/password_new.phpt                   |   7 +-
 ext/oci8/tests/password_old.phpt                   |   7 +-
 ext/oci8/tests/persistent.phpt                     |   8 +--
 ext/oci8/tests/prefetch.phpt                       |   7 +-
 ext/oci8/tests/prefetch_old.phpt                   |   7 +-
 ext/oci8/tests/privileged_connect.phpt             |   8 +--
 ext/oci8/tests/privileged_connect1.phpt            |  10 +--
 ext/oci8/tests/serverversion.phpt                  |   7 +-
 ext/oci8/tests/statement_cache.phpt                |   7 +-
 ext/oci8/tests/statement_type.phpt                 |   7 +-
 ext/oci8/tests/statement_type_old.phpt             |   7 +-
 ext/oci8/tests/uncommitted.phpt                    |   8 +--
 111 files changed, 401 insertions(+), 649 deletions(-)
 create mode 100644 ext/oci8/tests/array_bind_date.phpt
 create mode 100644 ext/oci8/tests/array_bind_float.phpt
 create mode 100644 ext/oci8/tests/array_bind_int.phpt
 create mode 100644 ext/oci8/tests/array_bind_str.phpt

(limited to 'ext/oci8')

diff --git a/ext/oci8/tests/array_bind_date.phpt b/ext/oci8/tests/array_bind_date.phpt
new file mode 100644
index 0000000000..63da558f91
--- /dev/null
+++ b/ext/oci8/tests/array_bind_date.phpt
@@ -0,0 +1,74 @@
+--TEST--
+oci_bind_array_by_name() and SQLT_ODT
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name DATE)";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array("06-DEC-05","10-DEC-80","21-AUG-91","26-OCT-17","05-NOV-05");
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, 5, SQLT_ODT);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECT--	
+array(5) {
+  [0]=>
+  string(9) "05-NOV-05"
+  [1]=>
+  string(9) "26-OCT-17"
+  [2]=>
+  string(9) "21-AUG-91"
+  [3]=>
+  string(9) "10-DEC-80"
+  [4]=>
+  string(9) "06-DEC-05"
+}
+Done
diff --git a/ext/oci8/tests/array_bind_float.phpt b/ext/oci8/tests/array_bind_float.phpt
new file mode 100644
index 0000000000..1aafb24317
--- /dev/null
+++ b/ext/oci8/tests/array_bind_float.phpt
@@ -0,0 +1,74 @@
+--TEST--
+oci_bind_array_by_name() and SQLT_FLT
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name FLOAT)";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF FLOAT INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array(1.243,2.5658,3.4234,4.2123,5.9999);
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, 5, SQLT_FLT);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECT--	
+array(5) {
+  [0]=>
+  float(5.9999)
+  [1]=>
+  float(4.2123)
+  [2]=>
+  float(3.4234)
+  [3]=>
+  float(2.5658)
+  [4]=>
+  float(1.243)
+}
+Done
diff --git a/ext/oci8/tests/array_bind_int.phpt b/ext/oci8/tests/array_bind_int.phpt
new file mode 100644
index 0000000000..3c8bfd4f57
--- /dev/null
+++ b/ext/oci8/tests/array_bind_int.phpt
@@ -0,0 +1,74 @@
+--TEST--
+oci_bind_array_by_name() and SQLT_INT
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name NUMBER)";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array(1,2,3,4,5);
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, 5, SQLT_NUM);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECT--	
+array(5) {
+  [0]=>
+  int(5)
+  [1]=>
+  int(4)
+  [2]=>
+  int(3)
+  [3]=>
+  int(2)
+  [4]=>
+  int(1)
+}
+Done
diff --git a/ext/oci8/tests/array_bind_str.phpt b/ext/oci8/tests/array_bind_str.phpt
new file mode 100644
index 0000000000..c8e1e0cdb5
--- /dev/null
+++ b/ext/oci8/tests/array_bind_str.phpt
@@ -0,0 +1,74 @@
+--TEST--
+oci_bind_array_by_name() and SQLT_AVC
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
+--FILE--
+<?php
+
+require dirname(__FILE__).'/connect.inc';
+
+$drop = "DROP table bind_test";
+$statement = oci_parse($c, $drop);
+@oci_execute($statement);
+
+$create = "CREATE table bind_test(name VARCHAR(20))";
+$statement = oci_parse($c, $create);
+oci_execute($statement);
+
+$create_pkg = "
+CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+  TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
+  PROCEDURE iobind(c1 IN OUT ARRTYPE); 
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg);
+oci_execute($statement);
+
+$create_pkg_body = "
+CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+  CURSOR CUR IS SELECT name FROM bind_test;
+  PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
+    BEGIN
+    FOR i IN 1..5 LOOP
+      INSERT INTO bind_test VALUES (c1(i));
+    END LOOP;
+    IF NOT CUR%ISOPEN THEN
+      OPEN CUR;
+    END IF;
+    FOR i IN REVERSE 1..5 LOOP
+      FETCH CUR INTO c1(i);
+      IF CUR%NOTFOUND THEN
+        CLOSE CUR;
+        EXIT;
+      END IF;
+    END LOOP;
+  END iobind;
+END ARRAYBINDPKG1;";
+$statement = oci_parse($c, $create_pkg_body);
+oci_execute($statement);
+
+$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+
+$array = Array("one", "two", "three", "four", "five");
+
+oci_bind_array_by_name($statement, ":c1", $array, 5, 20, SQLT_CHR);
+
+oci_execute($statement);
+
+var_dump($array);
+
+echo "Done\n";
+?>
+--EXPECT--	
+array(5) {
+  [0]=>
+  string(4) "five"
+  [1]=>
+  string(4) "four"
+  [2]=>
+  string(5) "three"
+  [3]=>
+  string(3) "two"
+  [4]=>
+  string(3) "one"
+}
+Done
diff --git a/ext/oci8/tests/bind_empty.phpt b/ext/oci8/tests/bind_empty.phpt
index 4088616055..4aa0521c4d 100644
--- a/ext/oci8/tests/bind_empty.phpt
+++ b/ext/oci8/tests/bind_empty.phpt
@@ -1,12 +1,7 @@
 --TEST--
 binding empty values
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/bug26133.phpt b/ext/oci8/tests/bug26133.phpt
index a0492cfde6..b2e3f9d07f 100644
--- a/ext/oci8/tests/bug26133.phpt
+++ b/ext/oci8/tests/bug26133.phpt
@@ -1,12 +1,7 @@
 --TEST--
 Bug #26133 (ocifreedesc() segfault)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bug27303.phpt b/ext/oci8/tests/bug27303.phpt
index 22a1f6d717..f921998c6d 100644
--- a/ext/oci8/tests/bug27303.phpt
+++ b/ext/oci8/tests/bug27303.phpt
@@ -1,12 +1,7 @@
 --TEST--
 bug #27303 (OCIBindByName binds numeric PHP values as characters)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bug27303_2.phpt b/ext/oci8/tests/bug27303_2.phpt
index 39c7c1099a..7f8585da07 100644
--- a/ext/oci8/tests/bug27303_2.phpt
+++ b/ext/oci8/tests/bug27303_2.phpt
@@ -1,12 +1,7 @@
 --TEST--
 bug #27303 (OCIBindByName binds numeric PHP values as characters)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bug27303_3.phpt b/ext/oci8/tests/bug27303_3.phpt
index 137f907076..f1a1e9b73c 100644
--- a/ext/oci8/tests/bug27303_3.phpt
+++ b/ext/oci8/tests/bug27303_3.phpt
@@ -1,12 +1,7 @@
 --TEST--
 bug #27303 (OCIBindByName binds numeric PHP values as characters)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bug27303_4.phpt b/ext/oci8/tests/bug27303_4.phpt
index 70b8d8f36c..c9a9be8776 100644
--- a/ext/oci8/tests/bug27303_4.phpt
+++ b/ext/oci8/tests/bug27303_4.phpt
@@ -1,12 +1,7 @@
 --TEST--
 bug #27303 (OCIBindByName binds numeric PHP values as characters)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/bug32325.phpt b/ext/oci8/tests/bug32325.phpt
index 1b5dd0d24d..77644d8b9b 100644
--- a/ext/oci8/tests/bug32325.phpt
+++ b/ext/oci8/tests/bug32325.phpt
@@ -1,12 +1,7 @@
 --TEST--
 bug #32325 (Can't retrieve collection using OCI8)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/close.phpt b/ext/oci8/tests/close.phpt
index 08bac05ba5..43925e1867 100644
--- a/ext/oci8/tests/close.phpt
+++ b/ext/oci8/tests/close.phpt
@@ -1,12 +1,7 @@
 --TEST--
 connect/close/connect
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_001.phpt b/ext/oci8/tests/coll_001.phpt
index 8a223f864b..4c5337ca30 100644
--- a/ext/oci8/tests/coll_001.phpt
+++ b/ext/oci8/tests/coll_001.phpt
@@ -1,13 +1,7 @@
 --TEST--
 oci_new_collection()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_002.phpt b/ext/oci8/tests/coll_002.phpt
index 39f0dbf065..81081a9a6e 100644
--- a/ext/oci8/tests/coll_002.phpt
+++ b/ext/oci8/tests/coll_002.phpt
@@ -1,13 +1,7 @@
 --TEST--
 oci_new_collection() + free()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_002_func.phpt b/ext/oci8/tests/coll_002_func.phpt
index 4a7cb209c3..f2aa16d971 100644
--- a/ext/oci8/tests/coll_002_func.phpt
+++ b/ext/oci8/tests/coll_002_func.phpt
@@ -1,13 +1,7 @@
 --TEST--
 oci_new_collection() + free()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_003.phpt b/ext/oci8/tests/coll_003.phpt
index a47816ad2c..db83e6cc5b 100644
--- a/ext/oci8/tests/coll_003.phpt
+++ b/ext/oci8/tests/coll_003.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collection methods
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_003_func.phpt b/ext/oci8/tests/coll_003_func.phpt
index 2057b6361a..4aa0be96ab 100644
--- a/ext/oci8/tests/coll_003_func.phpt
+++ b/ext/oci8/tests/coll_003_func.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collection methods
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_004.phpt b/ext/oci8/tests/coll_004.phpt
index 4af6d1d907..ce9de8837a 100644
--- a/ext/oci8/tests/coll_004.phpt
+++ b/ext/oci8/tests/coll_004.phpt
@@ -1,13 +1,7 @@
 --TEST--
 oci_collection_assign()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_004_func.phpt b/ext/oci8/tests/coll_004_func.phpt
index 9d7f5f6cd9..a1fe2c519b 100644
--- a/ext/oci8/tests/coll_004_func.phpt
+++ b/ext/oci8/tests/coll_004_func.phpt
@@ -1,13 +1,7 @@
 --TEST--
 oci_collection_assign()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_005.phpt b/ext/oci8/tests/coll_005.phpt
index d43c856cc7..2e33f8d8c3 100644
--- a/ext/oci8/tests/coll_005.phpt
+++ b/ext/oci8/tests/coll_005.phpt
@@ -1,13 +1,7 @@
 --TEST--
 ocinewcollection()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_006.phpt b/ext/oci8/tests/coll_006.phpt
index a1039987f9..6dedad024f 100644
--- a/ext/oci8/tests/coll_006.phpt
+++ b/ext/oci8/tests/coll_006.phpt
@@ -1,13 +1,7 @@
 --TEST--
 ocinewcollection() + free()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_006_func.phpt b/ext/oci8/tests/coll_006_func.phpt
index f43c142c40..5058130e1d 100644
--- a/ext/oci8/tests/coll_006_func.phpt
+++ b/ext/oci8/tests/coll_006_func.phpt
@@ -1,13 +1,7 @@
 --TEST--
 ocinewcollection() + free()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_007.phpt b/ext/oci8/tests/coll_007.phpt
index 256ce0bfa7..c3a6b26c95 100644
--- a/ext/oci8/tests/coll_007.phpt
+++ b/ext/oci8/tests/coll_007.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collection methods
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_008.phpt b/ext/oci8/tests/coll_008.phpt
index 36e052b7ed..44e00a8300 100644
--- a/ext/oci8/tests/coll_008.phpt
+++ b/ext/oci8/tests/coll_008.phpt
@@ -1,13 +1,7 @@
 --TEST--
 ocicollassign()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_009.phpt b/ext/oci8/tests/coll_009.phpt
index 1910af9efb..8f15c838ce 100644
--- a/ext/oci8/tests/coll_009.phpt
+++ b/ext/oci8/tests/coll_009.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and wrong dates
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_009_func.phpt b/ext/oci8/tests/coll_009_func.phpt
index d383abe4ad..d24d9bee4b 100644
--- a/ext/oci8/tests/coll_009_func.phpt
+++ b/ext/oci8/tests/coll_009_func.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and wrong dates
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_010.phpt b/ext/oci8/tests/coll_010.phpt
index b23096206e..46ff6e6d84 100644
--- a/ext/oci8/tests/coll_010.phpt
+++ b/ext/oci8/tests/coll_010.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and nulls
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_010_func.phpt b/ext/oci8/tests/coll_010_func.phpt
index dff980e013..f544f3a1a6 100644
--- a/ext/oci8/tests/coll_010_func.phpt
+++ b/ext/oci8/tests/coll_010_func.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and nulls
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_011.phpt b/ext/oci8/tests/coll_011.phpt
index 448b7f9a6b..d132c15fd0 100644
--- a/ext/oci8/tests/coll_011.phpt
+++ b/ext/oci8/tests/coll_011.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and strings
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_011_func.phpt b/ext/oci8/tests/coll_011_func.phpt
index 3226d15b86..f560e8938a 100644
--- a/ext/oci8/tests/coll_011_func.phpt
+++ b/ext/oci8/tests/coll_011_func.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and strings
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_012.phpt b/ext/oci8/tests/coll_012.phpt
index 59383b0cbc..43a1ce57a3 100644
--- a/ext/oci8/tests/coll_012.phpt
+++ b/ext/oci8/tests/coll_012.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and correct dates
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_012_func.phpt b/ext/oci8/tests/coll_012_func.phpt
index 16b85097d4..fb2924089a 100644
--- a/ext/oci8/tests/coll_012_func.phpt
+++ b/ext/oci8/tests/coll_012_func.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and correct dates
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_013.phpt b/ext/oci8/tests/coll_013.phpt
index cd1c851771..e306de66d0 100644
--- a/ext/oci8/tests/coll_013.phpt
+++ b/ext/oci8/tests/coll_013.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and correct dates (2)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_013_func.phpt b/ext/oci8/tests/coll_013_func.phpt
index 6141105b01..99e734798d 100644
--- a/ext/oci8/tests/coll_013_func.phpt
+++ b/ext/oci8/tests/coll_013_func.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and correct dates (2)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_014.phpt b/ext/oci8/tests/coll_014.phpt
index abbdbff274..e7762166e5 100644
--- a/ext/oci8/tests/coll_014.phpt
+++ b/ext/oci8/tests/coll_014.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and strings (2)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_014_func.phpt b/ext/oci8/tests/coll_014_func.phpt
index a728ee0f7d..971047394f 100644
--- a/ext/oci8/tests/coll_014_func.phpt
+++ b/ext/oci8/tests/coll_014_func.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and strings (2)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_015.phpt b/ext/oci8/tests/coll_015.phpt
index c9f9bda941..26d3f0ef62 100644
--- a/ext/oci8/tests/coll_015.phpt
+++ b/ext/oci8/tests/coll_015.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and numbers (2)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_015_func.phpt b/ext/oci8/tests/coll_015_func.phpt
index 27c4e68cd4..043999a254 100644
--- a/ext/oci8/tests/coll_015_func.phpt
+++ b/ext/oci8/tests/coll_015_func.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and numbers (2)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_016.phpt b/ext/oci8/tests/coll_016.phpt
index 3f685dd73f..12a299fca5 100644
--- a/ext/oci8/tests/coll_016.phpt
+++ b/ext/oci8/tests/coll_016.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and negative/too big element indexes
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_016_func.phpt b/ext/oci8/tests/coll_016_func.phpt
index f9ba14db49..f841bbb10b 100644
--- a/ext/oci8/tests/coll_016_func.phpt
+++ b/ext/oci8/tests/coll_016_func.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and negative/too big element indexes
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_017.phpt b/ext/oci8/tests/coll_017.phpt
index 2ba0ce5382..1d3df13f0e 100644
--- a/ext/oci8/tests/coll_017.phpt
+++ b/ext/oci8/tests/coll_017.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and nulls (2)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/coll_017_func.phpt b/ext/oci8/tests/coll_017_func.phpt
index ada10a192d..75ab89da08 100644
--- a/ext/oci8/tests/coll_017_func.phpt
+++ b/ext/oci8/tests/coll_017_func.phpt
@@ -1,13 +1,7 @@
 --TEST--
 collections and nulls (2)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/commit.phpt b/ext/oci8/tests/commit.phpt
index 7a44a31a9b..2d761dd370 100644
--- a/ext/oci8/tests/commit.phpt
+++ b/ext/oci8/tests/commit.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_commit()/oci_rollback()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/commit_old.phpt b/ext/oci8/tests/commit_old.phpt
index 3dfb383113..a4f9f04219 100644
--- a/ext/oci8/tests/commit_old.phpt
+++ b/ext/oci8/tests/commit_old.phpt
@@ -1,12 +1,7 @@
 --TEST--
 ocicommit()/ocirollback()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/connect.phpt b/ext/oci8/tests/connect.phpt
index d873a7e015..3627f6dff1 100644
--- a/ext/oci8/tests/connect.phpt
+++ b/ext/oci8/tests/connect.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_connect()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/connect_1.phpt b/ext/oci8/tests/connect_1.phpt
index e658344496..938b30fa62 100644
--- a/ext/oci8/tests/connect_1.phpt
+++ b/ext/oci8/tests/connect_1.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_pconnect() & oci_new_connect()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/connect_1_old.phpt b/ext/oci8/tests/connect_1_old.phpt
index 73c756159d..20b20887d2 100644
--- a/ext/oci8/tests/connect_1_old.phpt
+++ b/ext/oci8/tests/connect_1_old.phpt
@@ -1,12 +1,7 @@
 --TEST--
 ociplogon() & ocinlogon()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/connect_old.phpt b/ext/oci8/tests/connect_old.phpt
index a8183d4ec8..df191b0210 100644
--- a/ext/oci8/tests/connect_old.phpt
+++ b/ext/oci8/tests/connect_old.phpt
@@ -1,12 +1,7 @@
 --TEST--
 ocilogon()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/connect_without_oracle_home.phpt b/ext/oci8/tests/connect_without_oracle_home.phpt
index 513d60cefd..f086a24e33 100644
--- a/ext/oci8/tests/connect_without_oracle_home.phpt
+++ b/ext/oci8/tests/connect_without_oracle_home.phpt
@@ -1,6 +1,6 @@
 --TEST--
 oci_connect() without ORACLE_HOME set (OCIServerAttach() segfaults)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
 --FILE--
 <?php
diff --git a/ext/oci8/tests/connect_without_oracle_home_old.phpt b/ext/oci8/tests/connect_without_oracle_home_old.phpt
index 68b11de155..471ed27a41 100644
--- a/ext/oci8/tests/connect_without_oracle_home_old.phpt
+++ b/ext/oci8/tests/connect_without_oracle_home_old.phpt
@@ -1,6 +1,6 @@
 --TEST--
 ocilogon() without ORACLE_HOME set (OCIServerAttach() segfaults)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
 --FILE--
 <?php
diff --git a/ext/oci8/tests/cursor_bind_err.phpt b/ext/oci8/tests/cursor_bind_err.phpt
index 343167387b..2625694520 100644
--- a/ext/oci8/tests/cursor_bind_err.phpt
+++ b/ext/oci8/tests/cursor_bind_err.phpt
@@ -1,12 +1,7 @@
 --TEST--
 binding a cursor (with errors)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/cursors.phpt b/ext/oci8/tests/cursors.phpt
index e69ff82dd2..04702931c3 100644
--- a/ext/oci8/tests/cursors.phpt
+++ b/ext/oci8/tests/cursors.phpt
@@ -1,12 +1,7 @@
 --TEST--
 fetching cursor from a statement
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/cursors_old.phpt b/ext/oci8/tests/cursors_old.phpt
index 4991ed795a..970dea644f 100644
--- a/ext/oci8/tests/cursors_old.phpt
+++ b/ext/oci8/tests/cursors_old.phpt
@@ -1,12 +1,7 @@
 --TEST--
 fetching cursor from a statement
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/debug.phpt b/ext/oci8/tests/debug.phpt
index 2a2d2f79c2..c983293ef3 100644
--- a/ext/oci8/tests/debug.phpt
+++ b/ext/oci8/tests/debug.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_internal_debug()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/default_prefetch.phpt b/ext/oci8/tests/default_prefetch.phpt
index 46d2d07e4c..6efc582982 100644
--- a/ext/oci8/tests/default_prefetch.phpt
+++ b/ext/oci8/tests/default_prefetch.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci8.default_prefetch ini option
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --INI--
 oci8.default_prefetch=20
 --FILE--
diff --git a/ext/oci8/tests/default_prefetch1.phpt b/ext/oci8/tests/default_prefetch1.phpt
index 8f43450c84..f34f21d343 100644
--- a/ext/oci8/tests/default_prefetch1.phpt
+++ b/ext/oci8/tests/default_prefetch1.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci8.default_prefetch ini option
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --INI--
 oci8.default_prefetch=100
 --FILE--
diff --git a/ext/oci8/tests/default_prefetch2.phpt b/ext/oci8/tests/default_prefetch2.phpt
index 8a0939cdc1..d3d91d71ee 100644
--- a/ext/oci8/tests/default_prefetch2.phpt
+++ b/ext/oci8/tests/default_prefetch2.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci8.default_prefetch ini option
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --INI--
 oci8.default_prefetch=100
 --FILE--
diff --git a/ext/oci8/tests/define.phpt b/ext/oci8/tests/define.phpt
index dde5d575b3..3c5a7da417 100644
--- a/ext/oci8/tests/define.phpt
+++ b/ext/oci8/tests/define.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_define_by_name()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/define_old.phpt b/ext/oci8/tests/define_old.phpt
index e3c8278668..0800c7de41 100644
--- a/ext/oci8/tests/define_old.phpt
+++ b/ext/oci8/tests/define_old.phpt
@@ -1,12 +1,7 @@
 --TEST--
 ocidefinebyname()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/error.phpt b/ext/oci8/tests/error.phpt
index 594a3d1319..de9b30e1c6 100644
--- a/ext/oci8/tests/error.phpt
+++ b/ext/oci8/tests/error.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_error()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/error1.phpt b/ext/oci8/tests/error1.phpt
index a150de8975..529d943399 100644
--- a/ext/oci8/tests/error1.phpt
+++ b/ext/oci8/tests/error1.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_error() when oci_connect() fails
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/error_old.phpt b/ext/oci8/tests/error_old.phpt
index fbdcd9e610..b432ee5ac6 100644
--- a/ext/oci8/tests/error_old.phpt
+++ b/ext/oci8/tests/error_old.phpt
@@ -1,12 +1,7 @@
 --TEST--
 ocierror()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/exec_fetch.phpt b/ext/oci8/tests/exec_fetch.phpt
index e1705273aa..353a0e83dc 100644
--- a/ext/oci8/tests/exec_fetch.phpt
+++ b/ext/oci8/tests/exec_fetch.phpt
@@ -1,12 +1,7 @@
 --TEST--
 fetch after failed oci_execute()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/fetch.phpt b/ext/oci8/tests/fetch.phpt
index 72ca9f3f80..60f8320ce0 100644
--- a/ext/oci8/tests/fetch.phpt
+++ b/ext/oci8/tests/fetch.phpt
@@ -1,12 +1,7 @@
 --TEST--
 ocifetch() & ociresult()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/fetch_all.phpt b/ext/oci8/tests/fetch_all.phpt
index 49193ffc87..af8c3d1110 100644
--- a/ext/oci8/tests/fetch_all.phpt
+++ b/ext/oci8/tests/fetch_all.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_fetch_all()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/fetch_array.phpt b/ext/oci8/tests/fetch_array.phpt
index ada162453d..37c81a8ce7 100644
--- a/ext/oci8/tests/fetch_array.phpt
+++ b/ext/oci8/tests/fetch_array.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_fetch_array()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/fetch_assoc.phpt b/ext/oci8/tests/fetch_assoc.phpt
index 9b6866a100..d6367acb13 100644
--- a/ext/oci8/tests/fetch_assoc.phpt
+++ b/ext/oci8/tests/fetch_assoc.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_fetch_assoc()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/fetch_into.phpt b/ext/oci8/tests/fetch_into.phpt
index 4953a25026..9c9cca25a5 100644
--- a/ext/oci8/tests/fetch_into.phpt
+++ b/ext/oci8/tests/fetch_into.phpt
@@ -1,12 +1,7 @@
 --TEST--
 ocifetchinto()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/fetch_into1.phpt b/ext/oci8/tests/fetch_into1.phpt
index 91d02e3d5c..96835a7061 100644
--- a/ext/oci8/tests/fetch_into1.phpt
+++ b/ext/oci8/tests/fetch_into1.phpt
@@ -1,12 +1,7 @@
 --TEST--
 various ocifetchinto() tests
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/fetch_into2.phpt b/ext/oci8/tests/fetch_into2.phpt
index 27c137b429..c82e54eda7 100644
--- a/ext/oci8/tests/fetch_into2.phpt
+++ b/ext/oci8/tests/fetch_into2.phpt
@@ -1,12 +1,7 @@
 --TEST--
 ocifetchinto() & wrong number of params
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/fetch_object.phpt b/ext/oci8/tests/fetch_object.phpt
index 2df0480a39..59a1456f17 100644
--- a/ext/oci8/tests/fetch_object.phpt
+++ b/ext/oci8/tests/fetch_object.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_fetch_object()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/fetch_row.phpt b/ext/oci8/tests/fetch_row.phpt
index a2c0e883a0..6c6bfd0ac1 100644
--- a/ext/oci8/tests/fetch_row.phpt
+++ b/ext/oci8/tests/fetch_row.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_fetch_row()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/field_funcs.phpt b/ext/oci8/tests/field_funcs.phpt
index bba6632e86..cd7a737ea8 100644
--- a/ext/oci8/tests/field_funcs.phpt
+++ b/ext/oci8/tests/field_funcs.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_field_*() family
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/field_funcs_old.phpt b/ext/oci8/tests/field_funcs_old.phpt
index c5339a7502..8fedeac2d8 100644
--- a/ext/oci8/tests/field_funcs_old.phpt
+++ b/ext/oci8/tests/field_funcs_old.phpt
@@ -1,12 +1,7 @@
 --TEST--
 ocicolumn*() family
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/lob_001.phpt b/ext/oci8/tests/lob_001.phpt
index 405b2b814c..4bd8d9a732 100644
Binary files a/ext/oci8/tests/lob_001.phpt and b/ext/oci8/tests/lob_001.phpt differ
diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt
index c414905f39..1396f85e50 100644
--- a/ext/oci8/tests/lob_002.phpt
+++ b/ext/oci8/tests/lob_002.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_lob_write() and friends (with errors)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_003.phpt b/ext/oci8/tests/lob_003.phpt
index 76f1a7e4b0..a3ca9239d5 100644
Binary files a/ext/oci8/tests/lob_003.phpt and b/ext/oci8/tests/lob_003.phpt differ
diff --git a/ext/oci8/tests/lob_004.phpt b/ext/oci8/tests/lob_004.phpt
index 56ccfbcd4a..4294500929 100644
--- a/ext/oci8/tests/lob_004.phpt
+++ b/ext/oci8/tests/lob_004.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_lob_seek()/rewind()/append()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_005.phpt b/ext/oci8/tests/lob_005.phpt
index d82400e47e..637bf653a1 100644
--- a/ext/oci8/tests/lob_005.phpt
+++ b/ext/oci8/tests/lob_005.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_lob_is_equal()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_006.phpt b/ext/oci8/tests/lob_006.phpt
index 321d948b1a..8c47ed410a 100644
Binary files a/ext/oci8/tests/lob_006.phpt and b/ext/oci8/tests/lob_006.phpt differ
diff --git a/ext/oci8/tests/lob_007.phpt b/ext/oci8/tests/lob_007.phpt
index 0f2920414f..5b29d47353 100644
--- a/ext/oci8/tests/lob_007.phpt
+++ b/ext/oci8/tests/lob_007.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_lob_write()/size()/load()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_008.phpt b/ext/oci8/tests/lob_008.phpt
index a0b4a557df..b20e46a15d 100644
--- a/ext/oci8/tests/lob_008.phpt
+++ b/ext/oci8/tests/lob_008.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_lob_write()/read()/eof()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_009.phpt b/ext/oci8/tests/lob_009.phpt
index 9b467dd12a..e15a785b8a 100644
--- a/ext/oci8/tests/lob_009.phpt
+++ b/ext/oci8/tests/lob_009.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_lob_import()/read()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_010.phpt b/ext/oci8/tests/lob_010.phpt
index 85d37dc738..170ef39d91 100644
--- a/ext/oci8/tests/lob_010.phpt
+++ b/ext/oci8/tests/lob_010.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_lob_save()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_011.phpt b/ext/oci8/tests/lob_011.phpt
index 41d54cf147..f987d36ded 100644
--- a/ext/oci8/tests/lob_011.phpt
+++ b/ext/oci8/tests/lob_011.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_lob_copy()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_012.phpt b/ext/oci8/tests/lob_012.phpt
index fb434d9260..95772eb7de 100644
--- a/ext/oci8/tests/lob_012.phpt
+++ b/ext/oci8/tests/lob_012.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_lob_export() 
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_013.phpt b/ext/oci8/tests/lob_013.phpt
index 608640c7a1..1e0fc99ce8 100644
--- a/ext/oci8/tests/lob_013.phpt
+++ b/ext/oci8/tests/lob_013.phpt
@@ -1,12 +1,7 @@
 --TEST--
 lob buffering
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_014.phpt b/ext/oci8/tests/lob_014.phpt
index b0e0db5a01..e9ff73ab19 100644
--- a/ext/oci8/tests/lob_014.phpt
+++ b/ext/oci8/tests/lob_014.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_lob_free()/close() 
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_015.phpt b/ext/oci8/tests/lob_015.phpt
index 5419087888..07f1044442 100644
--- a/ext/oci8/tests/lob_015.phpt
+++ b/ext/oci8/tests/lob_015.phpt
@@ -1,12 +1,7 @@
 --TEST--
 various tests with wrong param count
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_016.phpt b/ext/oci8/tests/lob_016.phpt
index d021cc3ac8..fc9294398b 100644
--- a/ext/oci8/tests/lob_016.phpt
+++ b/ext/oci8/tests/lob_016.phpt
@@ -1,12 +1,7 @@
 --TEST--
 returning multiple lobs
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_017.phpt b/ext/oci8/tests/lob_017.phpt
index 43b4a513b3..7b13d897ca 100644
--- a/ext/oci8/tests/lob_017.phpt
+++ b/ext/oci8/tests/lob_017.phpt
@@ -1,12 +1,7 @@
 --TEST--
 returning multiple lobs (using persistent connection)
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_018.phpt b/ext/oci8/tests/lob_018.phpt
index 360f50f387..41614354b5 100644
--- a/ext/oci8/tests/lob_018.phpt
+++ b/ext/oci8/tests/lob_018.phpt
@@ -1,12 +1,7 @@
 --TEST--
 fetching the same lob several times
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_temp.phpt b/ext/oci8/tests/lob_temp.phpt
index 4532d53630..a8d959427b 100644
--- a/ext/oci8/tests/lob_temp.phpt
+++ b/ext/oci8/tests/lob_temp.phpt
@@ -1,12 +1,7 @@
 --TEST--
 temporary lobs
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/lob_temp1.phpt b/ext/oci8/tests/lob_temp1.phpt
index 563a7e1f26..3c2ba60574 100644
--- a/ext/oci8/tests/lob_temp1.phpt
+++ b/ext/oci8/tests/lob_temp1.phpt
@@ -1,12 +1,7 @@
 --TEST--
 closing temporary lobs
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/num.phpt b/ext/oci8/tests/num.phpt
index 34b1a9c07d..588cadfe9e 100644
--- a/ext/oci8/tests/num.phpt
+++ b/ext/oci8/tests/num.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_num_*() family
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/oci_execute_segfault.phpt b/ext/oci8/tests/oci_execute_segfault.phpt
index b7f0b62c85..abb62aea44 100644
--- a/ext/oci8/tests/oci_execute_segfault.phpt
+++ b/ext/oci8/tests/oci_execute_segfault.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_execute() segfault after repeated bind
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 	
diff --git a/ext/oci8/tests/old_oci_close.phpt b/ext/oci8/tests/old_oci_close.phpt
index beb1b34ab5..3fa721585f 100644
--- a/ext/oci8/tests/old_oci_close.phpt
+++ b/ext/oci8/tests/old_oci_close.phpt
@@ -1,14 +1,9 @@
 --TEST--
 oci8.old_oci_close_semantics On
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
 --INI--
 oci8.old_oci_close_semantics=1
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/old_oci_close1.phpt b/ext/oci8/tests/old_oci_close1.phpt
index c79eb077be..a75c1a1175 100644
--- a/ext/oci8/tests/old_oci_close1.phpt
+++ b/ext/oci8/tests/old_oci_close1.phpt
@@ -1,14 +1,9 @@
 --TEST--
 oci8.old_oci_close_semantics Off
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
 --INI--
 oci8.old_oci_close_semantics=0
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/password.phpt b/ext/oci8/tests/password.phpt
index 37f586cd4f..e5fc403b49 100644
--- a/ext/oci8/tests/password.phpt
+++ b/ext/oci8/tests/password.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_password_change()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/password_new.phpt b/ext/oci8/tests/password_new.phpt
index 37f586cd4f..e5fc403b49 100644
--- a/ext/oci8/tests/password_new.phpt
+++ b/ext/oci8/tests/password_new.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_password_change()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/password_old.phpt b/ext/oci8/tests/password_old.phpt
index 3e715785b5..570438fcdf 100644
--- a/ext/oci8/tests/password_old.phpt
+++ b/ext/oci8/tests/password_old.phpt
@@ -1,12 +1,7 @@
 --TEST--
 ocipasswordchange()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/persistent.phpt b/ext/oci8/tests/persistent.phpt
index 088689c722..89820ac423 100644
--- a/ext/oci8/tests/persistent.phpt
+++ b/ext/oci8/tests/persistent.phpt
@@ -1,13 +1,7 @@
 --TEST--
 reusing persistent connections
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 		
diff --git a/ext/oci8/tests/prefetch.phpt b/ext/oci8/tests/prefetch.phpt
index 45d51bd4c3..74ea969052 100644
--- a/ext/oci8/tests/prefetch.phpt
+++ b/ext/oci8/tests/prefetch.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_set_prefetch()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/prefetch_old.phpt b/ext/oci8/tests/prefetch_old.phpt
index 189511d051..eea8c27464 100644
--- a/ext/oci8/tests/prefetch_old.phpt
+++ b/ext/oci8/tests/prefetch_old.phpt
@@ -1,12 +1,7 @@
 --TEST--
 ocisetprefetch()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt
index aef94b79e1..23c9d2f41f 100644
--- a/ext/oci8/tests/privileged_connect.phpt
+++ b/ext/oci8/tests/privileged_connect.phpt
@@ -1,13 +1,7 @@
 --TEST--
 privileged connect tests
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 		
diff --git a/ext/oci8/tests/privileged_connect1.phpt b/ext/oci8/tests/privileged_connect1.phpt
index 208d0853c4..1448ea5eee 100644
--- a/ext/oci8/tests/privileged_connect1.phpt
+++ b/ext/oci8/tests/privileged_connect1.phpt
@@ -1,15 +1,9 @@
 --TEST--
 privileged connect tests
+---SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
 --INI--
 oci8.privileged_connect=1
---SKIPIF--
-<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 		
diff --git a/ext/oci8/tests/serverversion.phpt b/ext/oci8/tests/serverversion.phpt
index 0a8059964b..3f097ce6eb 100644
--- a/ext/oci8/tests/serverversion.phpt
+++ b/ext/oci8/tests/serverversion.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_server_version()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/statement_cache.phpt b/ext/oci8/tests/statement_cache.phpt
index dc49c427f2..79fba28f90 100644
--- a/ext/oci8/tests/statement_cache.phpt
+++ b/ext/oci8/tests/statement_cache.phpt
@@ -1,12 +1,7 @@
 --TEST--
 statement cache
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/statement_type.phpt b/ext/oci8/tests/statement_type.phpt
index f3215ec31e..9a0bc2d40b 100644
--- a/ext/oci8/tests/statement_type.phpt
+++ b/ext/oci8/tests/statement_type.phpt
@@ -1,12 +1,7 @@
 --TEST--
 oci_statement_type()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/statement_type_old.phpt b/ext/oci8/tests/statement_type_old.phpt
index 587beb4f2c..e9872c1f52 100644
--- a/ext/oci8/tests/statement_type_old.phpt
+++ b/ext/oci8/tests/statement_type_old.phpt
@@ -1,12 +1,7 @@
 --TEST--
 ocistatementtype()
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-";
 --FILE--
 <?php
 
diff --git a/ext/oci8/tests/uncommitted.phpt b/ext/oci8/tests/uncommitted.phpt
index 297b7b0d06..ad57596e15 100644
--- a/ext/oci8/tests/uncommitted.phpt
+++ b/ext/oci8/tests/uncommitted.phpt
@@ -1,13 +1,7 @@
 --TEST--
 uncommitted connection
---SKIPIF--
+---SKIPIF--
 <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
---ENV--
-return "
-ORACLE_HOME=".(isset($_ENV['ORACLE_HOME']) ? $_ENV['ORACLE_HOME'] : '')."
-NLS_LANG=".(isset($_ENV['NLS_LANG']) ? $_ENV['NLS_LANG'] : '')."
-TNS_ADMIN=".(isset($_ENV['TNS_ADMIN']) ? $_ENV['TNS_ADMIN'] : '')."
-";
 --FILE--
 <?php
 		
-- 
cgit v1.2.1