aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-05-10 11:22:37 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-05-10 11:22:37 +0200
commit799d88701564f6ddeaf181c2e72a0626f683c73c (patch)
treeb67f2ecc1349907b4e68e0e5e17da07c8672944e
parent98db63e8ccf7effd4213f3ef2b1152c5f6ef6295 (diff)
parente2bc6c8024eed988ba833ec062b9e856a77ff661 (diff)
downloadforums-799d88701564f6ddeaf181c2e72a0626f683c73c.tar
forums-799d88701564f6ddeaf181c2e72a0626f683c73c.tar.gz
forums-799d88701564f6ddeaf181c2e72a0626f683c73c.tar.bz2
forums-799d88701564f6ddeaf181c2e72a0626f683c73c.tar.xz
forums-799d88701564f6ddeaf181c2e72a0626f683c73c.zip
Merge pull request #3602 from s9e/ticket/13828
[ticket/13828] Renamed testing doubles to avoid PHP7 keywords
-rw-r--r--tests/di/fixtures/config.php2
-rw-r--r--tests/notification/submit_post_type_topic_test.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/di/fixtures/config.php b/tests/di/fixtures/config.php
index 04e20f63d8..f2e1145efa 100644
--- a/tests/di/fixtures/config.php
+++ b/tests/di/fixtures/config.php
@@ -8,4 +8,4 @@ $dbname = 'phpbb';
$dbuser = 'root';
$dbpasswd = '';
$table_prefix = 'phpbb_';
-$acm_type = '\phpbb\cache\driver\null';
+$acm_type = '\phpbb\cache\driver\dummy';
diff --git a/tests/notification/submit_post_type_topic_test.php b/tests/notification/submit_post_type_topic_test.php
index c095fbc4ba..f14f305517 100644
--- a/tests/notification/submit_post_type_topic_test.php
+++ b/tests/notification/submit_post_type_topic_test.php
@@ -42,7 +42,7 @@ class phpbb_notification_submit_post_type_topic_test extends phpbb_notification_
),
)));
- $phpbb_log = $this->getMock('\phpbb\log\null');
+ $phpbb_log = $this->getMock('\phpbb\log\dummy');
}
/**