Merge pull request #5897 from mikaelz/patch-1

Check for Xcache from INI setting
doctrine · Nov 26, 2016 · dc7c6ed · dc7c6ed
2 parents 28025b8 + 7ef3e3a
commit dc7c6ed
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/Doctrine/ORM/Tools/Setup.php b/lib/Doctrine/ORM/Tools/Setup.php
@@ -126,7 +126,7 @@ public static function createConfiguration($isDevMode = false, $proxyDir = null,
         if ($isDevMode === false && $cache === null) {
             if (extension_loaded('apc')) {
                 $cache = new \Doctrine\Common\Cache\ApcCache();
-            } elseif (extension_loaded('xcache')) {
+            } elseif (ini_get('xcache.cacher')) {
                 $cache = new \Doctrine\Common\Cache\XcacheCache();
             } elseif (extension_loaded('memcache')) {
                 $memcache = new \Memcache();