diff --git a/lib/Alchemy/Phrasea/Controller/Setup/Installer.php b/lib/Alchemy/Phrasea/Controller/Setup/Installer.php index f07d9ad0db..a89899e07a 100644 --- a/lib/Alchemy/Phrasea/Controller/Setup/Installer.php +++ b/lib/Alchemy/Phrasea/Controller/Setup/Installer.php @@ -303,7 +303,7 @@ class Installer implements ControllerProviderInterface } } - \phrasea::start(); + \phrasea::start($app['Core']); $auth = new \Session_Authentication_None($user); diff --git a/lib/Alchemy/Phrasea/Core.php b/lib/Alchemy/Phrasea/Core.php index d0e550cbcc..3a16c7efa8 100644 --- a/lib/Alchemy/Phrasea/Core.php +++ b/lib/Alchemy/Phrasea/Core.php @@ -80,7 +80,7 @@ class Core extends \Pimple return \registry::get_instance($core); }); - \phrasea::start(); + \phrasea::start($this); $this->enableEvents(); } diff --git a/lib/Alchemy/Phrasea/Core/Configuration.php b/lib/Alchemy/Phrasea/Core/Configuration.php index 1bc91b53fb..415275e2c4 100644 --- a/lib/Alchemy/Phrasea/Core/Configuration.php +++ b/lib/Alchemy/Phrasea/Core/Configuration.php @@ -88,6 +88,12 @@ class Configuration if ($this->specifications->isSetup()) { $configurations = $this->specifications->getConfigurations(); + + if(!isset($configurations[$this->environment])) + { + throw new \Exception('Requested environnment is not available'); + } + $this->configuration = new ParameterBag($configurations[$this->environment]); } else diff --git a/lib/classes/appbox.class.php b/lib/classes/appbox.class.php index 1db2538f19..fea3558ada 100644 --- a/lib/classes/appbox.class.php +++ b/lib/classes/appbox.class.php @@ -79,7 +79,7 @@ class appbox extends base $this->registry = $registry; $this->session = Session_Handler::getInstance($this); - $configuration = \Alchemy\Phrasea\Core\Configuration::build(); + $configuration = $Core->getConfiguration(); $choosenConnexion = $configuration->getPhraseanet()->get('database'); diff --git a/lib/classes/phrasea.class.php b/lib/classes/phrasea.class.php index e66687b4c9..cfc2856d13 100644 --- a/lib/classes/phrasea.class.php +++ b/lib/classes/phrasea.class.php @@ -103,9 +103,9 @@ class phrasea return $retval; } - public static function start() + public static function start(\Alchemy\Phrasea\Core $Core) { - $configuration = \Alchemy\Phrasea\Core\Configuration::build(); + $configuration = $Core->getConfiguration(); $choosenConnexion = $configuration->getPhraseanet()->get('database'); diff --git a/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc b/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc index 02d580b2c5..546fc5be2c 100644 --- a/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc +++ b/lib/unitTest/PhraseanetPHPUnitAbstract.class.inc @@ -814,7 +814,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase */ protected function resetTwig() { - $configuration = \Alchemy\Phrasea\Core\Configuration::build(); + $configuration = self::$core->getConfiguration(); $serviceName = $configuration->getTemplating(); $confService = $configuration->getService($serviceName); diff --git a/www/admin/global_values.php b/www/admin/global_values.php index 5968817892..0a83476281 100644 --- a/www/admin/global_values.php +++ b/www/admin/global_values.php @@ -65,7 +65,7 @@ function getFormTimezone($props=array(), $selected=false) return $form; } -phrasea::start(); +phrasea::start($Core); ?>