bug #12716 [ClassLoader] define constant only if it wasn't defined before (xabbuh)

fabpot · fabpot · commit 6945a2a15a96 · 2014-11-29T13:55:31.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [ClassLoader] define constant only if it wasn't defined before | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 388229b define constant only if it wasn't defined before
diff --git a/src/Symfony/Component/ClassLoader/ClassMapGenerator.php b/src/Symfony/Component/ClassLoader/ClassMapGenerator.php
@@ -11,10 +11,12 @@
 
 namespace Symfony\Component\ClassLoader;
 
-if (PHP_VERSION_ID >= 50400) {
-    define('SYMFONY_TRAIT', T_TRAIT);
-} else {
-    define('SYMFONY_TRAIT', 0);
+if (!defined('SYMFONY_TRAIT')) {
+    if (PHP_VERSION_ID >= 50400) {
+        define('SYMFONY_TRAIT', T_TRAIT);
+    } else {
+        define('SYMFONY_TRAIT', 0);
+    }
 }
 
 /**
