com php-src: Adjust expected outcome (non-Zend tests): ext/mysqli/tests/bug33491.phpt ext/mysqli/tests/mysqli_change _user_new.phpt
ext/pdo_mysql/tests/pdo_mysql_prep are_native_clear_error.phpt ext/pdo_mysql/tests/pdo _mysql_prepare_native_mixed_style.phpt ext/pdo_
mysql/tests/pdo_mysql_stmt_errorcode.phpt ext/pdo_m ysql/tests/pdo_mysql_stmt_multiquery.phpt

Commit: 9265077bb08f76cafcd42e674a4edb4cba612635 Author: Timm Friebe <thekid@thekid.de> Sat, 19 Apr 2014 14:09:10 +0200 Parents: f5efee1d22805d19400e9ba1f5b5deed26fdb662 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9265077bb08f76cafcd42e674a4edb4cba612635 Log: Adjust expected outcome (non-Zend tests) Changed paths: M ext/mysqli/tests/bug33491.phpt M ext/mysqli/tests/mysqli_change_user_new.phpt M ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt M ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt M ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode..phpt M ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt Diff: diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt index 168ecb0..91ad810 100644 --- a/ext/mysqli/tests/bug33491.phpt +++ b/ext/mysqli/tests/bug33491.phpt @@ -26,4 +26,4 @@ $DB->query_single('SELECT DATE()'); ?> --EXPECTF-- -Fatal error: Call to a member function fetch_row() on a non-object in %sbug33491.php on line %d +Catchable fatal error: Call to a member function fetch_row() on a non-object in %sbug33491.php on line %d diff --git a/ext/mysqli/tests/mysqli_change_user_new.phpt b/ext/mysqli/tests/mysqli_change_user_new.phpt index a87afa8..726267c 100644 --- a/ext/mysqli/tests/mysqli_change_user_new.phpt +++ b/ext/mysqli/tests/mysqli_change_user_new.phpt @@ -41,4 +41,4 @@ Warning: mysqli_query(): MySQL server has gone away in %s on line %d Warning: mysqli_query(): Error reading result set's header in %s on line %d [003] [2006] MySQL server has gone away -Fatal error: Call to a member function fetch_assoc() on a non-object in %s on line %d \ No newline at end of file +Catchable fatal error: Call to a member function fetch_assoc() on a non-object in %s on line %d diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt index 42c3d07..a1a4593 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt @@ -93,4 +93,4 @@ array(1) { Warning: PDO::prepare(): SQLSTATE[42S22]: Column not found: 1054 Unknown column 'unknown_column' in 'field list' in %s on line %d -Fatal error: Call to a member function execute() on a non-object in %s on line %d \ No newline at end of file +Catchable fatal error: Call to a member function execute() on a non-object in %s on line %d diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt index 90cedef..afea447 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt @@ -36,4 +36,4 @@ Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number: mixed named Warning: PDO::prepare(): SQLSTATE[HY093]: Invalid parameter number in %s on line %d -Fatal error: Call to a member function execute() on a non-object in %s on line %d \ No newline at end of file +Catchable fatal error: Call to a member function execute() on a non-object in %s on line %d diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt index 4d59e8c..41ba2bb 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt @@ -56,4 +56,4 @@ Testing native PS... Warning: PDO::prepare(): SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.ihopeitdoesnotexist' doesn't exist in %s on line %d -Fatal error: Call to a member function execute() on a non-object in %s on line %d \ No newline at end of file +Catchable fatal error: Call to a member function execute() on a non-object in %s on line %d diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt index 91b5237..37aa903 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt @@ -99,4 +99,4 @@ Native Prepared Statements... Warning: PDO::query(): SQLSTATE[42000]: Syntax error or access violation: 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '%SSELECT label FROM test ORDER BY id ASC LIMIT 1' at line %d in %s on line %d -Fatal error: Call to a member function errorInfo() on a non-object in %s on line %d +Catchable fatal error: Call to a member function errorInfo() on a non-object in %s on line %d