From 25052ff3afb4ab704935c7a9da14a44fc090d31e Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Fri, 16 Dec 2005 23:21:38 +0000
Subject: [PATCH] - MFB

---
 .../tests/general_functions/bug32647.phpt     | 20 ++++++++++---------
 tests/classes/bug27504.phpt                   |  3 ++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ext/standard/tests/general_functions/bug32647.phpt b/ext/standard/tests/general_functions/bug32647.phpt
index ca98f429a7..2e82012077 100644
--- a/ext/standard/tests/general_functions/bug32647.phpt
+++ b/ext/standard/tests/general_functions/bug32647.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Bug #32647 (Using register_shutdown_function() with invalid callback can crash PHP)
 --INI--
-error_reporting=2047
+error_reporting=4095
 display_errors=1
 --FILE--
 <?php
 
 function foo()
 {
-  echo "joo!\n";
+  echo "foo!\n";
 }
 
 class bar
@@ -23,9 +23,9 @@ register_shutdown_function(array($obj,"some string")); // Invalid
 register_shutdown_function(array(0,""));               // Invalid
 register_shutdown_function(array('bar','foo'));        // Invalid
 register_shutdown_function(array(0,"some string"));    // Invalid
-register_shutdown_function('bar');                     // Valid
+register_shutdown_function('bar');                     // Invalid
 register_shutdown_function('foo');                     // Valid
-register_shutdown_function(array('bar','barfoo'));     // Valid
+register_shutdown_function(array('bar','barfoo'));     // Invalid
 
 $obj = new bar;
 register_shutdown_function(array($obj,'foobar'));      // Invalid
@@ -45,11 +45,13 @@ Warning: register_shutdown_function(): Invalid shutdown callback 'Array' passed
 
 Warning: register_shutdown_function(): Invalid shutdown callback 'Array' passed in %s on line %d
 
-Warning: (Registered shutdown functions) Unable to call bar::foo() - function does not exist in Unknown on line 0
+Strict Standards: Non-static method bar::barfoo() cannot be called statically in %sbug32647.php on line %d
 
-Warning: (Registered shutdown functions) Unable to call bar() - function does not exist in Unknown on line 0
-joo!
-bar!
+Warning: register_shutdown_function(): Invalid shutdown callback 'bar::foobar' passed in %sbug32647.php on line %d
+foo!
+
+Strict Standards: Non-static method bar::barfoo() cannot be called statically in Unknown on line 0
 
-Warning: (Registered shutdown functions) Unable to call bar::foobar() - function does not exist in Unknown on line 0
+Strict Standards: Non-static method bar::barfoo() cannot be called statically in Unknown on line 0
+bar!
 bar!
diff --git a/tests/classes/bug27504.phpt b/tests/classes/bug27504.phpt
index 64d68ba8ae..ca13990c93 100644
--- a/tests/classes/bug27504.phpt
+++ b/tests/classes/bug27504.phpt
@@ -20,5 +20,6 @@ Bug #27504 (call_user_func_array allows calling of private/protected methods)
 --EXPECTF--
 Called function foo:bar(%d)
 
-Fatal error: Call to private method foo::bar() from context '' in %s on line 13
+Warning: call_user_func_array(): First argument is expected to be a valid callback, 'foo::bar' was given in %sbug27504.php on line %d
 
+Fatal error: Call to private method foo::bar() from context '' in %s on line %d
-- 
2.40.0