diff options
author | Peter Kokot <peterkokot@gmail.com> | 2019-02-18 17:56:38 +0100 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2019-02-18 17:56:38 +0100 |
commit | 18295b396f1e62fa2ccbb21b1c768a04b2ad9621 (patch) | |
tree | 7123c68b7dc7aefce513f38f46b2899eed2ab39d /Zend/zend_inheritance.c | |
parent | 879cd0491399ccfacac0d6ed701d998a65a6cc97 (diff) | |
parent | da3316ff0f03f5fccb3a343d31f8cc915da7fa5d (diff) | |
download | php-git-18295b396f1e62fa2ccbb21b1c768a04b2ad9621.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix typos in code comments in Zend/ [skip ci]
Diffstat (limited to 'Zend/zend_inheritance.c')
-rw-r--r-- | Zend/zend_inheritance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index b0770e2068..ed6d30886e 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1855,7 +1855,7 @@ static void zend_do_check_for_inconsistent_traits_aliasing(zend_class_entry *ce, ZSTR_VAL(cur_alias->trait_method.method_name)); } else { /** Here are two possible cases: - 1) this is an attempt to modifiy the visibility + 1) this is an attempt to modify the visibility of a method introduce as part of another alias. Since that seems to violate the DRY principle, we check against it and abort. |