Fix skipifs to accept Oracle 11.2

diff --git a/ext/oci8/tests/bind_char_1.phpt b/ext/oci8/tests/bind_char_1.phpt
index d2dddc9086dee32c4398df81bf27fc2bdb8d212b..36574dbfbb12b1bf1526de25d8bd3ea627cfedb9 100644 (file)
--- a/ext/oci8/tests/bind_char_1.phpt
+++ b/ext/oci8/tests/bind_char_1.phpt
@@ -5,9 +5,9 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
 require(dirname(__FILE__)."/connect.inc");
 $sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release 1[12]\./', $sv, $matches);
 if ($sv !== 1) {
-       die ("skip expected output only valid when using Oracle 11g database");
+       die ("skip expected output only valid when using Oracle 11g+ database");
 }
 ?>
 --FILE--

diff --git a/ext/oci8/tests/bind_char_2.phpt b/ext/oci8/tests/bind_char_2.phpt
index 183c09acb416cb10954ae4d01a9a9c313c33761e..f0f41663f57aa2b6d95d2894d2808940a255afe1 100644 (file)
--- a/ext/oci8/tests/bind_char_2.phpt
+++ b/ext/oci8/tests/bind_char_2.phpt
@@ -5,9 +5,9 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR and dates
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
 require(dirname(__FILE__)."/connect.inc");
 $sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release 1[12]\./', $sv, $matches);
 if ($sv !== 1) {
-       die ("skip expected output only valid when using Oracle 11g database");
+       die ("skip expected output only valid when using Oracle 11g+ database");
 }
 ?>
 --FILE--

diff --git a/ext/oci8/tests/bind_char_3.phpt b/ext/oci8/tests/bind_char_3.phpt
index f1e6a93c0c1ed00228acdebfa50600045b908ad0..6d1b31150f9acd7700ef009c10e65354c0f046a5 100644 (file)
--- a/ext/oci8/tests/bind_char_3.phpt
+++ b/ext/oci8/tests/bind_char_3.phpt
@@ -5,9 +5,9 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to CHAR parameter
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
 require(dirname(__FILE__)."/connect.inc");
 $sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release 1[12]\./', $sv, $matches);
 if ($sv !== 1) {
-       die ("skip expected output only valid when using Oracle 11g database");
+       die ("skip expected output only valid when using Oracle 11g+ database");
 }
 ?>
 --FILE--

diff --git a/ext/oci8/tests/bind_char_4.phpt b/ext/oci8/tests/bind_char_4.phpt
index ddd07dcb29156e0a66bbbb6ccc1b7060f52fc6f3..7377604b0cd713b4bf58f112cbbfedaaf2cf22ba 100644 (file)
--- a/ext/oci8/tests/bind_char_4.phpt
+++ b/ext/oci8/tests/bind_char_4.phpt
@@ -5,9 +5,9 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to VARCHAR2 parameter
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
 require(dirname(__FILE__)."/connect.inc");
 $sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release 1[12]\./', $sv, $matches);
 if ($sv !== 1) {
-       die ("skip expected output only valid when using Oracle 11g database");
+       die ("skip expected output only valid when using Oracle 11g+ database");
 }
 ?>
 --FILE--

diff --git a/ext/oci8/tests/bug27303.phpt b/ext/oci8/tests/bug27303.phpt
index 2cc63d662d5bd979c7caaddd644ac7995b406afc..4dce84463fe332c64dc884369891bafa8b02aace 100644 (file)
--- a/ext/oci8/tests/bug27303.phpt
+++ b/ext/oci8/tests/bug27303.phpt
@@ -5,9 +5,9 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters)
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
 require(dirname(__FILE__)."/connect.inc");
 $sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release 1[12]\./', $sv, $matches);
 if ($sv !== 1) {
-       die ("skip expected output only valid when using Oracle 11g database");
+       die ("skip expected output only valid when using Oracle 11g+ database");
 }
 ?>
 --FILE--

diff --git a/ext/oci8/tests/bug27303_2.phpt b/ext/oci8/tests/bug27303_2.phpt
index 3520b1ea3d20e54730a959ac73ef0238bf19b7cb..63200ed52e988e590989eb3a2969dd12e462e0be 100644 (file)
--- a/ext/oci8/tests/bug27303_2.phpt
+++ b/ext/oci8/tests/bug27303_2.phpt
@@ -5,9 +5,9 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters)
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
 require(dirname(__FILE__)."/connect.inc");
 $sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release 1[12]\./', $sv, $matches);
 if ($sv !== 1) {
-       die ("skip expected output only valid when using Oracle 11g database");
+       die ("skip expected output only valid when using Oracle 11g+ database");
 }
 ?>
 --FILE--

diff --git a/ext/oci8/tests/bug27303_4.phpt b/ext/oci8/tests/bug27303_4.phpt
index f0c960e9396072a1f1b6605c20c957e55e4f589c..031f0d1e12945546a4294dfdce2027a6cf6e5232 100644 (file)
--- a/ext/oci8/tests/bug27303_4.phpt
+++ b/ext/oci8/tests/bug27303_4.phpt
@@ -5,9 +5,9 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters)
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
 require(dirname(__FILE__)."/connect.inc");
 $sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release 1[12]\./', $sv, $matches);
 if ($sv !== 1) {
-       die ("skip expected output only valid when using Oracle 11g database");
+       die ("skip expected output only valid when using Oracle 11g+ database");
 }
 ?>
 --FILE--