From: victorbarbu <victorbarbu08@gmail.com>
Date: Sat, 6 Feb 2016 14:16:40 +0000 (+0200)
Subject: Add support for traits in ClassCollector
X-Git-Tag: 1.31.0-rc.0~8019^2
X-Git-Url: http://git.cyclocoop.org/%24dirpuce/puce%24spip_lang_rtl.gif?a=commitdiff_plain;h=7d0ba96499f0c1493cf6b7cba824d0114e9a3bc6;p=lhc%2Fweb%2Fwiklou.git

Add support for traits in ClassCollector

Bug: T126116
Change-Id: Ifb81c6844565736111717736fe7649492e31f0f7
---

diff --git a/includes/utils/AutoloadGenerator.php b/includes/utils/AutoloadGenerator.php
index 7d6315631e..69426d7126 100644
--- a/includes/utils/AutoloadGenerator.php
+++ b/includes/utils/AutoloadGenerator.php
@@ -310,6 +310,7 @@ class ClassCollector {
 		case T_NAMESPACE:
 		case T_CLASS:
 		case T_INTERFACE:
+		case T_TRAIT:
 			$this->startToken = $token;
 		}
 	}
@@ -331,6 +332,7 @@ class ClassCollector {
 
 		case T_CLASS:
 		case T_INTERFACE:
+		case T_TRAIT:
 			$this->tokens[] = $token;
 			if ( is_array( $token ) && $token[0] === T_STRING ) {
 				$this->classes[] = $this->namespace . $this->implodeTokens();