From: Marcus Boerger <helly@php.net>
Date: Mon, 2 May 2005 15:55:05 +0000 (+0000)
Subject: - Part 1 of #30126: Enhancement for error message for abstract classes
X-Git-Tag: php-5.0.1b1~348
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f44dc4c930909a13be990feb601ba977065d0876;p=php

- Part 1 of #30126: Enhancement for error message for abstract classes
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index e49086acc7..8d615e8785 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1362,8 +1362,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 (" 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)