diff options
| author | Gabriel Caruso <carusogabriel34@gmail.com> | 2017-12-31 05:35:25 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-01-03 14:38:00 +0100 |
| commit | 64002648562362b97fcb78b68366b1b2118ffd5b (patch) | |
| tree | bd764caf78ed4982cb4ceeb216755cd9eb9952df /Zend/zend_inheritance.c | |
| parent | a76eeea73608e2d4d088a1c00ec985907e327d24 (diff) | |
| download | php-git-64002648562362b97fcb78b68366b1b2118ffd5b.tar.gz | |
Trailing whitespaces
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
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 fc4bb40e74..76bc91a956 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1601,7 +1601,7 @@ static void zend_do_traits_property_binding(zend_class_entry *ce) /* {{{ */ flags |= ZEND_ACC_CHANGED; } else { not_compatible = 1; - + if ((coliding_prop->flags & (ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC)) == (flags & (ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC))) { /* the flags are identical, thus, the properties may be compatible */ |