1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 10:44:20 +02:00

Merge pull request #3514 from CHItA/ticket/13740

[ticket/13740] Refactoring installer

* CHItA/ticket/13740: (75 commits)
  [ticket/13740] Reduce number of references in nav provider
  [ticket/13740] Move handle_language_select calls to the controllers
  [ticket/13740] Fix infinite config.php check loop
  [ticket/13740] Move default data settings out of constructors
  [ticket/13740] Deduplicate container builder's checks
  [ticket/13740] Use JSON for installer config
  [ticket/13740] Fix comment
  [ticket/13740] Use language service in console application
  [ticket/13740] Fix CS in compatibilty_globals.php
  [ticket/13740] Fix message element creation in JS
  [ticket/13740] Replace more spaces with tabs
  [ticket/13740] Fix CS
  [ticket/13740] Filter basic directory change attempts in lang change
  [ticket/13740] Use tabs instead of spaces in JS file
  [ticket/13740] Add success message when install finished
  [ticket/13740] Fix $script_path in obtain_data
  [ticket/13740] Fix is_phpbb_installed() method
  [ticket/13740] Login admin when install finished
  [ticket/13740] Enhance server output buffer bypass
  [ticket/13740] Secure installer config against corrupted config data
  ...
This commit is contained in:
Tristan Darricau
2015-07-27 11:24:43 +02:00
105 changed files with 11399 additions and 80 deletions

View File

@@ -26,18 +26,18 @@ class application extends \Symfony\Component\Console\Application
protected $in_shell = false;
/**
* @var \phpbb\user User object
* @var \phpbb\language\language User object
*/
protected $user;
protected $language;
/**
* @param string $name The name of the application
* @param string $version The version of the application
* @param \phpbb\user $user The user which runs the application (used for translation)
* @param string $name The name of the application
* @param string $version The version of the application
* @param \phpbb\language\language $language The user which runs the application (used for translation)
*/
public function __construct($name, $version, \phpbb\user $user)
public function __construct($name, $version, \phpbb\language\language $language)
{
$this->user = $user;
$this->language = $language;
parent::__construct($name, $version);
}
@@ -53,7 +53,7 @@ class application extends \Symfony\Component\Console\Application
'safe-mode',
null,
InputOption::VALUE_NONE,
$this->user->lang('CLI_DESCRIPTION_OPTION_SAFE_MODE')
$this->language->lang('CLI_DESCRIPTION_OPTION_SAFE_MODE')
));
return $input_definition;
@@ -80,7 +80,7 @@ class application extends \Symfony\Component\Console\Application
'--shell',
'-s',
InputOption::VALUE_NONE,
$this->user->lang('CLI_DESCRIPTION_OPTION_SHELL')
$this->language->lang('CLI_DESCRIPTION_OPTION_SHELL')
));
return parent::getHelp();