aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework/phpbb_test_case_helpers.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-01-25 18:23:09 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-01-25 18:23:09 +0100
commitc89051eb288ed14a401ba166df6bfdd6bb860833 (patch)
treee4ce665f6cd9418ebc26615a0345778531235272 /tests/test_framework/phpbb_test_case_helpers.php
parenta74658091b19a8d8100b241ce6ac710e472918e8 (diff)
parent3c5b3254d151c052070aa1e5ef2efef7d850f95b (diff)
downloadforums-c89051eb288ed14a401ba166df6bfdd6bb860833.tar
forums-c89051eb288ed14a401ba166df6bfdd6bb860833.tar.gz
forums-c89051eb288ed14a401ba166df6bfdd6bb860833.tar.bz2
forums-c89051eb288ed14a401ba166df6bfdd6bb860833.tar.xz
forums-c89051eb288ed14a401ba166df6bfdd6bb860833.zip
Merge pull request #5103 from JoshyPHP/ticket/15531
[ticket/15531] Log malformed BBCodes
Diffstat (limited to 'tests/test_framework/phpbb_test_case_helpers.php')
-rw-r--r--tests/test_framework/phpbb_test_case_helpers.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 7fb9a740b8..c792976b1e 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -385,7 +385,7 @@ class phpbb_test_case_helpers
$mb = $this->test_case->getMockBuilder('phpbb\\textformatter\\data_access');
$mb->setMethods(array('get_bbcodes', 'get_censored_words', 'get_smilies', 'get_styles'));
$mb->setConstructorArgs(array(
- $this->test_case->getMock('phpbb\\db\\driver\\driver'),
+ $this->test_case->getMockBuilder('phpbb\\db\\driver\\driver')->getMock(),
'phpbb_bbcodes',
'phpbb_smilies',
'phpbb_styles',
@@ -489,8 +489,11 @@ class phpbb_test_case_helpers
$request = new phpbb_mock_request;
}
+ // Get a log interface
+ $log = ($container->has('log')) ? $container->get('log') : $this->test_case->getMockBuilder('phpbb\\log\\log_interface')->getMock();
+
// Create and register the text_formatter.s9e.factory service
- $factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $config, new \phpbb\textformatter\s9e\link_helper, $cache_dir, $cache_key_parser, $cache_key_renderer);
+ $factory = new \phpbb\textformatter\s9e\factory($dal, $cache, $dispatcher, $config, new \phpbb\textformatter\s9e\link_helper, $log, $cache_dir, $cache_key_parser, $cache_key_renderer);
$container->set('text_formatter.s9e.factory', $factory);
// Create a user if none was provided, and add the common lang strings