diff options
| author | Anatol Belski <ab@php.net> | 2014-11-20 15:20:18 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-20 15:20:18 +0100 |
| commit | 4f3ac2cdbedf7a84d64bfee7405f0c023641a806 (patch) | |
| tree | 5e021f37f7272c93926759b22f6e7823a584f542 /Zend/zend_inheritance.c | |
| parent | 14fa5339f86cac3a1b3ecfdf50c4ee0f31ca214e (diff) | |
| parent | 8904fbc6929aaf623d88127f876fa739c9ec627b (diff) | |
| download | php-git-4f3ac2cdbedf7a84d64bfee7405f0c023641a806.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (36 commits)
NEWS
adapt test for error message introduce in fix for #68463
Fix bug #68463 listen.allowed_clients can silently result in no allowed access
run a few request in this test
fix test
fix test
added info about some other macro changes
added note about toolset and phpize
added note about the response files
split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
split formatter_format*.phpt for ICP 54.1
split dateformat_timezone_arg_variations*.phpt for ICU 54.1
split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
fix icu version to test
split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
clone dateformat_calendars_variant3.phpt for ICU 54.1
split collator_get_sort_key_variant3.phpt for icu 54.1
...
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 7d9d1aade8..d577ba524c 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1206,7 +1206,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /* } zend_check_trait_usage(ce, cur_precedence->trait_method->ce TSRMLS_CC); - /** Ensure that the prefered method is actually available. */ + /** Ensure that the preferred method is actually available. */ lcname = zend_string_alloc(cur_method_ref->method_name->len, 0); zend_str_tolower_copy(lcname->val, cur_method_ref->method_name->val, @@ -1507,7 +1507,7 @@ static void zend_do_check_for_inconsistent_traits_aliasing(zend_class_entry *ce lc_method_name)) { zend_string_free(lc_method_name); zend_error_noreturn(E_COMPILE_ERROR, - "The modifiers for the trait alias %s() need to be changed in the same statment in which the alias is defined. Error", + "The modifiers for the trait alias %s() need to be changed in the same statement in which the alias is defined. Error", cur_alias->trait_method->method_name->val); } else { zend_string_free(lc_method_name); |