From: Felipe Pena <felipe@php.net>
Date: Fri, 7 May 2010 17:57:09 +0000 (+0000)
Subject: - Fix typo (take 3! thanks Chris and Tony)
X-Git-Tag: php-5.4.0alpha1~191^2~1532
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7c129af16bdc2f6cec91df35ec1f8297b17896f;p=php

- Fix typo (take 3! thanks Chris and Tony)
---

diff --git a/Zend/tests/traits/error_015.phpt b/Zend/tests/traits/error_015.phpt
index 32e2fd42a4..571e6f4db5 100644
--- a/Zend/tests/traits/error_015.phpt
+++ b/Zend/tests/traits/error_015.phpt
@@ -22,4 +22,4 @@ var_dump($x->test());
 
 ?>
 --EXPECTF--
-Fatal error: Failed to add aliased trait method (zzz) to the trait table. There is probably already a trait method with same name in %s on line %d
+Fatal error: Failed to add aliased trait method (zzz) to the trait table. There is probably already a trait method with the same name in %s on line %d
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 18cd5e4b39..b0a5d773f6 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3534,7 +3534,7 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args,
 					lcname = zend_str_tolower_dup(aliases[i]->alias, lcname_len);
 
 					if (zend_hash_add(target, lcname, lcname_len+1, &fn_copy, sizeof(zend_function), NULL)==FAILURE) {
-						zend_error(E_ERROR, "Failed to add aliased trait method (%s) to the trait table. There is probably already a trait method with same name", fn_copy.common.function_name);
+						zend_error(E_ERROR, "Failed to add aliased trait method (%s) to the trait table. There is probably already a trait method with the same name", fn_copy.common.function_name);
 					}
 					/* aliases[i]->function = fn_copy; */
 					efree(lcname);
@@ -3579,7 +3579,7 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args,
 						lcname2 = zend_str_tolower_dup(aliases[i]->alias, lcname2_len);
 
 						if (zend_hash_add(target, lcname2, lcname2_len+1, &fn_copy2, sizeof(zend_function), NULL)==FAILURE) {
-							zend_error(E_ERROR, "Failed to add aliased trait method (%s) to the trait table. There is probably already a trait method with same name", fn_copy2.common.function_name);
+							zend_error(E_ERROR, "Failed to add aliased trait method (%s) to the trait table. There is probably already a trait method with the same name", fn_copy2.common.function_name);
 						}
 						efree(lcname2);
 					} else {
@@ -3596,7 +3596,7 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args,
 		}
 
 		if (zend_hash_add(target, lcname, fnname_len+1, &fn_copy, sizeof(zend_function), NULL)==FAILURE) {
-			zend_error(E_ERROR, "Failed to add trait method (%s) to the trait table. There is probably already a trait method with same name", fn_copy.common.function_name);
+			zend_error(E_ERROR, "Failed to add trait method (%s) to the trait table. There is probably already a trait method with the same name", fn_copy.common.function_name);
 		}
 	}