From: Dmitry Stogov <dmitry@php.net>
Date: Tue, 18 Mar 2008 11:37:00 +0000 (+0000)
Subject: Removed hack (we don't need to modify class name).
X-Git-Tag: BEFORE_NEW_PARAMETER_PARSE~550
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b01532f64cfeb88270b1a8b13c52dd76aa3d999;p=php

Removed hack (we don't need to modify class name).
(the problem is covered by Zend/tests/ns_056.phpt)
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 2d885da9eb..a3660a90fe 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2278,14 +2278,10 @@ static zend_bool zend_do_perform_implementation_check(zend_function *fe, zend_fu
 			&& strcasecmp(fe->common.arg_info[i].class_name, proto->common.arg_info[i].class_name)!=0) {
 			char *colon;
 
-			if (fe->common.type == ZEND_USER_FUNCTION &&
-			    strchr(proto->common.arg_info[i].class_name, ':') == NULL &&
-			    (colon = zend_memrchr(fe->common.arg_info[i].class_name, ':', fe->common.arg_info[i].class_name_len)) != NULL &&
-			    strcasecmp(colon+1, proto->common.arg_info[i].class_name) == 0) {
-				efree((char*)fe->common.arg_info[i].class_name);
-				fe->common.arg_info[i].class_name = estrndup(proto->common.arg_info[i].class_name, proto->common.arg_info[i].class_name_len);
-				fe->common.arg_info[i].class_name_len = proto->common.arg_info[i].class_name_len;
-			} else {
+			if (fe->common.type != ZEND_USER_FUNCTION ||
+			    strchr(proto->common.arg_info[i].class_name, ':') != NULL ||
+			    (colon = zend_memrchr(fe->common.arg_info[i].class_name, ':', fe->common.arg_info[i].class_name_len)) == NULL ||
+			    strcasecmp(colon+1, proto->common.arg_info[i].class_name) != 0) {
 				return 0;
 			}
 		}