hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

load environment via configuration file

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-01-03 14:50:15 +01:00
parent 9790928780
commit 9d32c3a078
1 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/unitTest/PhraseanetPHPUnitAbstract.class.inc
View File

@@ -36,11 +36,13 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
* @var Symfony\Component\HttpKernel\Client
*/
protected $client;
/**
*
* @var record_adapter
*/
protected static $story_1;
/**
*
* @var record_adapter
@@ -371,8 +373,6 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
if (!self::$time_start)
self::$time_start = microtime(true);
if (!setup::is_installed())
exit("Phraseanet is not set up\n");
$appbox = appbox::get_instance();
if (!self::$updated)
@@ -784,6 +784,9 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
*/
public function __construct()
{
if (!setup::is_installed())
exit("Phraseanet is not set up\n");
if (null === self::$core)
{
if (is_file(__DIR__ . '/tests.sqlite'))
@@ -792,11 +795,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
}
self::$core = bootstrap::getCore();
self::$core["EM"] = self::$core->share(function()
{
$doctrine = new \Alchemy\Phrasea\Core\Service\DoctrineTestSQLite();
return $doctrine->getEntityManager();
});
$em = self::$core->getEntityManager();
/* @var $em \Doctrine\ORM\EntityManager */
@@ -1108,7 +1107,6 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
return $basketElement;
}
/**
*
* @return \Entities\Basket
@@ -1151,7 +1149,6 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
$em->flush();
return $basket;
}
/**