mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

[ticket/13740] Exit from installation if phpBB is already installed

Browse Source 
PHPBB3-13740
This commit is contained in:
Mate Bartus
2015-07-20 19:26:07 +02:00
parent 6216007caa
commit 0488c49116
8 changed files with 103 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
phpBB/phpbb/install/console/command/install/install.php
View File

@@ -14,6 +14,7 @@
namespace phpbb\install\console\command\install;
use phpbb\install\exception\installer_exception;
use phpbb\install\helper\install_helper;
use phpbb\install\helper\iohandler\cli_iohandler;
use phpbb\install\helper\iohandler\factory;
use phpbb\install\installer;
@@ -40,6 +41,11 @@ class install extends \phpbb\console\command\command
*/
protected $installer;
/**
* @var install_helper
*/
protected $install_helper;
/**
* @var language
*/
@@ -48,21 +54,22 @@ class install extends \phpbb\console\command\command
/**
* Constructor
*
* @param language $language
* @param factory $factory
* @param installer $installer
* @param language $language
* @param factory $factory
* @param installer $installer
* @param install_helper $install_helper
*/
public function __construct(language $language, factory $factory, installer $installer)
public function __construct(language $language, factory $factory, installer $installer, install_helper $install_helper)
{
$this->iohandler_factory = $factory;
$this->installer = $installer;
$this->language = $language;
$this->install_helper = $install_helper;
parent::__construct(new \phpbb\user($language, 'datetime'));
}
/**
*
* {@inheritdoc}
*/
protected function configure()
@@ -89,8 +96,6 @@ class install extends \phpbb\console\command\command
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
// @todo check that phpBB is not already installed
$this->iohandler_factory->set_environment('cli');
/** @var \phpbb\install\helper\iohandler\cli_iohandler $iohandler */
@@ -102,6 +107,11 @@ class install extends \phpbb\console\command\command
$config_file = $input->getArgument('config-file');
if ($this->install_helper->is_phpbb_installed())
{
$iohandler->add_error_message('PHPBB_ALREADY_INSTALLED');
}
if (!is_file($config_file))
{
$iohandler->add_error_message(array('MISSING_FILE', array($config_file)));