mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-15 13:24:10 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4026 from marc1706/ticket/14281

Browse Source 
[ticket/14281] Fix installer CLI after recent changes

* marc1706/ticket/14281:
  [ticket/14281] Add install/phpbbcli.php to executable files list
  [ticket/14281] Correctly pass parameters to add_error_message
  [ticket/14281] Fix installer CLI after recent changes
This commit is contained in:
Tristan Darricau 2015-11-23 22:01:07 +01:00
commit 30e01a9e4b
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/install/phpbbcli.php Normal file → Executable file
View File

@ -12,6 +12,8 @@
*
*/
use Symfony\Component\Console\Input\ArgvInput;
if (php_sapi_name() !== 'cli')
{
echo 'This program must be run from the command line.' . PHP_EOL;
@ -31,6 +33,8 @@ $startup_new_path = $phpbb_root_path . 'install/update/update/new/install/startu
$startup_path = (file_exists($startup_new_path)) ? $startup_new_path : $phpbb_root_path . 'install/startup.' . $phpEx;
require($startup_path);
$input = new ArgvInput();
/** @var \phpbb\filesystem\filesystem $phpbb_filesystem */
$phpbb_filesystem = $phpbb_installer_container->get('filesystem');

2
phpBB/language/en/install.php
View File

@ -312,6 +312,8 @@ $lang = array_merge($lang, array(
'CLI_INSTALL_SHOW_CONFIG' => 'Show the configuration which will be used',
'CLI_INSTALL_VALIDATE_CONFIG' => 'Validate a configuration file',
'CLI_CONFIG_FILE' => 'Config file to use',
'MISSING_FILE' => 'Unable to access file %1$s',
'INVALID_YAML_FILE' => 'Could not parse YAML file %1$s',
));
// Common updater messages

2
phpBB/phpbb/install/console/command/install/config/show.php
View File

@ -96,7 +96,7 @@ class show extends \phpbb\console\command\command
if (!is_file($config_file))
{
$iohandler->add_error_message(array('MISSING_FILE', array($config_file)));
$iohandler->add_error_message(array('MISSING_FILE', $config_file));
return;
}

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

@ -116,7 +116,7 @@ class install extends \phpbb\console\command\command
if (!is_file($config_file))
{
$iohandler->add_error_message(array('MISSING_FILE', array($config_file)));
$iohandler->add_error_message(array('MISSING_FILE', $config_file));
return 1;
}
@ -127,7 +127,7 @@ class install extends \phpbb\console\command\command
}
catch (ParseException $e)
{
$iohandler->add_error_message('INVALID_YAML_FILE');
$iohandler->add_error_message(array('INVALID_YAML_FILE', $config_file));
return 1;
}

2
travis/check-executable-files.sh
View File

@ -28,7 +28,7 @@ then
files_skipped="-false"
# Files which have to be executable
executable_files="-path ${path}bin/*"
executable_files="-path ${path}bin/* -o -path ${path}install/phpbbcli.php"
incorrect_files=$( \
find ${path} \