- Reverted fix for bug #51176

diff --git a/Zend/tests/bug45180.phpt b/Zend/tests/bug45180.phpt
index 4e1ab9ee0829e3c69251e81862a5b62bcc878bb8..f1ca4342725898c51fa2af152a65f688c7a58514 100644 (file)
--- a/Zend/tests/bug45180.phpt
+++ b/Zend/tests/bug45180.phpt
@@ -43,11 +43,11 @@ __call:
 string(3) "ABC"
 __call:
 string(3) "ABC"
-__callstatic:
+__call:
 string(3) "XYZ"
-__callstatic:
+__call:
 string(3) "WWW"
-__callstatic:
+__call:
 string(3) "ABC"
 __callstatic:
 string(1) "A"
@@ -58,4 +58,4 @@ string(1) "C"
 __callstatic:
 string(3) "FOO"
 __callstatic:
-string(3) "FOO"
+string(3) "FOO"
\ No newline at end of file

diff --git a/Zend/tests/bug45186.phpt b/Zend/tests/bug45186.phpt
index da7ac73f5cefbae7be1e686ac0c2ed780c529be9..bcf88a1897603dc9b3620709d02bd6a96d52d78a 100644 (file)
--- a/Zend/tests/bug45186.phpt
+++ b/Zend/tests/bug45186.phpt
@@ -35,17 +35,17 @@ call_user_func('self::y');
 
 ?>
 --EXPECTF--
-__callstatic:
+__call:
 string(3) "ABC"
-__callstatic:
+__call:
 string(3) "ABC"
 __call:
 string(3) "xyz"
-__callstatic:
+__call:
 string(3) "www"
 __call:
 string(1) "y"
-__callstatic:
+__call:
 string(1) "y"
 ok
 __callstatic:

diff --git a/Zend/tests/bug51176.phpt b/Zend/tests/bug51176.phpt
index 436378eff20da4c2ff12299a079dc6f12ae171d6..1b0e285c6448999ce29b46d48ab87b9bacaa8445 100644 (file)
--- a/Zend/tests/bug51176.phpt
+++ b/Zend/tests/bug51176.phpt
@@ -27,6 +27,6 @@ $foo->start();
 
 ?>
 --EXPECT--
-static
-static
-static
+instance
+instance
+instance
\ No newline at end of file

diff --git a/Zend/tests/call_static_003.phpt b/Zend/tests/call_static_003.phpt
index d5e2b75298ca305ac93d379e85a0f51d7af27c08..566ff0fdf220b4cd3e52eee7387d83da42617ded 100644 (file)
--- a/Zend/tests/call_static_003.phpt
+++ b/Zend/tests/call_static_003.phpt
@@ -28,9 +28,9 @@ foo::BAZ();
 --EXPECT--
 nonstatic
 string(6) "fOoBaR"
-static
+nonstatic
 string(6) "foOBAr"
-static
+nonstatic
 string(6) "fOOBAr"
 static
 string(3) "bAr"

diff --git a/Zend/tests/call_static_007.phpt b/Zend/tests/call_static_007.phpt
index 766802092ba9b7d46abdb09699086e29ea1b7ee2..419f102310313ec3f51d574fcbe452bcd126ccf2 100644 (file)
--- a/Zend/tests/call_static_007.phpt
+++ b/Zend/tests/call_static_007.phpt
@@ -30,5 +30,5 @@ a::Foo();
 --EXPECT--
 __callstatic: Test
 __call: Test
-__callstatic: Bar
+__call: Bar
 __callstatic: Foo

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 291655027f5e58e463691580fe6e3dc6132be936..026f15dad833b65ae74fed5db0457c97cbe0d42a 100644 (file)
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -984,13 +984,13 @@ ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, char *f
        if (!fbc && zend_hash_find(&ce->function_table, lc_function_name, function_name_strlen+1, (void **) &fbc)==FAILURE) {
                efree(lc_function_name);
 
-               if (ce->__callstatic) {
-                       return zend_get_user_callstatic_function(ce, function_name_strval, function_name_strlen);
-               } else if (ce->__call &&
+               if (ce->__call &&
                    EG(This) &&
                    Z_OBJ_HT_P(EG(This))->get_class_entry &&
                    instanceof_function(Z_OBJCE_P(EG(This)), ce TSRMLS_CC)) {
                        return zend_get_user_call_function(ce, function_name_strval, function_name_strlen);
+               } else if (ce->__callstatic) {
+                       return zend_get_user_callstatic_function(ce, function_name_strval, function_name_strlen);
                } else {
                        return NULL;
                }