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

Merge branch '3.8'

Browse Source 
Conflicts:
	.travis.yml
	bin/developer
	build-env.sh
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
	tests/Alchemy/Tests/Phrasea/Command/Setup/XSendFileMappingGeneratorTest.php
	tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
	tests/Alchemy/Tests/Phrasea/Form/Login/PhraseaRegisterFormTest.php
This commit is contained in:
Nicolas Le Goff
2014-08-19 15:30:25 +02:00
parent cbd0bb0558 6ee8d2bab3
commit 46da7be65d
15 changed files with 331 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/classes/module/console/systemUpgrade.php
View File

@@ -10,6 +10,7 @@
*/
use Alchemy\Phrasea\Command\Command;
use Alchemy\Phrasea\Core\Version;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
@@ -58,7 +59,7 @@ class module_console_systemUpgrade extends Command
}
if ($continue == 'y') {
$output->write('<info>Upgrading...</info>', true);
$output->write(sprintf('Upgrading... from version <info>%s</info> to <info>%s</info>', $this->container['phraseanet.appbox']->get_version(), Version::getNumber()), true);
try {
$upgrader = new Setup_Upgrade($this->container, $input->getOption('force'));