Merge pull request #117 from AlexeyDsov/support54

AlexeyDsov · AlexeyDsov · commit 92574e4d5c62 · 2012-07-20T00:37:41.000-07:00
ClassUtils fix for php 5.4 support
diff --git a/main/Utils/ClassUtils.class.php b/main/Utils/ClassUtils.class.php
@@ -223,6 +223,7 @@ public static function checkStaticMethod($methodSignature)
 					if (
 						!class_exists($className)
 						&& !interface_exists($className)
+						&& !(function_exists('trait_exists') && trait_exists($className))
 					) {
 						include $file;
 					}

Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,7 @@ public static function checkStaticMethod($methodSignature)`
`223`	`223`	`if (`
`224`	`224`	`!class_exists($className)`
`225`	`225`	`&& !interface_exists($className)`
	`226`	`+ && !(function_exists('trait_exists') && trait_exists($className))`
`226`	`227`	`) {`
`227`	`228`	`include $file;`
`228`	`229`	`}`