hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 05:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Appbox

Browse Source
This commit is contained in:
Romain Neutron
2012-02-21 16:19:08 +01:00
parent df745a69fb
commit 7d41a36694
18 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -823,12 +823,13 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
$serviceName = $configuration->getTemplating();
$confService = $configuration->getService($serviceName);
$templateServiceBuilder = new \Alchemy\Phrasea\Core\ServiceBuilder\TemplateEngine(
$templateServiceBuilder = \Alchemy\Phrasea\Core\Service\Builder::create(
self::$core,
$serviceName
, $confService
);
$this->app['Core']["Twig"] = $templateServiceBuilder->buildService()->getService();
$this->app['Core']["Twig"] = $templateServiceBuilder->getService();
}
/**
@@ -837,7 +838,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
*/
private static function updateTablesSchema()
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
if (!self::$updated)
{
@@ -889,7 +890,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
*/
private static function createSetOfUserTests()
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$usr_id = User_Adapter::get_usr_id_from_login('test_phpunit');
$usr_alt1_id = User_Adapter::get_usr_id_from_login('test_phpunit_alt1');
@@ -925,7 +926,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
*/
private static function giveRightsToUser(\User_Adapter $user)
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$user->ACL()->give_access_to_sbas(array_keys($appbox->get_databoxes()));
@@ -979,7 +980,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
*/
private static function setCollection()
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$coll = $collection_no_acces = null;
foreach ($appbox->get_databoxes() as $databox)