Applications cleanup

This commit is contained in:
Romain Neutron
2012-09-28 10:07:04 +02:00
parent 76e6d4015f
commit d5325dba2b
8 changed files with 1301 additions and 1555 deletions

View File

@@ -13,74 +13,66 @@ namespace Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Core\Configuration;
use Alchemy\Phrasea\Application as PhraseaApplication;
use Symfony\Component\HttpFoundation\Response;
use Alchemy\Phrasea\Controller\Setup\Installer;
use Alchemy\Phrasea\Controller\Setup\Upgrader;
use Alchemy\Phrasea\Controller\Utils\ConnectionTest;
use Alchemy\Phrasea\Controller\Utils\PathFileTest;
/**
*
* @license http://opensource.org/licenses/gpl-3.0 GPLv3
* @link www.phraseanet.com
*/
return call_user_func(function() {
return call_user_func(function($environment = null) {
$app = new PhraseaApplication();
$app = new PhraseaApplication();
$app['install'] = false;
$app['upgrade'] = false;
$app['install'] = false;
$app['upgrade'] = false;
$app->before(function($a) use ($app) {
if (\setup::is_installed()) {
if ( ! $app['phraseanet.appbox']->need_major_upgrade()) {
throw new \Exception_Setup_PhraseaAlreadyInstalled();
}
$app->before(function($a) use ($app) {
if (\setup::is_installed()) {
if (!$app['phraseanet.appbox']->need_major_upgrade()) {
throw new \Exception_Setup_PhraseaAlreadyInstalled();
}
$app['upgrade'] = true;
} elseif (\setup::needUpgradeConfigurationFile()) {
$app['upgrade'] = true;
} elseif (\setup::needUpgradeConfigurationFile()) {
if (\setup::requireGVUpgrade()) {
setup::upgradeGV($app['phraseanet.core']['Registry']);
}
if (\setup::requireGVUpgrade()) {
setup::upgradeGV($app['phraseanet.core']['Registry']);
}
$connexionInc = new \SplFileInfo(__DIR__ . '/../../../../config/connexion.inc');
$configInc = new \SplFileInfo(__DIR__ . '/../../../../config/config.inc');
$connexionInc = new \SplFileInfo(__DIR__ . '/../../../../config/connexion.inc');
$configInc = new \SplFileInfo(__DIR__ . '/../../../../config/config.inc');
echo " config at ".__FILE__."\n";
$configuration = Configuration::build();
$configuration->upgradeFromOldConf($configInc, $connexionInc);
$configuration = Configuration::build();
$configuration->upgradeFromOldConf($configInc, $connexionInc);
$app['install'] = true;
} else {
$app['install'] = true;
}
$app['install'] = true;
} else {
$app['install'] = true;
}
return;
});
return;
});
$app->get('/', function() use ($app) {
if ($app['install'] === true) {
return $app->redirect('/setup/installer/');
}if ($app['upgrade'] === true) {
return $app->redirect('/setup/upgrader/');
}
});
$app->get('/', function() use ($app) {
if ($app['install'] === true) {
return $app->redirect('/setup/installer/');
}if ($app['upgrade'] === true) {
return $app->redirect('/setup/upgrader/');
}
});
$app->mount('/installer/', new Installer());
$app->mount('/upgrader/', new Upgrader());
$app->mount('/test', new PathFileTest());
$app->mount('/connection_test', new ConnectionTest());
$app->mount('/installer/', new Installer());
$app->mount('/upgrader/', new Upgrader());
$app->mount('/test', new PathFileTest());
$app->mount('/connection_test', new ConnectionTest());
$app->error(function($e) use ($app) {
if ($e instanceof \Exception_Setup_PhraseaAlreadyInstalled) {
return $app->redirect('/login/');
}
$app->error(function($e) use ($app) {
if ($e instanceof \Exception_Setup_PhraseaAlreadyInstalled) {
return $app->redirect('/login/');
}
throw $e;
// return new Response('Internal Server Error', 500);
});
return new Response('Internal Server Error', 500, array('X-Status-Code' => 500));
});
return $app;
}
return $app;
}, isset($environment) ? $environment : null
);