From d5743f008d9221f4199570fb0a6cb63d0cf88038 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 26 Nov 2013 18:11:54 +0100 Subject: [PATCH 1/8] [ticket/12039] Add config:* to the command line interface tool PHPBB3-12039 --- phpBB/config/console.yml | 28 +++++++ phpBB/phpbb/console/command/config/delete.php | 56 ++++++++++++++ .../console/command/config/increment.php | 62 +++++++++++++++ phpBB/phpbb/console/command/config/set.php | 62 +++++++++++++++ .../console/command/config/set_atomic.php | 75 +++++++++++++++++++ 5 files changed, 283 insertions(+) create mode 100644 phpBB/phpbb/console/command/config/delete.php create mode 100644 phpBB/phpbb/console/command/config/increment.php create mode 100644 phpBB/phpbb/console/command/config/set.php create mode 100644 phpBB/phpbb/console/command/config/set_atomic.php diff --git a/phpBB/config/console.yml b/phpBB/config/console.yml index c85a9d19ed..a7d937d985 100644 --- a/phpBB/config/console.yml +++ b/phpBB/config/console.yml @@ -1,4 +1,32 @@ services: + console.command.config.delete: + class: phpbb\console\command\config\delete + arguments: + - @config + tags: + - { name: console.command } + + console.command.config.increment: + class: phpbb\console\command\config\increment + arguments: + - @config + tags: + - { name: console.command } + + console.command.config.set: + class: phpbb\console\command\config\set + arguments: + - @config + tags: + - { name: console.command } + + console.command.config.set_atomic: + class: phpbb\console\command\config\set_atomic + arguments: + - @config + tags: + - { name: console.command } + console.command.extension.disable: class: phpbb\console\command\extension\disable arguments: diff --git a/phpBB/phpbb/console/command/config/delete.php b/phpBB/phpbb/console/command/config/delete.php new file mode 100644 index 0000000000..1f397904ca --- /dev/null +++ b/phpBB/phpbb/console/command/config/delete.php @@ -0,0 +1,56 @@ +config = $config; + + parent::__construct(); + } + + protected function configure() + { + $this + ->setName('config:delete') + ->setDescription('Sets a configuration option\'s value') + ->addArgument( + 'config-key', + InputArgument::REQUIRED, + 'The configuration option\'s name' + ) + ->addArgument( + 'use-cache', + InputArgument::OPTIONAL, + 'Whether this variable should be cached or if it changes too frequently to be efficiently cached.', + true + ) + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $key = $input->getArgument('config-key'); + $use_cache = $input->getArgument('use-cache'); + $use_cache = (strtolower($use_cache) !== 'false' && $use_cache); + + $this->config->delete($key, $use_cache); + + $output->writeln("Successfully deleted config $key"); + } +} diff --git a/phpBB/phpbb/console/command/config/increment.php b/phpBB/phpbb/console/command/config/increment.php new file mode 100644 index 0000000000..0974d34cc5 --- /dev/null +++ b/phpBB/phpbb/console/command/config/increment.php @@ -0,0 +1,62 @@ +config = $config; + + parent::__construct(); + } + + protected function configure() + { + $this + ->setName('config:increment') + ->setDescription('Sets a configuration option\'s value') + ->addArgument( + 'config-key', + InputArgument::REQUIRED, + 'The configuration option\'s name' + ) + ->addArgument( + 'increment', + InputArgument::REQUIRED, + 'Amount to increment by' + ) + ->addArgument( + 'use-cache', + InputArgument::OPTIONAL, + 'Whether this variable should be cached or if it changes too frequently to be efficiently cached.', + true + ) + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $key = $input->getArgument('config-key'); + $increment = $input->getArgument('increment'); + $use_cache = $input->getArgument('use-cache'); + $use_cache = (strtolower($use_cache) !== 'false' && $use_cache); + + $this->config->increment($key, $increment, $use_cache); + + $output->writeln("Successfully incremented config $key"); + } +} diff --git a/phpBB/phpbb/console/command/config/set.php b/phpBB/phpbb/console/command/config/set.php new file mode 100644 index 0000000000..471a92ca8b --- /dev/null +++ b/phpBB/phpbb/console/command/config/set.php @@ -0,0 +1,62 @@ +config = $config; + + parent::__construct(); + } + + protected function configure() + { + $this + ->setName('config:set') + ->setDescription('Sets a configuration option\'s value') + ->addArgument( + 'config-key', + InputArgument::REQUIRED, + 'The configuration option\'s name' + ) + ->addArgument( + 'config-value', + InputArgument::REQUIRED, + 'New configuration value' + ) + ->addArgument( + 'use-cache', + InputArgument::OPTIONAL, + 'Whether this variable should be cached or if it changes too frequently to be efficiently cached.', + true + ) + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $key = $input->getArgument('config-key'); + $value = $input->getArgument('config-value'); + $use_cache = $input->getArgument('use-cache'); + $use_cache = (strtolower($use_cache) !== 'false' && $use_cache); + + $this->config->set($key, $value, $use_cache); + + $output->writeln("Successfully set config $key"); + } +} diff --git a/phpBB/phpbb/console/command/config/set_atomic.php b/phpBB/phpbb/console/command/config/set_atomic.php new file mode 100644 index 0000000000..17583c89de --- /dev/null +++ b/phpBB/phpbb/console/command/config/set_atomic.php @@ -0,0 +1,75 @@ +config = $config; + + parent::__construct(); + } + + protected function configure() + { + $this + ->setName('config:set-atomic') + ->setDescription('Sets a configuration option\'s value') + ->addArgument( + 'config-key', + InputArgument::REQUIRED, + 'The configuration option\'s name' + ) + ->addArgument( + 'old-value', + InputArgument::REQUIRED, + 'Current configuration value' + ) + ->addArgument( + 'new-value', + InputArgument::REQUIRED, + 'New configuration value' + ) + ->addArgument( + 'use-cache', + InputArgument::OPTIONAL, + 'Whether this variable should be cached or if it changes too frequently to be efficiently cached.', + true + ) + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $key = $input->getArgument('config-key'); + $old_value = $input->getArgument('old-value'); + $new_value = $input->getArgument('new-value'); + $use_cache = $input->getArgument('use-cache'); + $use_cache = (strtolower($use_cache) !== 'false' && $use_cache); + + if ($this->config->set_atomic($key, $old_value, $new_value, $use_cache)) + { + $output->writeln("Successfully set config $key"); + return 0; + } + else + { + $output->writeln("Could not set config $key"); + return 1; + } + } +} From e6749261f1797cd4bb9b93398ed92ae5d9c32b26 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 27 Nov 2013 14:16:34 +0100 Subject: [PATCH 2/8] [ticket/12039] Use an abstract class and some more minor adjustments PHPBB3-12039 --- phpBB/config/console.yml | 7 +++ .../phpbb/console/command/config/command.php | 22 +++++++++ phpBB/phpbb/console/command/config/delete.php | 31 +++---------- phpBB/phpbb/console/command/config/get.php | 44 ++++++++++++++++++ .../console/command/config/increment.php | 34 +++++--------- phpBB/phpbb/console/command/config/set.php | 41 +++++++---------- .../console/command/config/set_atomic.php | 46 ++++++++----------- 7 files changed, 126 insertions(+), 99 deletions(-) create mode 100644 phpBB/phpbb/console/command/config/command.php create mode 100644 phpBB/phpbb/console/command/config/get.php diff --git a/phpBB/config/console.yml b/phpBB/config/console.yml index a7d937d985..a4aae75e40 100644 --- a/phpBB/config/console.yml +++ b/phpBB/config/console.yml @@ -13,6 +13,13 @@ services: tags: - { name: console.command } + console.command.config.get: + class: phpbb\console\command\config\get + arguments: + - @config + tags: + - { name: console.command } + console.command.config.set: class: phpbb\console\command\config\set arguments: diff --git a/phpBB/phpbb/console/command/config/command.php b/phpBB/phpbb/console/command/config/command.php new file mode 100644 index 0000000000..b105bc826d --- /dev/null +++ b/phpBB/phpbb/console/command/config/command.php @@ -0,0 +1,22 @@ +config = $config; + + parent::__construct(); + } +} diff --git a/phpBB/phpbb/console/command/config/delete.php b/phpBB/phpbb/console/command/config/delete.php index 1f397904ca..2b53f27098 100644 --- a/phpBB/phpbb/console/command/config/delete.php +++ b/phpBB/phpbb/console/command/config/delete.php @@ -10,46 +10,29 @@ namespace phpbb\console\command\config; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -class delete extends \phpbb\console\command\command +class delete extends command { - /** @var \phpbb\config\config */ - protected $config; - - function __construct(\phpbb\config\config $config) - { - $this->config = $config; - - parent::__construct(); - } - protected function configure() { $this ->setName('config:delete') - ->setDescription('Sets a configuration option\'s value') + ->setDescription("Sets a configuration option's value") ->addArgument( - 'config-key', + 'key', InputArgument::REQUIRED, - 'The configuration option\'s name' - ) - ->addArgument( - 'use-cache', - InputArgument::OPTIONAL, - 'Whether this variable should be cached or if it changes too frequently to be efficiently cached.', - true + "The configuration option's name" ) ; } protected function execute(InputInterface $input, OutputInterface $output) { - $key = $input->getArgument('config-key'); - $use_cache = $input->getArgument('use-cache'); - $use_cache = (strtolower($use_cache) !== 'false' && $use_cache); + $key = $input->getArgument('key'); - $this->config->delete($key, $use_cache); + $this->config->delete($key); $output->writeln("Successfully deleted config $key"); } diff --git a/phpBB/phpbb/console/command/config/get.php b/phpBB/phpbb/console/command/config/get.php new file mode 100644 index 0000000000..aeb40cff16 --- /dev/null +++ b/phpBB/phpbb/console/command/config/get.php @@ -0,0 +1,44 @@ +setName('config:get') + ->setDescription("Gets a configuration option's value") + ->addArgument( + 'key', + InputArgument::REQUIRED, + "The configuration option's name" + ) + ; + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $key = $input->getArgument('key'); + + if (isset($this->config[$key])) + { + $output->writeln("{$this->config[$key]}"); + } + else + { + $output->writeln("Could not get config $key"); + } + } +} diff --git a/phpBB/phpbb/console/command/config/increment.php b/phpBB/phpbb/console/command/config/increment.php index 0974d34cc5..06b2772230 100644 --- a/phpBB/phpbb/console/command/config/increment.php +++ b/phpBB/phpbb/console/command/config/increment.php @@ -10,50 +10,40 @@ namespace phpbb\console\command\config; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -class increment extends \phpbb\console\command\command +class increment extends command { - /** @var \phpbb\config\config */ - protected $config; - - function __construct(\phpbb\config\config $config) - { - $this->config = $config; - - parent::__construct(); - } - protected function configure() { $this ->setName('config:increment') - ->setDescription('Sets a configuration option\'s value') + ->setDescription("Sets a configuration option's value") ->addArgument( - 'config-key', + 'key', InputArgument::REQUIRED, - 'The configuration option\'s name' + "The configuration option's name" ) ->addArgument( 'increment', InputArgument::REQUIRED, 'Amount to increment by' ) - ->addArgument( - 'use-cache', - InputArgument::OPTIONAL, - 'Whether this variable should be cached or if it changes too frequently to be efficiently cached.', - true + ->addOption( + 'dynamic', + 'd', + InputOption::VALUE_NONE, + 'Set this option if the configuration option changes too frequently to be efficiently cached.' ) ; } protected function execute(InputInterface $input, OutputInterface $output) { - $key = $input->getArgument('config-key'); + $key = $input->getArgument('key'); $increment = $input->getArgument('increment'); - $use_cache = $input->getArgument('use-cache'); - $use_cache = (strtolower($use_cache) !== 'false' && $use_cache); + $use_cache = !$input->getOption('dynamic'); $this->config->increment($key, $increment, $use_cache); diff --git a/phpBB/phpbb/console/command/config/set.php b/phpBB/phpbb/console/command/config/set.php index 471a92ca8b..51d3efad1e 100644 --- a/phpBB/phpbb/console/command/config/set.php +++ b/phpBB/phpbb/console/command/config/set.php @@ -10,51 +10,42 @@ namespace phpbb\console\command\config; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -class set extends \phpbb\console\command\command +class set extends command { - /** @var \phpbb\config\config */ - protected $config; - - function __construct(\phpbb\config\config $config) - { - $this->config = $config; - - parent::__construct(); - } - protected function configure() { $this ->setName('config:set') - ->setDescription('Sets a configuration option\'s value') + ->setDescription("Sets a configuration option's value") ->addArgument( - 'config-key', + 'key', InputArgument::REQUIRED, - 'The configuration option\'s name' + "The configuration option's name" ) ->addArgument( - 'config-value', + 'value', InputArgument::REQUIRED, - 'New configuration value' + 'New configuration value, use 0 and 1 to specify boolean values' ) - ->addArgument( - 'use-cache', - InputArgument::OPTIONAL, - 'Whether this variable should be cached or if it changes too frequently to be efficiently cached.', - true + ->addOption( + 'dynamic', + 'd', + InputOption::VALUE_NONE, + 'Set this option if the configuration option changes too frequently to be efficiently cached.' ) ; } protected function execute(InputInterface $input, OutputInterface $output) { - $key = $input->getArgument('config-key'); - $value = $input->getArgument('config-value'); - $use_cache = $input->getArgument('use-cache'); - $use_cache = (strtolower($use_cache) !== 'false' && $use_cache); + $key = $input->getArgument('key'); + $value = $input->getArgument('value'); + $use_cache = !$input->getOption('dynamic'); + var_dump($key, $value, $use_cache); $this->config->set($key, $value, $use_cache); $output->writeln("Successfully set config $key"); diff --git a/phpBB/phpbb/console/command/config/set_atomic.php b/phpBB/phpbb/console/command/config/set_atomic.php index 17583c89de..1393549a1e 100644 --- a/phpBB/phpbb/console/command/config/set_atomic.php +++ b/phpBB/phpbb/console/command/config/set_atomic.php @@ -10,56 +10,46 @@ namespace phpbb\console\command\config; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -class set_atomic extends \phpbb\console\command\command +class set_atomic extends command { - /** @var \phpbb\config\config */ - protected $config; - - function __construct(\phpbb\config\config $config) - { - $this->config = $config; - - parent::__construct(); - } - protected function configure() { $this ->setName('config:set-atomic') - ->setDescription('Sets a configuration option\'s value') + ->setDescription("Sets a configuration option's value") ->addArgument( - 'config-key', + 'key', InputArgument::REQUIRED, - 'The configuration option\'s name' + "The configuration option's name" ) ->addArgument( - 'old-value', + 'old', InputArgument::REQUIRED, - 'Current configuration value' + 'Current configuration value, use 0 and 1 to specify boolean values' ) ->addArgument( - 'new-value', + 'new', InputArgument::REQUIRED, - 'New configuration value' + 'New configuration value, use 0 and 1 to specify boolean values' ) - ->addArgument( - 'use-cache', - InputArgument::OPTIONAL, - 'Whether this variable should be cached or if it changes too frequently to be efficiently cached.', - true + ->addOption( + 'dynamic', + 'd', + InputOption::VALUE_NONE, + 'Set this option if the configuration option changes too frequently to be efficiently cached.' ) ; } protected function execute(InputInterface $input, OutputInterface $output) { - $key = $input->getArgument('config-key'); - $old_value = $input->getArgument('old-value'); - $new_value = $input->getArgument('new-value'); - $use_cache = $input->getArgument('use-cache'); - $use_cache = (strtolower($use_cache) !== 'false' && $use_cache); + $key = $input->getArgument('key'); + $old_value = $input->getArgument('old'); + $new_value = $input->getArgument('new'); + $use_cache = !$input->getOption('dynamic'); if ($this->config->set_atomic($key, $old_value, $new_value, $use_cache)) { From de727b80e285970c0e770c8597c6b56adb513a4d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 27 Nov 2013 15:16:40 +0100 Subject: [PATCH 3/8] [ticket/12039] Fix option descriptions PHPBB3-12039 --- phpBB/phpbb/console/command/config/delete.php | 2 +- phpBB/phpbb/console/command/config/increment.php | 2 +- phpBB/phpbb/console/command/config/set_atomic.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/console/command/config/delete.php b/phpBB/phpbb/console/command/config/delete.php index 2b53f27098..af3d189445 100644 --- a/phpBB/phpbb/console/command/config/delete.php +++ b/phpBB/phpbb/console/command/config/delete.php @@ -19,7 +19,7 @@ class delete extends command { $this ->setName('config:delete') - ->setDescription("Sets a configuration option's value") + ->setDescription("Deletes a configuration option") ->addArgument( 'key', InputArgument::REQUIRED, diff --git a/phpBB/phpbb/console/command/config/increment.php b/phpBB/phpbb/console/command/config/increment.php index 06b2772230..5f5d03b50b 100644 --- a/phpBB/phpbb/console/command/config/increment.php +++ b/phpBB/phpbb/console/command/config/increment.php @@ -19,7 +19,7 @@ class increment extends command { $this ->setName('config:increment') - ->setDescription("Sets a configuration option's value") + ->setDescription("Increment a configuration option's value") ->addArgument( 'key', InputArgument::REQUIRED, diff --git a/phpBB/phpbb/console/command/config/set_atomic.php b/phpBB/phpbb/console/command/config/set_atomic.php index 1393549a1e..ef2cb5c3e1 100644 --- a/phpBB/phpbb/console/command/config/set_atomic.php +++ b/phpBB/phpbb/console/command/config/set_atomic.php @@ -19,7 +19,7 @@ class set_atomic extends command { $this ->setName('config:set-atomic') - ->setDescription("Sets a configuration option's value") + ->setDescription("Sets a configuration option's value only if the old_value matches the current configuration value or the configuration value does not exist yet.") ->addArgument( 'key', InputArgument::REQUIRED, From 86e629e5338b1b21d3908eb2c8a01fe84ac18159 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 2 Dec 2013 13:26:49 +0100 Subject: [PATCH 4/8] [ticket/12039] Remove debug code PHPBB3-12039 --- phpBB/phpbb/console/command/config/set.php | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/phpbb/console/command/config/set.php b/phpBB/phpbb/console/command/config/set.php index 51d3efad1e..9d471a96ad 100644 --- a/phpBB/phpbb/console/command/config/set.php +++ b/phpBB/phpbb/console/command/config/set.php @@ -45,7 +45,6 @@ class set extends command $value = $input->getArgument('value'); $use_cache = !$input->getOption('dynamic'); - var_dump($key, $value, $use_cache); $this->config->set($key, $value, $use_cache); $output->writeln("Successfully set config $key"); From 98200161fc642ce447395a4b8db3b1a3c674c734 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 26 Dec 2013 19:03:43 +0100 Subject: [PATCH 5/8] [ticket/12039] Update command descriptions PHPBB3-12039 --- phpBB/phpbb/console/command/config/delete.php | 2 +- phpBB/phpbb/console/command/config/increment.php | 2 +- phpBB/phpbb/console/command/config/set_atomic.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/console/command/config/delete.php b/phpBB/phpbb/console/command/config/delete.php index af3d189445..5dbeeff20f 100644 --- a/phpBB/phpbb/console/command/config/delete.php +++ b/phpBB/phpbb/console/command/config/delete.php @@ -19,7 +19,7 @@ class delete extends command { $this ->setName('config:delete') - ->setDescription("Deletes a configuration option") + ->setDescription('Deletes a configuration option') ->addArgument( 'key', InputArgument::REQUIRED, diff --git a/phpBB/phpbb/console/command/config/increment.php b/phpBB/phpbb/console/command/config/increment.php index 5f5d03b50b..bc6b63c6ff 100644 --- a/phpBB/phpbb/console/command/config/increment.php +++ b/phpBB/phpbb/console/command/config/increment.php @@ -19,7 +19,7 @@ class increment extends command { $this ->setName('config:increment') - ->setDescription("Increment a configuration option's value") + ->setDescription("Increments a configuration option's value") ->addArgument( 'key', InputArgument::REQUIRED, diff --git a/phpBB/phpbb/console/command/config/set_atomic.php b/phpBB/phpbb/console/command/config/set_atomic.php index ef2cb5c3e1..03e7a60210 100644 --- a/phpBB/phpbb/console/command/config/set_atomic.php +++ b/phpBB/phpbb/console/command/config/set_atomic.php @@ -19,7 +19,7 @@ class set_atomic extends command { $this ->setName('config:set-atomic') - ->setDescription("Sets a configuration option's value only if the old_value matches the current configuration value or the configuration value does not exist yet.") + ->setDescription("Sets a configuration option's value only if the old matches the current value.") ->addArgument( 'key', InputArgument::REQUIRED, From 52c452c768b30fa479e91faee548abf5038f2642 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 8 Jan 2014 23:56:50 +0100 Subject: [PATCH 6/8] [ticket/12039] Do not colour returned value in get command PHPBB3-12039 --- phpBB/phpbb/console/command/config/get.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/console/command/config/get.php b/phpBB/phpbb/console/command/config/get.php index aeb40cff16..1f9781ea9c 100644 --- a/phpBB/phpbb/console/command/config/get.php +++ b/phpBB/phpbb/console/command/config/get.php @@ -34,7 +34,7 @@ class get extends command if (isset($this->config[$key])) { - $output->writeln("{$this->config[$key]}"); + $output->writeln($this->config[$key]); } else { From 5d89c283f0dfbce0f615432671628d9d10736334 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 8 Jan 2014 23:59:46 +0100 Subject: [PATCH 7/8] [ticket/12039] Do not print success message when config did not exist PHPBB3-12039 --- phpBB/phpbb/console/command/config/delete.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/console/command/config/delete.php b/phpBB/phpbb/console/command/config/delete.php index 5dbeeff20f..9a2d00561d 100644 --- a/phpBB/phpbb/console/command/config/delete.php +++ b/phpBB/phpbb/console/command/config/delete.php @@ -32,8 +32,15 @@ class delete extends command { $key = $input->getArgument('key'); - $this->config->delete($key); + if (isset($this->config[$key])) + { + $this->config->delete($key); - $output->writeln("Successfully deleted config $key"); + $output->writeln("Successfully deleted config $key"); + } + else + { + $output->writeln("Config $key does not exist"); + } } } From a70973ea423fda2a26fc8ff17e6e9c33bee11547 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 9 Jan 2014 00:05:32 +0100 Subject: [PATCH 8/8] [ticket/12039] Allow getting the value without a new line at the end PHPBB3-12039 --- phpBB/phpbb/console/command/config/get.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/console/command/config/get.php b/phpBB/phpbb/console/command/config/get.php index 1f9781ea9c..275c82b53f 100644 --- a/phpBB/phpbb/console/command/config/get.php +++ b/phpBB/phpbb/console/command/config/get.php @@ -25,6 +25,12 @@ class get extends command InputArgument::REQUIRED, "The configuration option's name" ) + ->addOption( + 'no-newline', + null, + InputOption::VALUE_NONE, + 'Set this option if the value should be printed without a new line at the end.' + ) ; } @@ -32,7 +38,11 @@ class get extends command { $key = $input->getArgument('key'); - if (isset($this->config[$key])) + if (isset($this->config[$key]) && $input->getOption('no-newline')) + { + $output->write($this->config[$key]); + } + elseif (isset($this->config[$key])) { $output->writeln($this->config[$key]); }