Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

- Change E_COMPILE_ERROR to E_WARNING (for wrong visibility on magic methods)

PECL
Felipe Pena 18 years ago
parent
4a62db4e6c
commit
dc697bcea4
10 changed files with 29 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Zend/tests/magic_methods_002.phpt
  2. 2
      Zend/tests/magic_methods_003.phpt
  3. 2
      Zend/tests/magic_methods_004.phpt
  4. 2
      Zend/tests/magic_methods_005.phpt
  5. 2
      Zend/tests/magic_methods_006.phpt
  6. 4
      Zend/tests/magic_methods_007.phpt
  7. 4
      Zend/tests/magic_methods_008.phpt
  8. 2
      Zend/tests/magic_methods_009.phpt
  9. 4
      Zend/tests/magic_methods_010.phpt
  10. 28
      Zend/zend_compile.c

2
Zend/tests/magic_methods_002.phpt
View File

@ -11,4 +11,4 @@ class foo {
?>
--EXPECTF--
Fatal error: The magic method __unset() must have public visibility and can not be static in %s on line %d
Warning: The magic method __unset() must have public visibility and can not be static in %s on line %d

2
Zend/tests/magic_methods_003.phpt
View File

@ -11,4 +11,4 @@ class foo {
?>
--EXPECTF--
Fatal error: The magic method __unset() must have public visibility and can not be static in %s on line %d
Warning: The magic method __unset() must have public visibility and can not be static in %s on line %d

2
Zend/tests/magic_methods_004.phpt
View File

@ -11,4 +11,4 @@ class foo {
?>
--EXPECTF--
Fatal error: The magic method __unset() must have public visibility and can not be static in %s on line %d
Warning: The magic method __unset() must have public visibility and can not be static in %s on line %d

2
Zend/tests/magic_methods_005.phpt
View File

@ -9,4 +9,4 @@ interface a {
?>
--EXPECTF--
Fatal error: The magic method __call() must have public visibility and can not be static in %s on line %d
Warning: The magic method __call() must have public visibility and can not be static in %s on line %d

2
Zend/tests/magic_methods_006.phpt
View File

@ -9,4 +9,4 @@ interface a {
?>
--EXPECTF--
Fatal error: The magic method __callStatic() must have public visibility and be static in %s on line %d
Warning: The magic method __callStatic() must have public visibility and be static in %s on line %d

4
Zend/tests/magic_methods_007.phpt
View File

@ -9,4 +9,6 @@ abstract class b {
?>
--EXPECTF--
Fatal error: The magic method __set() must have public visibility and can not be static in %s on line %d
Warning: The magic method __set() must have public visibility and can not be static in %s on line %d
Fatal error: Method b::__set() must take exactly 2 arguments in %s on line %d

4
Zend/tests/magic_methods_008.phpt
View File

@ -14,4 +14,6 @@ class a extends b {
?>
--EXPECTF--
Fatal error: The magic method __set() must have public visibility and can not be static in %s on line %d
Warning: The magic method __set() must have public visibility and can not be static in %s on line %d
Fatal error: Access level to a::__set() must be public (as in class b) in %s on line %d

2
Zend/tests/magic_methods_009.phpt
View File

@ -10,4 +10,4 @@ class a {
?>
--EXPECTF--
Fatal error: The magic method __callStatic() must have public visibility and be static in %s on line %d
Warning: The magic method __callStatic() must have public visibility and be static in %s on line %d

4
Zend/tests/magic_methods_010.phpt
View File

@ -10,4 +10,6 @@ class a {
?>
--EXPECTF--
Fatal error: The magic method __toString() must have public visibility and can not be static in %s on line %d
Warning: The magic method __toString() must have public visibility and can not be static in %s on line %d
Fatal error: Method a::__tostring() cannot take arguments in %s on line %d

28
Zend/zend_compile.c
View File

@ -1206,31 +1206,31 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
if (CG(active_class_entry)->ce_flags & ZEND_ACC_INTERFACE) {
if ((name_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
zend_error(E_COMPILE_ERROR, "The magic method __call() must have public visibility and can not be static");
zend_error(E_WARNING, "The magic method __call() must have public visibility and can not be static");
}
} else if ((name_len == sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALLSTATIC_FUNC_NAME, sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1))) {
if ((fn_flags & (ZEND_ACC_PPP_MASK ^ ZEND_ACC_PUBLIC)) || (fn_flags & ZEND_ACC_STATIC) == 0) {
zend_error(E_COMPILE_ERROR, "The magic method __callStatic() must have public visibility and be static");
zend_error(E_WARNING, "The magic method __callStatic() must have public visibility and be static");
}
} else if ((name_len == sizeof(ZEND_GET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
zend_error(E_COMPILE_ERROR, "The magic method __get() must have public visibility and can not be static");
zend_error(E_WARNING, "The magic method __get() must have public visibility and can not be static");
}
} else if ((name_len == sizeof(ZEND_SET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
zend_error(E_COMPILE_ERROR, "The magic method __set() must have public visibility and can not be static");
zend_error(E_WARNING, "The magic method __set() must have public visibility and can not be static");
}
} else if ((name_len == sizeof(ZEND_UNSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
zend_error(E_COMPILE_ERROR, "The magic method __unset() must have public visibility and can not be static");
zend_error(E_WARNING, "The magic method __unset() must have public visibility and can not be static");
}
} else if ((name_len == sizeof(ZEND_ISSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
zend_error(E_COMPILE_ERROR, "The magic method __isset() must have public visibility and can not be static");
zend_error(E_WARNING, "The magic method __isset() must have public visibility and can not be static");
}
} else if ((name_len == sizeof(ZEND_TOSTRING_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_TOSTRING_FUNC_NAME, sizeof(ZEND_TOSTRING_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
zend_error(E_COMPILE_ERROR, "The magic method __toString() must have public visibility and can not be static");
zend_error(E_WARNING, "The magic method __toString() must have public visibility and can not be static");
}
}
} else {
@ -1266,37 +1266,37 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
CG(active_class_entry)->clone = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
zend_error(E_COMPILE_ERROR, "The magic method __call() must have public visibility and can not be static");
zend_error(E_WARNING, "The magic method __call() must have public visibility and can not be static");
}
CG(active_class_entry)->__call = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALLSTATIC_FUNC_NAME, sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1))) {
if ((fn_flags & (ZEND_ACC_PPP_MASK ^ ZEND_ACC_PUBLIC)) || (fn_flags & ZEND_ACC_STATIC) == 0) {
zend_error(E_COMPILE_ERROR, "The magic method __callStatic() must have public visibility and be static");
zend_error(E_WARNING, "The magic method __callStatic() must have public visibility and be static");
}
CG(active_class_entry)->__callstatic = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_GET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
zend_error(E_COMPILE_ERROR, "The magic method __get() must have public visibility and can not be static");
zend_error(E_WARNING, "The magic method __get() must have public visibility and can not be static");
}
CG(active_class_entry)->__get = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_SET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
zend_error(E_COMPILE_ERROR, "The magic method __set() must have public visibility and can not be static");
zend_error(E_WARNING, "The magic method __set() must have public visibility and can not be static");
}
CG(active_class_entry)->__set = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_UNSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
zend_error(E_COMPILE_ERROR, "The magic method __unset() must have public visibility and can not be static");
zend_error(E_WARNING, "The magic method __unset() must have public visibility and can not be static");
}
CG(active_class_entry)->__unset = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_ISSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
zend_error(E_COMPILE_ERROR, "The magic method __isset() must have public visibility and can not be static");
zend_error(E_WARNING, "The magic method __isset() must have public visibility and can not be static");
}
CG(active_class_entry)->__isset = (zend_function *) CG(active_op_array);
} else if ((name_len == sizeof(ZEND_TOSTRING_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_TOSTRING_FUNC_NAME, sizeof(ZEND_TOSTRING_FUNC_NAME)-1))) {
if (fn_flags & ((ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC) ^ ZEND_ACC_PUBLIC)) {
zend_error(E_COMPILE_ERROR, "The magic method __toString() must have public visibility and can not be static");
zend_error(E_WARNING, "The magic method __toString() must have public visibility and can not be static");
}
CG(active_class_entry)->__tostring = (zend_function *) CG(active_op_array);
} else if (!(fn_flags & ZEND_ACC_STATIC)) {

Write Preview
Loading…
Cancel
Save