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

Refactor Appbox

Browse Source
This commit is contained in:
Romain Neutron
2012-02-21 16:08:28 +01:00
parent a574dd14a8
commit 6ce734c50d
14 changed files with 235 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/classes/module/console/fileConfigCheck.class.php
View File

@@ -339,13 +339,12 @@ class module_console_fileConfigCheck extends Command
}
$serviceBuilder = new Core\ServiceBuilder\TemplateEngine(
$templateEngineName
$service = Core\Service\Builder::create(
\bootstrap::getCore()
, $templateEngineName
, $configuration
);
$service = $serviceBuilder->buildService();
if ($service->getType() === 'twig')
{
$twig = $service->getService();
@@ -432,16 +431,12 @@ class module_console_fileConfigCheck extends Command
throw $e;
}
$registry = \registry::get_instance();
$serviceBuilder = new Core\ServiceBuilder\Orm(
$ormName
$service = Core\Service\Builder::create(
\bootstrap::getCore()
, $ormName
, $configuration
, array('registry' => $registry)
);
$service = $serviceBuilder->buildService();
if ($service->getType() === 'doctrine')
{
$caches = $service->getCacheServices();

31
lib/classes/module/console/fileEnsureProductionSetting.class.php
View File

@@ -368,13 +368,12 @@ class module_console_fileEnsureProductionSetting extends Command
throw $e;
}
$serviceBuilder = new Core\ServiceBuilder\TemplateEngine(
$templateEngineName
$service = Core\Service\Builder::create(
\bootstrap::getCore()
, $templateEngineName
, $configuration
);
$service = $serviceBuilder->buildService();
if ($service->getType() === 'twig')
{
$twig = $service->getService();
@@ -454,14 +453,12 @@ class module_console_fileEnsureProductionSetting extends Command
}
$registry = \registry::get_instance();
$serviceBuilder = new Core\ServiceBuilder\Orm(
$ormName
$service = new Core\Service\Builder(
\bootstrap::getCore()
, $ormName
, $configuration
, array('registry' => $registry)
);
$service = $serviceBuilder->buildService();
if ($service->getType() === 'doctrine')
{
$output->writeln("");
@@ -504,12 +501,9 @@ class module_console_fileEnsureProductionSetting extends Command
$this->printConf($output, $key . ":" . $originalServiceName, $cacheOptions["options"]);
}
$serviceBuilder = new Core\ServiceBuilder\Cache(
$originalServiceName,
$originalConfiguration,
array("registry" => $registry)
$originalService = Core\Service\Builder::create(
\bootstrap::getCore(), $originalServiceName, $originalConfiguration
);
$originalService = $serviceBuilder->buildService();
if ($originalService->getType() === 'memcache')
{
@@ -534,13 +528,12 @@ class module_console_fileEnsureProductionSetting extends Command
{
$logServiceName = $options['log'];
$configuration = $this->configuration->getService($logServiceName);
$serviceBuilder = new Core\ServiceBuilder\Log(
$logServiceName
$serviceLog = Core\Service\Builder::create(
\bootstrap::getCore()
, $logServiceName
, $configuration
);
$serviceLog = $serviceBuilder->buildService();
$exists = true;
}
catch (\Exception $e)
@@ -548,7 +541,7 @@ class module_console_fileEnsureProductionSetting extends Command
$exists = false;
}
if($exists)
if ($exists)
{
throw new \Exception(sprintf(
"doctrine:orm:log %s service should not be enable"

2
lib/classes/module/console/schedulerState.class.php
View File

@@ -47,7 +47,7 @@ class module_console_schedulerState extends Command
try
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$task_manager = new task_manager($appbox);
$state = $task_manager->get_scheduler_state();
if ($state['schedstatus'] == 'started')

2
lib/classes/module/console/schedulerStop.class.php
View File

@@ -47,7 +47,7 @@ class module_console_schedulerStop extends Command
try
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$task_manager = new task_manager($appbox);
$task_manager->set_sched_status(task_manager::STATUS_SCHED_TOSTOP);

2
lib/classes/module/console/systemBackupDB.class.php
View File

@@ -54,7 +54,7 @@ class module_console_systemBackupDB extends Command
$output->write('Phraseanet is going to be backup...', true);
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$ok = true;

8
lib/classes/module/console/systemClearCache.class.php
View File

@@ -83,12 +83,8 @@ class module_console_systemClearCache extends Command
if(setup::is_installed())
{
$registry = registry::get_instance();
$cache = cache_adapter::get_instance($registry);
if($cache->ping())
{
$cache->flush();
}
$Core = \bootstrap::getCore();
$Core['CacheService']->flushAll();
}
$output->write('Finished !', true);

2
lib/classes/module/console/systemMailCheck.class.php
View File

@@ -43,7 +43,7 @@ class module_console_systemMailCheck extends Command
public function execute(InputInterface $input, OutputInterface $output)
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$output->writeln("Processing...");

2
lib/classes/module/console/systemUpgrade.class.php
View File

@@ -104,7 +104,7 @@ class module_console_systemUpgrade extends Command
try
{
$output->write('<info>Upgrading...</info>', true);
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
if (count(User_Adapter::get_wrong_email_users($appbox)) > 0)
{

2
lib/classes/module/console/tasklist.class.php
View File

@@ -48,7 +48,7 @@ class module_console_tasklist extends Command
try
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$task_manager = new task_manager($appbox);
$tasks = $task_manager->get_tasks();

2
lib/classes/module/console/taskrun.class.php
View File

@@ -65,7 +65,7 @@ class module_console_taskrun extends Command
try
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$task_manager = new task_manager($appbox);
$task = $task_manager->get_task($task_id);

4
lib/classes/module/report/activity.class.php
View File

@@ -341,7 +341,7 @@ class module_report_activity extends module_report
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
$login = User_Adapter::getInstance($usr, appbox::get_instance())->get_display_name();
$login = User_Adapter::getInstance($usr, appbox::get_instance(\bootstrap::getCore()))->get_display_name();
$this->setChamp($rs);
($config) ? $this->setConfigColumn($config) :
@@ -739,7 +739,7 @@ class module_report_activity extends module_report
$this->setChamp($rs);
$this->initDefaultConfigColumn($this->champ);
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$i = 0;
foreach ($rs as $row)

2
lib/classes/module/report/add.class.php
View File

@@ -77,7 +77,7 @@ class module_report_add extends module_report
$ret = array();
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
foreach ($rs as $row)
{

2
lib/classes/module/report/dashboard/feed.class.php
View File

@@ -66,7 +66,7 @@ class module_report_dashboard_feed implements module_report_dashboard_componentI
*/
public static function getInstance($sbasid, $sbas_coll, $dmin, $dmax)
{
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$cache_id = 'feed_' . md5($sbasid . '_' . $sbas_coll . '_' . $dmin . '_' . $dmax);
try

2
lib/classes/module/report/edit.class.php
View File

@@ -76,7 +76,7 @@ class module_report_edit extends module_report
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
$appbox = appbox::get_instance();
$appbox = appbox::get_instance(\bootstrap::getCore());
$ret = array();
foreach ($rs as $row)