From: Stanislav Malyshev <stas@php.net>
Date: Thu, 3 Jul 2003 12:03:11 +0000 (+0000)
Subject: enable Classname() constructor to be called via parent::__constructor()
X-Git-Tag: BEFORE_ARG_INFO~396
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f0234160a519593e864f54931edc4c44931b437;p=php

enable Classname() constructor to be called via parent::__constructor()
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 9c2b12588d..7b6eda00cf 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1306,7 +1306,14 @@ void zend_do_begin_class_member_function_call(TSRMLS_D)
 
 	/* a tmp var is leaked here */
 	opline->opcode = ZEND_INIT_STATIC_METHOD_CALL;
-	zend_lowercase_znode_if_const(&opline->op2);
+	if(opline->op2.op_type == IS_CONST &&
+	   (sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == Z_STRLEN(opline->op2.u.constant) &&
+	   memcmp(Z_STRVAL(opline->op2.u.constant), ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == 0) {
+		zval_dtor(&opline->op2.u.constant);
+		SET_UNUSED(opline->op2);
+	} else {
+		zend_lowercase_znode_if_const(&opline->op2);
+	}
 
 	zend_stack_push(&CG(function_call_stack), (void *) &ptr, sizeof(zend_function *));
 }
@@ -2600,7 +2607,7 @@ void zend_do_begin_new_object(znode *new_token, znode *class_type TSRMLS_DC)
 	opline->opcode = ZEND_INIT_CTOR_CALL;
 	opline->op1 = (opline-2)->result;
 	SET_UNUSED(opline->op2);
-
+	
 	zend_stack_push(&CG(function_call_stack), (void *) &ptr, sizeof(unsigned char *));
 }
 
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 1067ab04e7..771bf98051 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2426,6 +2426,7 @@ int zend_init_ctor_call_handler(ZEND_OPCODE_HANDLER_ARGS)
 	}
 
 	EX(fbc) = EX(fbc_constructor);
+
 	if (EX(fbc)->type == ZEND_USER_FUNCTION) { /* HACK!! */
 		EX(calling_scope) = EX(fbc)->common.scope;
 	} else {
@@ -2498,27 +2499,34 @@ int zend_init_static_method_call_handler(ZEND_OPCODE_HANDLER_ARGS)
 {
 	zval *function_name;
 	zend_class_entry *ce;
-	zend_bool is_const;
+	zend_bool is_const = 1;
 	char *function_name_strval;
 	int function_name_strlen;
 
 	zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope));
 
-	is_const = (EX(opline)->op2.op_type == IS_CONST);
+	ce = EX_T(EX(opline)->op1.u.var).EA.class_entry;
+	if(EX(opline)->op2.op_type != IS_UNUSED) {
+		is_const = (EX(opline)->op2.op_type == IS_CONST);
 
-	if (is_const) {
-		function_name_strval = EX(opline)->op2.u.constant.value.str.val;
-		function_name_strlen = EX(opline)->op2.u.constant.value.str.len;
-	} else {
-		function_name = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R);
+		if (is_const) {
+			function_name_strval = EX(opline)->op2.u.constant.value.str.val;
+			function_name_strlen = EX(opline)->op2.u.constant.value.str.len;
+		} else {
+			function_name = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R);
+			
+			function_name_strval = zend_str_tolower_dup(function_name->value.str.val, function_name->value.str.len);
+			function_name_strlen = function_name->value.str.len;
+		}
 
-		function_name_strval = zend_str_tolower_dup(function_name->value.str.val, function_name->value.str.len);
-		function_name_strlen = function_name->value.str.len;
+		EX(fbc) = zend_std_get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
+	} else {
+		if(!ce->constructor) {
+			zend_error(E_ERROR, "Can not call constructor");
+		}
+		EX(fbc) = ce->constructor;
 	}
 
-	ce = EX_T(EX(opline)->op1.u.var).EA.class_entry;
-
-	EX(fbc) = zend_std_get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC);
 	EX(calling_scope) = EX(fbc)->common.scope;
 
 	if (!is_const) {