com php-src: Adjust expected fatal error message Now also includes "on [TYPE]" after merge from master:
Zend/tests/methods-on-non-objects-args-catch.phpt Zend/tests/methods-on-non-objects-catch.phpt Zend/tests/methods-on-non-objects-chain.phpt
Zend/tests/methods-on-non-objects-eval.phpt Zend/tests/methods-on-non-objects-throw.phpt Zend/tests/methods-on-non-objects-usort.phpt
Zend/tests/methods-on-non-objects.phpt ext/mysqli/tests/bug33491.phpt ex
| From: | Tjerk Anne Meesters | Date: | Sun, 06 Jul 2014 15:07:41 +0000 |
| Subject: | com php-src: Adjust expected fatal error message Now also includes "on [TYPE]" after merge from master: Zend/tests/methods-on-non-objects-args-catch.phpt Zend/tests/methods-on-non-objects-catch.phpt Zend/tests/methods-on-non-objects-chain.phpt Zend/tests/methods-on-non-objects-eval.phpt Zend/tests/methods-on-non-objects-throw.phpt Zend/tests/methods-on-non-objects-usort.phpt Zend/tests/methods-on-non-objects.phpt ext/mysqli/tests/bug33491.phpt ex |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82132@lists.php.net to get a copy of this message | ||
Commit: 9b6062071e5b2b226f23f7138472055a909f4800
Author: Timm Friebe <thekid@thekid.de> Sun, 6 Jul 2014 17:07:41 +0200
Parents: a1554ca6343598c38e4fb4fbcc46419ce0bdf058
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9b6062071e5b2b226f23f7138472055a909f4800
Log:
Adjust expected fatal error message
Now also includes "on [TYPE]" after merge from master
Changed paths:
M Zend/tests/methods-on-non-objects-args-catch.phpt
M Zend/tests/methods-on-non-objects-catch.phpt
M Zend/tests/methods-on-non-objects-chain.phpt
M Zend/tests/methods-on-non-objects-eval.phpt
M Zend/tests/methods-on-non-objects-throw.phpt
M Zend/tests/methods-on-non-objects-usort.phpt
M Zend/tests/methods-on-non-objects.phpt
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 --git a/Zend/tests/methods-on-non-objects-args-catch.phpt b/Zend/tests/methods-on-non-objects-args-catch.phpt index 2dd54cb..853d2d5 100644 --- a/Zend/tests/methods-on-non-objects-args-catch.phpt +++ b/Zend/tests/methods-on-non-objects-args-catch.phpt @@ -13,6 +13,6 @@ echo "Alive\n"; --EXPECTF-- int(4096) -string(%d) "Call to a member function method() on a non-object" +string(%d) "Call to a member function method() on null" NULL Alive diff --git a/Zend/tests/methods-on-non-objects-catch.phpt b/Zend/tests/methods-on-non-objects-catch.phpt index 30a9c77..bbfadac 100644 --- a/Zend/tests/methods-on-non-objects-catch.phpt +++ b/Zend/tests/methods-on-non-objects-catch.phpt @@ -13,6 +13,6 @@ echo "Alive\n"; --EXPECTF-- int(4096) -string(%d) "Call to a member function method() on a non-object" +string(%d) "Call to a member function method() on null" NULL Alive diff --git a/Zend/tests/methods-on-non-objects-chain.phpt b/Zend/tests/methods-on-non-objects-chain.phpt index 0f29946..30da254 100644 --- a/Zend/tests/methods-on-non-objects-chain.phpt +++ b/Zend/tests/methods-on-non-objects-chain.phpt @@ -13,10 +13,10 @@ echo "Alive\n"; --EXPECTF-- int(4096) -string(%d) "Call to a member function method() on a non-object" +string(%d) "Call to a member function method() on null" int(4096) -string(%d) "Call to a member function chained() on a non-object" +string(%d) "Call to a member function chained() on null" int(4096) -string(%d) "Call to a member function invocations() on a non-object" +string(%d) "Call to a member function invocations() on null" NULL Alive diff --git a/Zend/tests/methods-on-non-objects-eval.phpt b/Zend/tests/methods-on-non-objects-eval.phpt index c961ed3..8ee494c 100644 --- a/Zend/tests/methods-on-non-objects-eval.phpt +++ b/Zend/tests/methods-on-non-objects-eval.phpt @@ -13,6 +13,6 @@ echo "Alive\n"; --EXPECTF-- int(4096) -string(%d) "Call to a member function method() on a non-object" +string(%d) "Call to a member function method() on null" NULL Alive diff --git a/Zend/tests/methods-on-non-objects-throw.phpt b/Zend/tests/methods-on-non-objects-throw.phpt index ac27ac3..874f57c 100644 --- a/Zend/tests/methods-on-non-objects-throw.phpt +++ b/Zend/tests/methods-on-non-objects-throw.phpt @@ -25,5 +25,5 @@ echo "Alive\n"; --EXPECTF-- Calling... Raising... -Caught expected Call to a member function method() on a non-object! +Caught expected Call to a member function method() on null! Alive diff --git a/Zend/tests/methods-on-non-objects-usort.phpt b/Zend/tests/methods-on-non-objects-usort.phpt index df702d3..760d481 100644 --- a/Zend/tests/methods-on-non-objects-usort.phpt +++ b/Zend/tests/methods-on-non-objects-usort.phpt @@ -1,5 +1,5 @@ --TEST-- -usort() in combination with "Call to a member function method() on a non-object" +usort() in combination with "Call to a member function method() on null" --FILE-- <?php set_error_handler(function($code, $message) { @@ -16,17 +16,17 @@ echo "Alive\n"; ?> --EXPECTF-- int(4096) -string(51) "Call to a member function compare() on a non-object" +string(43) "Call to a member function compare() on null" int(4096) -string(51) "Call to a member function compare() on a non-object" +string(43) "Call to a member function compare() on null" int(4096) -string(51) "Call to a member function compare() on a non-object" +string(43) "Call to a member function compare() on null" int(4096) -string(51) "Call to a member function compare() on a non-object" +string(43) "Call to a member function compare() on null" int(4096) -string(51) "Call to a member function compare() on a non-object" +string(43) "Call to a member function compare() on null" int(4096) -string(51) "Call to a member function compare() on a non-object" +string(43) "Call to a member function compare() on null" array(5) { [0]=> int(-1) diff --git a/Zend/tests/methods-on-non-objects.phpt b/Zend/tests/methods-on-non-objects.phpt index cc42637..01031b8 100644 --- a/Zend/tests/methods-on-non-objects.phpt +++ b/Zend/tests/methods-on-non-objects.phpt @@ -9,4 +9,4 @@ echo "Should not get here!\n"; ?> --EXPECTF-- -Catchable fatal error: Call to a member function method() on a non-object in %s on line %d +Catchable fatal error: Call to a member function method() on null in %s on line %d diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt index 100247f..c83e126 100644 --- a/ext/mysqli/tests/bug33491.phpt +++ b/ext/mysqli/tests/bug33491.phpt @@ -26,4 +26,4 @@ $DB->query_single('SELECT DATE()'); ?> --EXPECTF-- -Catchable 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 boolean 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 726267c..06c721ac 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 -Catchable fatal error: Call to a member function fetch_assoc() on a non-object in %s on line %d +Catchable fatal error: Call to a member function fetch_assoc() on %s 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 a1a4593..0beca90 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 -Catchable fatal error: Call to a member function execute() on a non-object in %s on line %d +Catchable fatal error: Call to a member function execute() on boolean 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 afea447..fc55547 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 -Catchable fatal error: Call to a member function execute() on a non-object in %s on line %d +Catchable fatal error: Call to a member function execute() on boolean 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 41ba2bb..36295e9 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 -Catchable fatal error: Call to a member function execute() on a non-object in %s on line %d +Catchable fatal error: Call to a member function execute() on boolean 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 a95209c..278cd4e 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 %s 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 -Catchable fatal error: Call to a member function errorInfo() on a non-object in %s on line %d \ No newline at end of file +Catchable fatal error: Call to a member function errorInfo() on boolean in %s on line %d \ No newline at end of file
diff --git a/Zend/tests/methods-on-non-objects-args-catch.phpt b/Zend/tests/methods-on-non-objects-args-catch.phpt index 2dd54cb..853d2d5 100644 --- a/Zend/tests/methods-on-non-objects-args-catch.phpt +++ b/Zend/tests/methods-on-non-objects-args-catch.phpt @@ -13,6 +13,6 @@ echo "Alive\n"; --EXPECTF-- int(4096) -string(%d) "Call to a member function method() on a non-object" +string(%d) "Call to a member function method() on null" NULL Alive diff --git a/Zend/tests/methods-on-non-objects-catch.phpt b/Zend/tests/methods-on-non-objects-catch.phpt index 30a9c77..bbfadac 100644 --- a/Zend/tests/methods-on-non-objects-catch.phpt +++ b/Zend/tests/methods-on-non-objects-catch.phpt @@ -13,6 +13,6 @@ echo "Alive\n"; --EXPECTF-- int(4096) -string(%d) "Call to a member function method() on a non-object" +string(%d) "Call to a member function method() on null" NULL Alive diff --git a/Zend/tests/methods-on-non-objects-chain.phpt b/Zend/tests/methods-on-non-objects-chain.phpt index 0f29946..30da254 100644 --- a/Zend/tests/methods-on-non-objects-chain.phpt +++ b/Zend/tests/methods-on-non-objects-chain.phpt @@ -13,10 +13,10 @@ echo "Alive\n"; --EXPECTF-- int(4096) -string(%d) "Call to a member function method() on a non-object" +string(%d) "Call to a member function method() on null" int(4096) -string(%d) "Call to a member function chained() on a non-object" +string(%d) "Call to a member function chained() on null" int(4096) -string(%d) "Call to a member function invocations() on a non-object" +string(%d) "Call to a member function invocations() on null" NULL Alive diff --git a/Zend/tests/methods-on-non-objects-eval.phpt b/Zend/tests/methods-on-non-objects-eval.phpt index c961ed3..8ee494c 100644 --- a/Zend/tests/methods-on-non-objects-eval.phpt +++ b/Zend/tests/methods-on-non-objects-eval.phpt @@ -13,6 +13,6 @@ echo "Alive\n"; --EXPECTF-- int(4096) -string(%d) "Call to a member function method() on a non-object" +string(%d) "Call to a member function method() on null" NULL Alive diff --git a/Zend/tests/methods-on-non-objects-throw.phpt b/Zend/tests/methods-on-non-objects-throw.phpt index ac27ac3..874f57c 100644 --- a/Zend/tests/methods-on-non-objects-throw.phpt +++ b/Zend/tests/methods-on-non-objects-throw.phpt @@ -25,5 +25,5 @@ echo "Alive\n"; --EXPECTF-- Calling... Raising... -Caught expected Call to a member function method() on a non-object! +Caught expected Call to a member function method() on null! Alive diff --git a/Zend/tests/methods-on-non-objects-usort.phpt b/Zend/tests/methods-on-non-objects-usort.phpt index df702d3..760d481 100644 --- a/Zend/tests/methods-on-non-objects-usort.phpt +++ b/Zend/tests/methods-on-non-objects-usort.phpt @@ -1,5 +1,5 @@ --TEST-- -usort() in combination with "Call to a member function method() on a non-object" +usort() in combination with "Call to a member function method() on null" --FILE-- <?php set_error_handler(function($code, $message) { @@ -16,17 +16,17 @@ echo "Alive\n"; ?> --EXPECTF-- int(4096) -string(51) "Call to a member function compare() on a non-object" +string(43) "Call to a member function compare() on null" int(4096) -string(51) "Call to a member function compare() on a non-object" +string(43) "Call to a member function compare() on null" int(4096) -string(51) "Call to a member function compare() on a non-object" +string(43) "Call to a member function compare() on null" int(4096) -string(51) "Call to a member function compare() on a non-object" +string(43) "Call to a member function compare() on null" int(4096) -string(51) "Call to a member function compare() on a non-object" +string(43) "Call to a member function compare() on null" int(4096) -string(51) "Call to a member function compare() on a non-object" +string(43) "Call to a member function compare() on null" array(5) { [0]=> int(-1) diff --git a/Zend/tests/methods-on-non-objects.phpt b/Zend/tests/methods-on-non-objects.phpt index cc42637..01031b8 100644 --- a/Zend/tests/methods-on-non-objects.phpt +++ b/Zend/tests/methods-on-non-objects.phpt @@ -9,4 +9,4 @@ echo "Should not get here!\n"; ?> --EXPECTF-- -Catchable fatal error: Call to a member function method() on a non-object in %s on line %d +Catchable fatal error: Call to a member function method() on null in %s on line %d diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt index 100247f..c83e126 100644 --- a/ext/mysqli/tests/bug33491.phpt +++ b/ext/mysqli/tests/bug33491.phpt @@ -26,4 +26,4 @@ $DB->query_single('SELECT DATE()'); ?> --EXPECTF-- -Catchable 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 boolean 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 726267c..06c721ac 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 -Catchable fatal error: Call to a member function fetch_assoc() on a non-object in %s on line %d +Catchable fatal error: Call to a member function fetch_assoc() on %s 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 a1a4593..0beca90 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 -Catchable fatal error: Call to a member function execute() on a non-object in %s on line %d +Catchable fatal error: Call to a member function execute() on boolean 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 afea447..fc55547 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 -Catchable fatal error: Call to a member function execute() on a non-object in %s on line %d +Catchable fatal error: Call to a member function execute() on boolean 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 41ba2bb..36295e9 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 -Catchable fatal error: Call to a member function execute() on a non-object in %s on line %d +Catchable fatal error: Call to a member function execute() on boolean 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 a95209c..278cd4e 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 %s 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 -Catchable fatal error: Call to a member function errorInfo() on a non-object in %s on line %d \ No newline at end of file +Catchable fatal error: Call to a member function errorInfo() on boolean in %s on line %d \ No newline at end of file