From c6762b8674b1766715aa6eb90e66e1afeaa11936 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Tue, 28 Feb 2012 14:11:17 +0100 Subject: [PATCH] Doctrine 2.2 Proxies --- lib/unitTest/Alchemy/Phrasea/Cache/XcacheCacheTest.php | 5 +++++ lib/unitTest/PhraseanetPHPUnitAbstract.class.inc | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/unitTest/Alchemy/Phrasea/Cache/XcacheCacheTest.php b/lib/unitTest/Alchemy/Phrasea/Cache/XcacheCacheTest.php index 42ef4312d8..c50423ebc3 100644 --- a/lib/unitTest/Alchemy/Phrasea/Cache/XcacheCacheTest.php +++ b/lib/unitTest/Alchemy/Phrasea/Cache/XcacheCacheTest.php @@ -20,6 +20,11 @@ class XcacheCacheTest extends \PHPUnit_Framework_TestCase */ public function setUp() { + if(!function_exists('xcache_info')) + { + $this->markTestSkipped('Xcache not loaded'); + } + $this->object = new \Alchemy\Phrasea\Cache\XcacheCache; } diff --git a/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc b/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc index 3144bb1e4b..9931617920 100644 --- a/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc +++ b/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc @@ -23,7 +23,6 @@ use Doctrine\Common\DataFixtures\Loader; * @link www.phraseanet.com */ -\bootstrap::register_autoloads(); abstract class PhraseanetPHPUnitAbstract extends WebTestCase