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

Refactor Configuration

Browse Source
This commit is contained in:
Romain Neutron
2012-02-22 18:38:59 +01:00
parent 0dcfec55c8
commit d1412de7ea
4 changed files with 55 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,7 +283,7 @@ class Core extends \Pimple
/** /**
* Getter * Getter
* *
* @return Core\Configuration * @return \Alchemy\Phrasea\Core\Configuration
*/ */
public function getConfiguration() public function getConfiguration()
{ {

7
lib/Alchemy/Phrasea/Core/Configuration.php
View File

@@ -50,8 +50,15 @@ class Configuration
{ {
$this->specifications = $specifications; $this->specifications = $specifications;
if ($specifications->isSetup())
{
$configurations = $this->specifications->getConfigurations(); $configurations = $this->specifications->getConfigurations();
$environment = $environment ? : $configurations[self::KEYWORD_ENV]; $environment = $environment ? : $configurations[self::KEYWORD_ENV];
}
else
{
$environment = null;
}
$this->setEnvironnement($environment); $this->setEnvironnement($environment);

15
lib/Alchemy/Phrasea/Core/Configuration/ApplicationSpecification.php
View File

@@ -102,18 +102,21 @@ class ApplicationSpecification implements Specification
public function initialize() public function initialize()
{ {
touch($this->getConnexionsPathFile()); $this->delete();
touch($this->getConfigurationsPathFile());
touch($this->getServicesPathFile());
copy( copy(
$this->getRealRootPath() . "/config/config.sample.yml" $this->getRealRootPath() . "/config/connexions.sample.yml"
, $this->getRealRootPath() . "/config/config.yml" , $this->getConnexionsPathFile()
); );
copy( copy(
$this->getRealRootPath() . "/config/services.sample.yml" $this->getRealRootPath() . "/config/services.sample.yml"
, $this->getRealRootPath() . "/config/services.yml" , $this->getServicesPathFile()
);
copy(
$this->getRealRootPath() . "/config/config.sample.yml"
, $this->getConfigurationsPathFile()
); );
if (function_exists('chmod')) if (function_exists('chmod'))

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

@@ -37,6 +37,7 @@ class module_console_systemUpgrade extends Command
public function execute(InputInterface $input, OutputInterface $output) public function execute(InputInterface $input, OutputInterface $output)
{ {
$Core = \bootstrap::getCore();
if (!setup::is_installed()) if (!setup::is_installed())
{ {
@@ -53,29 +54,40 @@ class module_console_systemUpgrade extends Command
if ($continue == 'y') if ($continue == 'y')
{ {
$file = __DIR__ . "/../../../../config/config.sample.yml"; try
$file1 = __DIR__ . "/../../../../config/config.yml";
if (!copy($file, $file1))
{ {
throw new \Exception(sprintf("Unable to copy %s", $file1)); $Core->getConfiguration()->initialize();
}
$conn = \connection::getPDOConnection(); $retrieve_old_credentials = function()
{
require __DIR__ . '/../../../../config/connexion.inc';
$credentials = $conn->get_credentials(); return array(
'hostname' => $hostname,
'port' => $port,
'user' => $user,
'password' => $password,
'dbname' => $dbname,
);
};
$configuration = \Alchemy\Phrasea\Core\Configuration::build(); $credentials = $retrieve_old_credentials();
$connexionINI = array(); $connexions = $Core->getConfiguration()->getConnexions();
foreach ($credentials as $key => $value) foreach ($credentials as $key => $value)
{ {
$key = $key == 'hostname' ? 'host' : $key; $key = $key == 'hostname' ? 'host' : $key;
$connexionINI[$key] = (string) $value; $connexions['main_connexion'][$key] = (string) $value;
} }
$configuration->setAllDatabaseConnexion($connexionINI); $Core->getConfiguration()->setConnexions($connexions);
$Core->getConfiguration()->setEnvironnement('prod');
}
catch (\Exception $e)
{
}
} }
else else
{ {
@@ -99,8 +111,9 @@ class module_console_systemUpgrade extends Command
{ {
try try
{ {
$Core = \bootstrap::getCore();
$output->write('<info>Upgrading...</info>', true); $output->write('<info>Upgrading...</info>', true);
$appbox = appbox::get_instance(\bootstrap::getCore()); $appbox = appbox::get_instance($Core);
if (count(User_Adapter::get_wrong_email_users($appbox)) > 0) if (count(User_Adapter::get_wrong_email_users($appbox)) > 0)
{ {
@@ -110,8 +123,9 @@ class module_console_systemUpgrade extends Command
$upgrader = new Setup_Upgrade($appbox); $upgrader = new Setup_Upgrade($appbox);
$advices = $appbox->forceUpgrade($upgrader); $advices = $appbox->forceUpgrade($upgrader);
} }
catch (Exception $e) catch (\Exception $e)
{ {
$output->writeln(sprintf('<error>An error occured while upgrading : %s </error>', $e->getMessage())); $output->writeln(sprintf('<error>An error occured while upgrading : %s </error>', $e->getMessage()));
} }
} }