nuke erroneous --ENV-- tag

add new tests for oci_bind_array_by_name()

diff --git a/ext/oci8/tests/array_bind_date.phpt b/ext/oci8/tests/array_bind_date.phpt
new file mode 100644 (file)
index 0000000..63da558
--- /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 (file)
index 0000000..1aafb24
--- /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 (file)
index 0000000..3c8bfd4
--- /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 (file)
index 0000000..c8e1e0c
--- /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 40886160556a214fe3c0aa47ffa169b463ca9fbc..4aa0521c4dd9a7635c86298be6e4cac1cf624d8a 100644 (file)
--- 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 a0492cfde67d34fe0771a6c33ebd7d4aaa41d22c..b2e3f9d07f01b49632ef01f76ffc3cacfb38b4ca 100644 (file)
--- 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 22a1f6d717f7f4575c532d77dfc4b1f543af4314..f921998c6dc2cf43f01fbe49c7e1aa17914a4eef 100644 (file)
--- 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 39c7c1099a55b233cbcdc593b15368603fb9028b..7f8585da075b051ded94b2f973ba3797fb541a36 100644 (file)
--- 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 137f9070764dc5e47cf6b7cdcaf52ca35eb24df6..f1a1e9b73c93135333e5e1f2eb31d3dbc84ad3df 100644 (file)
--- 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 70b8d8f36c4b3f8f6ad6cc3beffc5880967bc227..c9a9be8776d246e6d867acc2fa3ac2295fc9e1c6 100644 (file)
--- 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 1b5dd0d24d372a5b963e13540600c24e0a9ac417..77644d8b9bff7fd30c97a326ba17c8144d7c93f9 100644 (file)
--- 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 08bac05ba544dda5fc903d0092e1fc14dfa1468b..43925e1867c5f8a3e529a0471a73718e1180bd61 100644 (file)
--- 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 8a223f864bc203ff81ad88869c345e2d78ce77a3..4c5337ca30165cb434364e06371f17d650d526dc 100644 (file)
--- 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 39f0dbf065afda3f508f3f856e812408756d6da5..81081a9a6e2d2139c81c0aec022e8af31e248c35 100644 (file)
--- 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 4a7cb209c3e0775521d7e04e83ec1f11493efc9e..f2aa16d97124e3c3542ef20fdb1c7ddaab2c01f0 100644 (file)
--- 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 a47816ad2ca85d398efa33a5437774d34bdcb903..db83e6cc5b0150932b9d157e48a76fde386b5068 100644 (file)
--- 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 2057b6361a2210962ea7afa9d94a22e38192a652..4aa0be96ab3cfa0020ceb4679520284aaf7aa9f1 100644 (file)
--- 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 4af6d1d90783ff23f070ed6972eb970ce3f0ea29..ce9de8837a48b3265f84bfae92d4e2d4ff0631d2 100644 (file)
--- 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 9d7f5f6cd98cd146af69997c5e0754575b8c75ad..a1fe2c519b71af941963f1337355b1d3af5ff26e 100644 (file)
--- 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 d43c856cc7ed324276c4386aa189146109c268ec..2e33f8d8c3d60f63a8af73c8f3201e505789ceda 100644 (file)
--- 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 a1039987f989a0eb1fba19fde17c1eb0dcd0b0d8..6dedad024f559e99a17cd0e962049868612aa86a 100644 (file)
--- 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 f43c142c40c8d9cbcce8cf0a45c1c09a93c01e13..5058130e1dfa3db20eaebfb4328ad720de8f8c98 100644 (file)
--- 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 256ce0bfa7a1784bcd701f98c10507f4063adb01..c3a6b26c95ea862ccc47663ce6a1ae83a42a6b02 100644 (file)
--- 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 36e052b7ed8a3aad83e9b6960070c5398b5fb6fa..44e00a83002b072b72d23844fc5891433718eb00 100644 (file)
--- 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 1910af9efb192217499404337e3399c4cd98801b..8f15c838ceda1c9ffac71d14cfd43b95d52191bd 100644 (file)
--- 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 d383abe4ad60d205215e8fc9de8eaf672ca7364c..d24d9bee4b39d3b0a8cf233f061a0b7506704459 100644 (file)
--- 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 b23096206ea954b0d12f431cfc0bc5a46053bf07..46ff6e6d848caf0b19b52b27bdcb8bb3ff57780d 100644 (file)
--- 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 dff980e013ccc146803309c0bfa37ebabd339705..f544f3a1a60dc1bbe9d713f22fd694790c6de2ce 100644 (file)
--- 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 448b7f9a6bd4a27ed514e740bd124a76462479d8..d132c15fd0915eabb2acf5c1abcda6e56b7f2b0f 100644 (file)
--- 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 3226d15b866ae9ab127860b318ccd752531fb853..f560e8938a9749aa7102acd309574dacc11f101f 100644 (file)
--- 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 59383b0cbcb08df07a961390c88c9d3a7a371fb8..43a1ce57a31f4acafff2ec54443686169f64ff5c 100644 (file)
--- 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 16b85097d4ceb2ab79e8e9c552d7e2a871339d94..fb2924089a26375da4978dea4a5c1c62dcb37daa 100644 (file)
--- 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 cd1c8517715003fcea57b8c5bd753dde36ecee26..e306de66d02508b041cd8e781b8005079c70070b 100644 (file)
--- 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 6141105b013c9cd158a5aae24745518bda46bef8..99e734798de38cd1be8f1be4fd56c3652c796295 100644 (file)
--- 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 abbdbff2745c4251316955e159ebe5441d5362b8..e7762166e5d68c0243362780803627659b022a96 100644 (file)
--- 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 a728ee0f7ded8a5a1fbce252823389f0e4d6116d..971047394fab5f6da5440cb7613e9bd3c1ab9ac1 100644 (file)
--- 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 c9f9bda9411987af7a33f15a9c8caa51069f9892..26d3f0ef62d2cb194cf72f87e7c1d1d1a945520e 100644 (file)
--- 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 27c4e68cd4213759ac4230c1e59ef7c4151c8183..043999a2545c7e54bddabeaa1d867ee16671188b 100644 (file)
--- 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 3f685dd73f3aa88f546c4efd7209e699ba3d39b2..12a299fca5b0e0b69a627d6f01aee4a7537833cd 100644 (file)
--- 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 f9ba14db49833896a88b11285a3fb924c0a2de0c..f841bbb10bfb108cf997ad832ab98a049cb5204e 100644 (file)
--- 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 2ba0ce53825547ae51bada66c087f1276d5b09d0..1d3df13f0e627f9f5c3d496327d0b3c85a14c5af 100644 (file)
--- 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 ada10a192dd587106c0e18deac9e60a8bc7d400e..75ab89da08ae240fb788add98bef48e2cd637bd1 100644 (file)
--- 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 7a44a31a9b2a71d099646fd5392351bab8946d16..2d761dd3702cbbd03f7a08dd9b149d54389b9548 100644 (file)
--- 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 3dfb383113c988e60e035c5aff42190bd68776fb..a4f9f042191a9def8ce2a0a262c87caa7560c6bf 100644 (file)
--- 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 d873a7e0150e5af646ef5764c74c9a923e5a9c2c..3627f6dff1d79fc5cb0268ab909a0b02dbe5ce36 100644 (file)
--- 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 e658344496340b00ee5bce19c7e2176ff3fa2abd..938b30fa62a19612084bd796f8113c920ec1b062 100644 (file)
--- 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 73c756159df04c5912153ba507cf87ece374a9ed..20b20887d2bc999542d3759693cadfb4455dcfcf 100644 (file)
--- 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 a8183d4ec8097a5f83c38fe0b26c150a513eecb4..df191b02106ca275c23996e076ed706b4d087610 100644 (file)
--- 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 513d60cefd810986ea8dfcddb5d1563e3be29613..f086a24e332a9054173fa05d4eb3c57732178b83 100644 (file)
--- 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 68b11de1553d2f7f0c074d982e1c115a1f8f0495..471ed27a4147bc26fb7eccaff85ade270919aed2 100644 (file)
--- 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 343167387b3f44a7253e44b220ac7881dd9120c6..2625694520ad5ab37101ced4506776cd490bdf65 100644 (file)
--- 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 e69ff82dd278343616f65bc8f5c24def4ba14741..04702931c3d5dd1cb3bc728de9eb802681073b06 100644 (file)
--- 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 4991ed795aee8c9a86b50351f9da395f48d4b23a..970dea644f66a5e7cf13b0e50056090f1b9283ae 100644 (file)
--- 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 2a2d2f79c26590a807e8321d976e88282f607680..c983293ef3a06ace6910ab7c1fa3510fd96daac1 100644 (file)
--- 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 46d2d07e4c27d9dfab5b1e3f596a33b64404b5ed..6efc582982f369643f077765e0906bd17afa5a09 100644 (file)
--- 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 8f43450c8449193164757affa0c94fa511444db8..f34f21d3435d209aa8e740485b1fc33a9a41c351 100644 (file)
--- 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 8a0939cdc167fe9c70eccd5ec943687230b6b165..d3d91d71ee0f1c8f956f1bc6740058c5aacd298f 100644 (file)
--- 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 dde5d575b3d085ef704cbf5805c99a6f9f4c69d0..3c5a7da4178b769c33b6e1bbf8e3b67a306ffe26 100644 (file)
--- 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 e3c8278668f2cc29a856c4ae5dd6e3409cd572e8..0800c7de4136bc6a7c2d6644da946781d04b082b 100644 (file)
--- 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 594a3d13196041f8692c9e3228705a9b6a4b3d9c..de9b30e1c6e69668c04a231f28769334c37e5ecd 100644 (file)
--- 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 a150de89752711e70706c780f11a3e0ca4ad49fc..529d943399da51fbe66d2eae88491f6fe3c08866 100644 (file)
--- 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 fbdcd9e610afc32b0657a36f6abd81fdfb6262c8..b432ee5ac66d7a5e8eb3e6776bf7cc233b855165 100644 (file)
--- 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 e1705273aa8de1d3044dab394d9378ab8c3a21c1..353a0e83dcd2494c5bf76c37039972e04ade04af 100644 (file)
--- 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 72ca9f3f8051d085122b43f8356a8b9fc2983112..60f8320ce0d03f7365831e5e76e53fe02340e782 100644 (file)
--- 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 49193ffc87f52c5c497d80055fa7c1cfc2b22a63..af8c3d1110b821051e537cad7c49abfa40eddc2f 100644 (file)
--- 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 ada162453d503203e8b2323ae64e99bda677e1e4..37c81a8ce7aa233f480f5811aa3be2287d536bc3 100644 (file)
--- 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 9b6866a100eb44bfccf8532318434ec3450a3d1e..d6367acb134a367c13636f8d33feb9e6d3fdc09c 100644 (file)
--- 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 4953a25026e59af4eb2d66482518a716f27f9efe..9c9cca25a5e19d507a767b6ef5e84e7016e7823c 100644 (file)
--- 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 91d02e3d5c1fdd5462af33990c5c940f74a41e43..96835a706123dbfda9e928217ad526fff32bcb5c 100644 (file)
--- 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 27c137b4295d33c6e156a9624313d8362b045e4d..c82e54eda72acd7c6c2a4ec9d714eaef2ba9752e 100644 (file)
--- 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 2df0480a399904eef3909ef1dd70237244a5d4bb..59a1456f173368472ffd890d34b364e300f4127a 100644 (file)
--- 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 a2c0e883a0bce531ba4fbc186fd59d26d4a4ed4e..6c6bfd0ac12bba70c20e451436d1be5214dfadf2 100644 (file)
--- 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 bba6632e86ad83ec704b3abaa0ae9ad1de535694..cd7a737ea8933c8c9404c21fcd4c811d3ea2d6e1 100644 (file)
--- 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 c5339a7502bbcd4add540c73ceb00e56369471cc..8fedeac2d8b19362d58ee833e4c241d40a22ac31 100644 (file)
--- 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 405b2b814c0be4794bab252792243a758a2fcef2..4bd8d9a732b0734c7b2d5372ed4c890fdeaa7cca 100644 (file)
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 c414905f39b4afca1228b520e3269db5a12b3e1f..1396f85e5009c1dac03f28aafee586fabd666f2d 100644 (file)
--- 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 76f1a7e4b0091f60b3e9fdb42c0bc72a590fa5fd..a3ca9239d5016ec32399b2ba8488cd7892c7ae6e 100644 (file)
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 56ccfbcd4a65d3073645a1f0dd77de4f2e30b3f5..4294500929cabb3451de40bdb272f74c03991f9c 100644 (file)
--- 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 d82400e47ede87cb51cc7e87dae4a234240e5ed4..637bf653a13d58ab60ea21cd488659d635eaa47e 100644 (file)
--- 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 321d948b1a599bb13abbdcaad705637b91cc7973..8c47ed410a5a2006df89bd86f9c01e890a43a21d 100644 (file)
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 0f2920414f0d75c74ab4fa8e0f543003e1f0406a..5b29d47353ab397bfcdf811964432b0cade8e0fe 100644 (file)
--- 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 a0b4a557df313ff7155b3bbb8206e85755b6a692..b20e46a15daaa5b63203209ddc183919be5bca48 100644 (file)
--- 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 9b467dd12a7a9aef9999069d53eb91d00abe22e8..e15a785b8af7c8f6778de60f8e17fad1c4ca1eff 100644 (file)
--- 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 85d37dc7388b488dca8b846825477d2052333a4d..170ef39d917cdcc36ec236cf1d14791731deb704 100644 (file)
--- 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 41d54cf147f87a15937e65df99d74374b19419ba..f987d36dedafa0eb90a60abb611b01bc21aaea00 100644 (file)
--- 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 fb434d926050d6f1754a675b24b704efefbff51b..95772eb7de8c37ca419410f5f6dba375643de58b 100644 (file)
--- 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 608640c7a13a772b3de827f4940e28caa73a4824..1e0fc99ce8e52380cecf5c12ebe3ca39da27508a 100644 (file)
--- 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 b0e0db5a015f5aa250da69b6fa85780c441fee35..e9ff73ab1929603de0aa5bafce4e56fc3aa53eb3 100644 (file)
--- 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 5419087888db1e154c4e0933f89a39e952240a59..07f1044442825fe6515834d7f3ba473865dfbf8f 100644 (file)
--- 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 d021cc3ac830e5668af4f57617ccecad6026e0a9..fc9294398b0ea893cdb47c32410bd891b9ef9cf1 100644 (file)
--- 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 43b4a513b3fcbf33f0aba64a00feb3c4f6b6d1f4..7b13d897ca06720040dcab5b99004da5540ea7ac 100644 (file)
--- 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 360f50f3879e39e6d198e8a3f71a2adec9cac342..41614354b51c43b4c39dff727ec2e973e7ded8b1 100644 (file)
--- 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 4532d53630a83e2da2cd81156d493be95e77fbce..a8d959427bcf74274e65f0f06093a032a4f2a32d 100644 (file)
--- 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 563a7e1f269e9e69fa11f171cda276919601260f..3c2ba6057480f75c6149713a1597fc2f3c988ddd 100644 (file)
--- 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 34b1a9c07db80de25975522f4208b8395622f441..588cadfe9eadd6d9920e6d659c62bf98b983fc8e 100644 (file)
--- 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 b7f0b62c857b095e33acd333c10bc0a43428e2b2..abb62aea449d77b4ffec79c6a231e418c62264b1 100644 (file)
--- 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 beb1b34ab5d9c3c070a157b04c7d634f9c873333..3fa721585f81edfdb51c792c0117216ecc6c4e46 100644 (file)
--- 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 c79eb077bed3be1a3caef02abe02f652cdbb1d5b..a75c1a1175872ca14b53fccbe4e6e4cb26ed4d57 100644 (file)
--- 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 37f586cd4fcc6c8fa34a0ca1fdb7b96851aaedae..e5fc403b495a0f6b4e2094f23e28fc07290af16b 100644 (file)
--- 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 37f586cd4fcc6c8fa34a0ca1fdb7b96851aaedae..e5fc403b495a0f6b4e2094f23e28fc07290af16b 100644 (file)
--- 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 3e715785b510f701f079ca4a1becd136b1e734f5..570438fcdf7e0b5fc9b2612861eae16df66da3c2 100644 (file)
--- 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 088689c722cc5b16b03e314bac837ad6fbdb7bbe..89820ac423aa4cf31bc01ac57961f0345dde1cf4 100644 (file)
--- 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 45d51bd4c384aa60d52ffddbcce2215b7be8a7f0..74ea96905248dac565381efe00c74d5ba18eee1d 100644 (file)
--- 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 189511d051bc11867d836bfd03f3904a650f79a4..eea8c2746418470e062b0a527be912fa1807749e 100644 (file)
--- 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 aef94b79e1fcfd52b56787d9d7ec344a90498751..23c9d2f41f6f61bca5a6d41849e12a35e49cf32d 100644 (file)
--- 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 208d0853c47b6eaba227676fc03d60730d1c6f04..1448ea5eee400a98caa2a66de361ceea873b19ff 100644 (file)
--- 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 0a8059964b62e73b31276e807d6ab29deaf96e9c..3f097ce6ebe1e252a8fbb3144384ba26bb04bb29 100644 (file)
--- 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 dc49c427f2465f756c9f647814a87e4f3732b6d7..79fba28f90832d9c0d432d320686d0f380689e71 100644 (file)
--- 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 f3215ec31e0b651bd58c045900308482843bc1ce..9a0bc2d40bdfab208db48f17ab9c3a4d68bc5bfb 100644 (file)
--- 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 587beb4f2cfd81e7a1149e63a87adbd88c8648d5..e9872c1f526482cd9529e62a7ea24ce7c934e976 100644 (file)
--- 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 297b7b0d0669ea3ab11e999e6570cbe8906cb868..ad57596e153d049e12d7ff7d5919dd8317514918 100644 (file)
--- 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