aboutsummaryrefslogtreecommitdiffstats
path: root/tests/console
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-05-11 13:40:47 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-05-11 23:36:20 +0200
commit3f33d8957288ee988e6e276ec8cb2042eb921627 (patch)
tree604f892ecd5cef1f14e4f936fc19dd3b15f8721e /tests/console
parent90f8498a4488e7f28ee7741cb9245ff232489127 (diff)
downloadforums-3f33d8957288ee988e6e276ec8cb2042eb921627.tar
forums-3f33d8957288ee988e6e276ec8cb2042eb921627.tar.gz
forums-3f33d8957288ee988e6e276ec8cb2042eb921627.tar.bz2
forums-3f33d8957288ee988e6e276ec8cb2042eb921627.tar.xz
forums-3f33d8957288ee988e6e276ec8cb2042eb921627.zip
[ticket/16052] Fix issues caused by merges
PHPBB3-16052
Diffstat (limited to 'tests/console')
-rw-r--r--tests/console/user/base.php1
-rw-r--r--tests/console/user/delete_test.php6
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/console/user/base.php b/tests/console/user/base.php
index f8616b400f..94a51eb896 100644
--- a/tests/console/user/base.php
+++ b/tests/console/user/base.php
@@ -20,6 +20,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
protected $log;
protected $passwords_manager;
protected $command_name;
+ /** @var Symfony\Component\Console\Helper\QuestionHelper */
protected $question;
protected $user_loader;
protected $phpbb_root_path;
diff --git a/tests/console/user/delete_test.php b/tests/console/user/delete_test.php
index 88f91afab1..926e496e1e 100644
--- a/tests/console/user/delete_test.php
+++ b/tests/console/user/delete_test.php
@@ -45,7 +45,7 @@ class phpbb_console_user_delete_test extends phpbb_console_user_base
$this->assertEquals(3, $this->get_user_id('Test'));
- $this->question->setInputStream($this->getInputStream("yes\n"));
+ $command_tester->setInputs(['yes', '']);
$command_tester->execute(array(
'command' => $this->command_name,
@@ -63,7 +63,7 @@ class phpbb_console_user_delete_test extends phpbb_console_user_base
$this->assertNull($this->get_user_id('Foo'));
- $this->question->setInputStream($this->getInputStream("yes\n"));
+ $command_tester->setInputs(['yes', '']);
$command_tester->execute(array(
'command' => $this->command_name,
@@ -80,7 +80,7 @@ class phpbb_console_user_delete_test extends phpbb_console_user_base
$this->assertEquals(3, $this->get_user_id('Test'));
- $this->question->setInputStream($this->getInputStream("no\n"));
+ $command_tester->setInputs(['no', '']);
$command_tester->execute(array(
'command' => $this->command_name,