Skip to content

Commit 3e0b33e

Browse files
committed
Merge branch 'skipif1' into PHP-5.3
* skipif1: Fix skipifs
2 parents 8c3bf96 + 6524a53 commit 3e0b33e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ext/oci8/tests/bind_char_2_11gR1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR and dates
55
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
66
require(dirname(__FILE__)."/connect.inc");
77
// The bind buffer size edge cases seem to change each DB version.
8-
if (preg_match('/Release 11\.1\./', $sv, $matches) !== 1) {
8+
if (preg_match('/Release 11\.1\./', oci_server_version($c), $matches) !== 1) {
99
if (preg_match('/Release 11\.2\.0\.3/', oci_server_version($c), $matches) !== 1) {
1010
die("skip expected output only valid when using Oracle 11gR1 or 11.2.0.3 databases");
1111
}

ext/oci8/tests/bind_char_3_11gR1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to CHAR parameter
55
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
66
require(dirname(__FILE__)."/connect.inc");
77
// The bind buffer size edge cases seem to change each DB version.
8-
if (preg_match('/Release 11\.1\./', $sv, $matches) !== 1) {
8+
if (preg_match('/Release 11\.1\./', oci_server_version($c), $matches) !== 1) {
99
if (preg_match('/Release 11\.2\.0\.3/', oci_server_version($c), $matches) !== 1) {
1010
die("skip expected output only valid when using Oracle 11gR1 or 11.2.0.3 databases");
1111
}

ext/oci8/tests/bind_char_4_11gR1.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to VARCHAR2 parameter
55
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
66
require(dirname(__FILE__)."/connect.inc");
77
// The bind buffer size edge cases seem to change each DB version.
8-
if (preg_match('/Release 11\.1\./', $sv, $matches) !== 1) {
8+
if (preg_match('/Release 11\.1\./', oci_server_version($c), $matches) !== 1) {
99
if (preg_match('/Release 11\.2\.0\.3/', oci_server_version($c), $matches) !== 1) {
1010
die("skip expected output only valid when using Oracle 11gR1 or 11.2.0.3 databases");
1111
}

0 commit comments

Comments
 (0)