diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2012-12-25 16:22:07 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2012-12-25 16:22:07 +0400 |
| commit | 7625a3b3b457b262148aa798e34789dbaaed6a91 (patch) | |
| tree | 51b8d73ca7665f7eeb4a1595e4ab0b3be595f2e8 | |
| parent | 016f3c86103b30520317d8a1740fdb9b8c28df0a (diff) | |
| parent | 7e2629635b09e0d0a546e475dca81b05a6ada65a (diff) | |
| download | php-git-7625a3b3b457b262148aa798e34789dbaaed6a91.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
spelling
| -rw-r--r-- | Zend/tests/traits/language018.phpt | 2 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Zend/tests/traits/language018.phpt b/Zend/tests/traits/language018.phpt index ac36698e35..169cb50c6b 100644 --- a/Zend/tests/traits/language018.phpt +++ b/Zend/tests/traits/language018.phpt @@ -12,4 +12,4 @@ class C1 { } ?> --EXPECTF-- -Fatal error: Cannot use 'abstarct' as method modifier in %s on line %d +Fatal error: Cannot use 'abstract' as method modifier in %s on line %d diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4d6d18cd4f..4564448045 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3835,7 +3835,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const if (*overriden) { if (zend_hash_quick_find(*overriden, arKey, nKeyLength, h, (void**) &existing_fn) == SUCCESS) { if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) { - /* Make sure the trait method is compatible with previosly declared abstarct method */ + /* Make sure the trait method is compatible with previosly declared abstract method */ if (!zend_traits_method_compatibility_check(fn, existing_fn TSRMLS_CC)) { zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s", zend_get_function_declaration(fn TSRMLS_CC), @@ -3858,7 +3858,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const zend_hash_quick_update(*overriden, arKey, nKeyLength, h, fn, sizeof(zend_function), (void**)&fn); return; } else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) { - /* Make sure the trait method is compatible with previosly declared abstarct method */ + /* Make sure the trait method is compatible with previosly declared abstract method */ if (!zend_traits_method_compatibility_check(fn, existing_fn TSRMLS_CC)) { zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s", zend_get_function_declaration(fn TSRMLS_CC), @@ -3873,7 +3873,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const } return; } else if ((existing_fn->common.scope->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) { - /* two trais can't define the same non-abstarct method */ + /* two trais can't define the same non-abstract method */ #if 1 zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because there are collisions with other trait methods on %s", name, ce->name); @@ -4438,7 +4438,7 @@ void zend_add_trait_alias(znode *method_reference, znode *modifiers, znode *alia zend_error(E_COMPILE_ERROR, "Cannot use 'static' as method modifier"); return; } else if (Z_LVAL(modifiers->u.constant) == ZEND_ACC_ABSTRACT) { - zend_error(E_COMPILE_ERROR, "Cannot use 'abstarct' as method modifier"); + zend_error(E_COMPILE_ERROR, "Cannot use 'abstract' as method modifier"); return; } else if (Z_LVAL(modifiers->u.constant) == ZEND_ACC_FINAL) { zend_error(E_COMPILE_ERROR, "Cannot use 'final' as method modifier"); |