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

refactor configuration

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-01-03 14:34:43 +01:00
parent b61ef056e2
commit 2968644c73
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Alchemy/Phrasea/Core.php
View File

@@ -40,7 +40,7 @@ class Core extends \Pimple
*/
private $configuration;
public function __construct($environnement)
public function __construct($environement = null)
{
/**
@@ -49,11 +49,14 @@ class Core extends \Pimple
static::initAutoloads();
/**
* Init conf
*/
$this->init($environnement);
$handler = new \Alchemy\Phrasea\Core\Configuration\Handler(
new \Alchemy\Phrasea\Core\Configuration\Application(),
new \Alchemy\Phrasea\Core\Configuration\Parser\Yaml()
);
$this->configuration = new \Alchemy\Phrasea\Core\Configuration($handler);
$this->configuration->setEnvironnement($environement);
/**
* Set version
*/
@@ -65,10 +68,10 @@ class Core extends \Pimple
/**
* Set Entity Manager using configuration
*/
$configuration = $this->getConfiguration();
$this['EM'] = $this->share(function() use ($configuration)
$doctrineConf = $this->configuration->getDoctrine()->all();
$this['EM'] = $this->share(function() use ($doctrineConf)
{
$doctrine = new Core\Service\Doctrine($configuration->getDoctrine());
$doctrine = new Core\Service\Doctrine($doctrineConf);
return $doctrine->getEntityManager();
});
@@ -410,19 +413,5 @@ class Core extends \Pimple
return $this->conf->getEnvironnement();
}
/**
* Load application configuration
*
* @param type $env
*/
private function loadConf($env)
{
$confHandler = new Configuration\Handler(
new Configuration\Application(),
new Configuration\Parser\Yaml()
);
$this->configuration = new Configuration($env, $confHandler);
}
}