aboutsummaryrefslogtreecommitdiffstats
path: root/tests/text_processing
diff options
context:
space:
mode:
authorMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200
committerMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200
commit6985226b17e8a0ef0a720bf1d12fe0c216e13dab (patch)
tree116d2565ac02c40abe0548863c6badf8ec3e1d1e /tests/text_processing
parent8ea437e30605e0f66b5220bf904a61d7c1d11ddd (diff)
parent8d00784dfe2c8bcb10843ff70b4cfa998d703285 (diff)
downloadforums-master.tar
forums-master.tar.gz
forums-master.tar.bz2
forums-master.tar.xz
forums-master.zip
Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEADmaster
Diffstat (limited to 'tests/text_processing')
-rw-r--r--tests/text_processing/decode_message_test.php2
-rw-r--r--tests/text_processing/generate_text_for_display_test.php4
-rw-r--r--tests/text_processing/generate_text_for_storage_test.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/text_processing/decode_message_test.php b/tests/text_processing/decode_message_test.php
index e2402e721a..805dd89039 100644
--- a/tests/text_processing/decode_message_test.php
+++ b/tests/text_processing/decode_message_test.php
@@ -13,7 +13,7 @@
class phpbb_text_processing_decode_message_test extends phpbb_test_case
{
- public function setUp()
+ public function setUp(): void
{
parent::setUp();
diff --git a/tests/text_processing/generate_text_for_display_test.php b/tests/text_processing/generate_text_for_display_test.php
index 86bc803c98..f7da27cc35 100644
--- a/tests/text_processing/generate_text_for_display_test.php
+++ b/tests/text_processing/generate_text_for_display_test.php
@@ -13,7 +13,7 @@
class phpbb_text_processing_generate_text_for_display_test extends phpbb_test_case
{
- public function setUp()
+ public function setUp(): void
{
global $cache, $user, $phpbb_dispatcher;
@@ -77,7 +77,7 @@ class phpbb_text_processing_generate_text_for_display_test extends phpbb_test_ca
$config = new \phpbb\config\config(array('allow_nocensors' => true));
- $auth = $this->getMock('phpbb\\auth\\auth');
+ $auth = $this->createMock('phpbb\\auth\\auth');
$auth->expects($this->any())
->method('acl_get')
->with('u_chgcensors')
diff --git a/tests/text_processing/generate_text_for_storage_test.php b/tests/text_processing/generate_text_for_storage_test.php
index f0588fec4f..c6c62c7579 100644
--- a/tests/text_processing/generate_text_for_storage_test.php
+++ b/tests/text_processing/generate_text_for_storage_test.php
@@ -13,7 +13,7 @@
class phpbb_text_processing_generate_text_for_storage_test extends phpbb_test_case
{
- public function setUp()
+ public function setUp(): void
{
global $config, $phpbb_container, $phpbb_dispatcher;