svn: /php/php-src/trunk/Zend/ tests/traits/error_015.phpt zend_compile.c

felipe Fri, 07 May 2010 17:18:49 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=299112 Log: - Fix error message wording (Kalle) Changed paths: U php/php-src/trunk/Zend/tests/traits/error_015.phpt U php/php-src/trunk/Zend/zend_compile.c Modified: php/php-src/trunk/Zend/tests/traits/error_015.phpt =================================================================== --- php/php-src/trunk/Zend/tests/traits/error_015.phpt 2010-05-07 16:29:15 UTC (rev 299111) +++ php/php-src/trunk/Zend/tests/traits/error_015.phpt 2010-05-07 17:18:49 UTC (rev 299112) @@ -22,4 +22,4 @@ ?> --EXPECTF-- -Fatal error: Failed to add aliased trait method (zzz) to trait table. Probably there is 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 same name in %s on line %d Modified: php/php-src/trunk/Zend/zend_compile.c =================================================================== --- php/php-src/trunk/Zend/zend_compile.c 2010-05-07 16:29:15 UTC (rev 299111) +++ php/php-src/trunk/Zend/zend_compile.c 2010-05-07 17:18:49 UTC (rev 299112) @@ -3534,7 +3534,7 @@ 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 trait table. Probably there is 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 same name", fn_copy.common.function_name); } /* aliases[i]->function = fn_copy; */ efree(lcname); @@ -3579,7 +3579,7 @@ 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 trait table. Probably there is 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 same name", fn_copy2.common.function_name); } efree(lcname2); } else { @@ -3596,7 +3596,7 @@ } 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 trait table. Probably there is 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 same name", fn_copy.common.function_name); } }