- MFH Bugfix #30126

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index ea944e08409b76741e40fb11ac8b024f934109a3..01963e5fe6e647e07e4e7ae9fb363e6b6e7f447e 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1358,8 +1358,9 @@ void zend_verify_abstract_class(zend_class_entry *ce TSRMLS_DC)
                zend_hash_apply_with_argument(&ce->function_table, (apply_func_arg_t) zend_verify_abstract_class_function, &ai TSRMLS_CC);
 
                if (ai.cnt) {           
-                       zend_error(E_ERROR, "Class %s contains %d abstract methods and must therefore be declared abstract (" MAX_ABSTRACT_INFO_FMT MAX_ABSTRACT_INFO_FMT MAX_ABSTRACT_INFO_FMT ")", 
+                       zend_error(E_ERROR, "Class %s contains %d abstract method%s and must therefore be declared abstract or implement the remaining methods (" MAX_ABSTRACT_INFO_FMT MAX_ABSTRACT_INFO_FMT MAX_ABSTRACT_INFO_FMT ")", 
                                ce->name, ai.cnt, 
+                               ai.cnt > 1 ? "s" : "",
                                DISPLAY_ABSTRACT_FN(0),
                                DISPLAY_ABSTRACT_FN(1),
                                DISPLAY_ABSTRACT_FN(2)