php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 00:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Felipe Pena
2010-05-07 17:57:09 +00:00
parent 91c46fd26e
commit a7c129af16
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/tests/traits/error_015.phpt
+1 -1
View File
@@ -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
Zend/zend_compile.c
+3 -3
View File
@@ -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);
}
}