php/sme8/php-5.3.3-r305043.patch


http://svn.php.net/viewvc?view=revision&revision=305043

--- php-5.3.3/Zend/tests/bug45180.phpt.r305043
+++ php-5.3.3/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
--- php-5.3.3/Zend/tests/bug45186.phpt.r305043
+++ php-5.3.3/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:
--- php-5.3.3/Zend/tests/bug51176.phpt.r305043
+++ php-5.3.3/Zend/tests/bug51176.phpt
@@ -27,6 +27,6 @@ $foo->start();
 
 ?>
 --EXPECT--
-static
-static
-static
+instance
+instance
+instance
\ No newline at end of file
--- php-5.3.3/Zend/tests/call_static_003.phpt.r305043
+++ php-5.3.3/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"
--- php-5.3.3/Zend/tests/call_static_007.phpt.r305043
+++ php-5.3.3/Zend/tests/call_static_007.phpt
@@ -30,5 +30,5 @@ a::Foo();
 --EXPECT--
 __callstatic: Test
 __call: Test
-__callstatic: Bar
+__call: Bar
 __callstatic: Foo
--- php-5.3.3/Zend/zend_object_handlers.c.r305043
+++ php-5.3.3/Zend/zend_object_handlers.c
@@ -953,13 +953,13 @@ ZEND_API zend_function *zend_std_get_sta
        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;
                }
1
2	http://svn.php.net/viewvc?view=revision&revision=305043
3
4	--- php-5.3.3/Zend/tests/bug45180.phpt.r305043
5	+++ php-5.3.3/Zend/tests/bug45180.phpt
6	@@ -43,11 +43,11 @@ __call:
7	string(3) "ABC"
8	__call:
9	string(3) "ABC"
10	-__callstatic:
11	+__call:
12	string(3) "XYZ"
13	-__callstatic:
14	+__call:
15	string(3) "WWW"
16	-__callstatic:
17	+__call:
18	string(3) "ABC"
19	__callstatic:
20	string(1) "A"
21	@@ -58,4 +58,4 @@ string(1) "C"
22	__callstatic:
23	string(3) "FOO"
24	__callstatic:
25	-string(3) "FOO"
26	+string(3) "FOO"
27	\ No newline at end of file
28	--- php-5.3.3/Zend/tests/bug45186.phpt.r305043
29	+++ php-5.3.3/Zend/tests/bug45186.phpt
30	@@ -35,17 +35,17 @@ call_user_func('self::y');
31
32	?>
33	--EXPECTF--
34	-__callstatic:
35	+__call:
36	string(3) "ABC"
37	-__callstatic:
38	+__call:
39	string(3) "ABC"
40	__call:
41	string(3) "xyz"
42	-__callstatic:
43	+__call:
44	string(3) "www"
45	__call:
46	string(1) "y"
47	-__callstatic:
48	+__call:
49	string(1) "y"
50	ok
51	__callstatic:
52	--- php-5.3.3/Zend/tests/bug51176.phpt.r305043
53	+++ php-5.3.3/Zend/tests/bug51176.phpt
54	@@ -27,6 +27,6 @@ $foo->start();
55
56	?>
57	--EXPECT--
58	-static
59	-static
60	-static
61	+instance
62	+instance
63	+instance
64	\ No newline at end of file
65	--- php-5.3.3/Zend/tests/call_static_003.phpt.r305043
66	+++ php-5.3.3/Zend/tests/call_static_003.phpt
67	@@ -28,9 +28,9 @@ foo::BAZ();
68	--EXPECT--
69	nonstatic
70	string(6) "fOoBaR"
71	-static
72	+nonstatic
73	string(6) "foOBAr"
74	-static
75	+nonstatic
76	string(6) "fOOBAr"
77	static
78	string(3) "bAr"
79	--- php-5.3.3/Zend/tests/call_static_007.phpt.r305043
80	+++ php-5.3.3/Zend/tests/call_static_007.phpt
81	@@ -30,5 +30,5 @@ a::Foo();
82	--EXPECT--
83	__callstatic: Test
84	__call: Test
85	-__callstatic: Bar
86	+__call: Bar
87	__callstatic: Foo
88	--- php-5.3.3/Zend/zend_object_handlers.c.r305043
89	+++ php-5.3.3/Zend/zend_object_handlers.c
90	@@ -953,13 +953,13 @@ ZEND_API zend_function *zend_std_get_sta
91	if (!fbc && zend_hash_find(&ce->function_table, lc_function_name, function_name_strlen+1, (void **) &fbc)==FAILURE) {
92	efree(lc_function_name);
93
94	- if (ce->__callstatic) {
95	- return zend_get_user_callstatic_function(ce, function_name_strval, function_name_strlen);
96	- } else if (ce->__call &&
97	+ if (ce->__call &&
98	EG(This) &&
99	Z_OBJ_HT_P(EG(This))->get_class_entry &&
100	instanceof_function(Z_OBJCE_P(EG(This)), ce TSRMLS_CC)) {
101	return zend_get_user_call_function(ce, function_name_strval, function_name_strlen);
102	+ } else if (ce->__callstatic) {
103	+ return zend_get_user_callstatic_function(ce, function_name_strval, function_name_strlen);
104	} else {
105	return NULL;
106	}