felipe                                   Sat, 29 May 2010 21:55:19 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=299941

Log:
- Missing Trait check fix

Changed paths:
    U   php/php-src/trunk/ext/reflection/php_reflection.c
    U   php/php-src/trunk/ext/reflection/tests/traits002.phpt

Modified: php/php-src/trunk/ext/reflection/php_reflection.c
===================================================================
--- php/php-src/trunk/ext/reflection/php_reflection.c   2010-05-29 21:48:56 UTC 
(rev 299940)
+++ php/php-src/trunk/ext/reflection/php_reflection.c   2010-05-29 21:55:19 UTC 
(rev 299941)
@@ -382,7 +382,7 @@
        }
        if (ce->ce_flags & ZEND_ACC_INTERFACE) {
                string_printf(str, "interface ");
-       } else if (ce->ce_flags & ZEND_ACC_TRAIT) {
+       } else if ((ce->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {
                string_printf(str, "trait ");
        } else {
                if (ce->ce_flags & 
(ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {

Modified: php/php-src/trunk/ext/reflection/tests/traits002.phpt
===================================================================
--- php/php-src/trunk/ext/reflection/tests/traits002.phpt       2010-05-29 
21:48:56 UTC (rev 299940)
+++ php/php-src/trunk/ext/reflection/tests/traits002.phpt       2010-05-29 
21:55:19 UTC (rev 299941)
@@ -15,7 +15,7 @@

 ?>
 --EXPECTF--
-Class [ <user> trait foo ] {
+Class [ <user> abstract class foo ] {
   @@ %s 3-4

   - Constants [0] {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to