Merge branch 'master' of https://github.com/yiisoft/yii2

framework/YiiBase.php

@@ -370,7 +370,8 @@ class YiiBase
 
 		include($classFile);
 
-		if (class_exists($className, false) || interface_exists($className, false)) {
+		if (class_exists($className, false) || interface_exists($className, false) ||
+			function_exists('trait_exists') && trait_exists($className, false)) {
 			return true;
 		} else {
 			throw new UnknownClassException("Unable to find '$className' in file: $classFile");