From: Felipe Pena <felipe@php.net>
Date: Thu, 14 May 2009 23:29:27 +0000 (+0000)
Subject: - Fix tests
X-Git-Tag: php-5.2.10RC1~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56274f384a5d8bef14822278e0bb83351c714bad;p=php

- Fix tests
---

diff --git a/ext/odbc/tests/odbc_columns_001.phpt b/ext/odbc/tests/odbc_columns_001.phpt
index f6da78e8e7..9932213117 100644
--- a/ext/odbc/tests/odbc_columns_001.phpt
+++ b/ext/odbc/tests/odbc_columns_001.phpt
@@ -28,5 +28,5 @@ bool(false)
 Warning: odbc_columns(): SQL error: Failed to fetch error message, SQL state HY000 in SQLColumns in %s on line %d
 bool(false)
 
-Warning: odbc_fetch_row() expects parameter 1 to be resource, boolean given in %s on line %d
-NULL
+Warning: odbc_fetch_row(): supplied argument is not a valid ODBC result resource in %s on line %d
+bool(false)
diff --git a/ext/odbc/tests/odbc_data_source_001.phpt b/ext/odbc/tests/odbc_data_source_001.phpt
index 17a826f0d0..44761fe3a2 100644
--- a/ext/odbc/tests/odbc_data_source_001.phpt
+++ b/ext/odbc/tests/odbc_data_source_001.phpt
@@ -18,8 +18,8 @@ var_dump(odbc_data_source($conn, SQL_FETCH_FIRST));
 Warning: odbc_data_source(): Invalid fetch type (0) in %s on line %d
 bool(false)
 
-Warning: odbc_data_source() expects parameter 2 to be long, string given in %s on line %d
-NULL
+Warning: odbc_data_source(): Invalid fetch type (0) in %s on line %d
+bool(false)
 array(%d) {
 %a
 }
diff --git a/ext/odbc/tests/odbc_exec_001.phpt b/ext/odbc/tests/odbc_exec_001.phpt
index c525a962b1..02b16ae4ee 100644
--- a/ext/odbc/tests/odbc_exec_001.phpt
+++ b/ext/odbc/tests/odbc_exec_001.phpt
@@ -23,11 +23,11 @@ odbc_exec($conn, NULL);
 
 ?>
 --EXPECTF--
-Warning: odbc_exec() expects parameter 3 to be long, %unicode_string_optional% given in %s on line %d
+Warning: odbc_exec(): SQL error: %s in %s on line %d
 
 Warning: odbc_exec(): SQL error: %s in %s on line %d
 
-Warning: odbc_exec() expects parameter 3 to be long, %unicode_string_optional% given in %s on line %d
+Warning: odbc_exec(): SQL error: %s in %s on line %d
 
 Warning: odbc_exec(): SQL error: %s in %s on line %d
 
diff --git a/ext/odbc/tests/odbc_free_result_001.phpt b/ext/odbc/tests/odbc_free_result_001.phpt
index 4fcd5cda2c..cd7a15e119 100644
--- a/ext/odbc/tests/odbc_free_result_001.phpt
+++ b/ext/odbc/tests/odbc_free_result_001.phpt
@@ -40,8 +40,8 @@ bool(true)
 Warning: odbc_free_result(): supplied resource is not a valid ODBC result resource in %s on line %d
 bool(false)
 
-Warning: odbc_free_result() expects parameter 1 to be resource, null given in %s on line %d
-NULL
+Warning: odbc_free_result(): supplied argument is not a valid ODBC result resource in %s on line %d
+bool(false)
 
 Warning: odbc_fetch_row(): %d is not a valid ODBC result resource in %s on line %d
 bool(false)