Find traits with TokenArrayScanner

Added T_TRAIT next to T_CLASS and T_INTERFACE. For php 5.3 T_TRAIT gets defined to not get any errors.
zendframework · Aug 21, 2013 · be3f9b2 · be3f9b2
1 parent 22db9a5
commit be3f9b2
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/library/Zend/Code/Scanner/TokenArrayScanner.php b/library/Zend/Code/Scanner/TokenArrayScanner.php
@@ -298,6 +298,13 @@ protected function scan()
             throw new Exception\RuntimeException('No tokens were provided');
         }
 
+        /**
+         * Define PHP 5.4 'trait' token constant.
+         */
+        if (!defined('T_TRAIT')) {
+            define('T_TRAIT', 42001);
+        }
+
         /**
          * Variables & Setup
          */
@@ -552,6 +559,7 @@ protected function scan()
             case T_ABSTRACT:
             case T_CLASS:
             case T_INTERFACE:
+            case T_TRAIT:
 
                 $infos[$infoIndex] = array(
                     'type'        => ($tokenType === T_FUNCTION) ? 'function' : 'class',
@@ -573,7 +581,7 @@ protected function scan()
 
                 // process the name
                 if ($infos[$infoIndex]['shortName'] == ''
-                    && (($tokenType === T_CLASS || $tokenType === T_INTERFACE) && $infos[$infoIndex]['type'] === 'class'
+                    && (($tokenType === T_CLASS || $tokenType === T_INTERFACE || $tokenType === T_TRAIT) && $infos[$infoIndex]['type'] === 'class'
                         || ($tokenType === T_FUNCTION && $infos[$infoIndex]['type'] === 'function'))
                 ) {
                     $infos[$infoIndex]['shortName'] = $tokens[$tokenIndex + 2][1];