Add support for PHPUnit 6 and 7 (#6870)

Fixes composer dependencies: Package phpunit/phpunit-mock-objects is abandoned

We cannot support v8 yet because of errors like:
Declaration of MailFunc::setUp() must be compatible with PHPUnit\Framework\TestCase::setUp(): void
It would require dropping PHP < 7.1 support.

37 files changed, 37 insertions, 37 deletions

diff --git a/plugins/acl/tests/Acl.php b/plugins/acl/tests/Acl.php
index 548fff26a..ec943e9dd 100644
--- a/plugins/acl/tests/Acl.php
+++ b/plugins/acl/tests/Acl.php
@@ -1,6 +1,6 @@
 <?php
 
-class Acl_Plugin extends PHPUnit_Framework_TestCase
+class Acl_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php b/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php
index 7679af804..6517f3d55 100644
--- a/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php
+++ b/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php
@@ -1,6 +1,6 @@
 <?php
 
-class AdditionalMessageHeaders_Plugin extends PHPUnit_Framework_TestCase
+class AdditionalMessageHeaders_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/archive/tests/Archive.php b/plugins/archive/tests/Archive.php
index 3cdaf1af1..a16e48350 100644
--- a/plugins/archive/tests/Archive.php
+++ b/plugins/archive/tests/Archive.php
@@ -1,6 +1,6 @@
 <?php
 
-class Archive_Plugin extends PHPUnit_Framework_TestCase
+class Archive_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/attachment_reminder/tests/AttachmentReminder.php b/plugins/attachment_reminder/tests/AttachmentReminder.php
index 5a28ab64d..0a9716825 100644
--- a/plugins/attachment_reminder/tests/AttachmentReminder.php
+++ b/plugins/attachment_reminder/tests/AttachmentReminder.php
@@ -1,6 +1,6 @@
 <?php
 
-class AttachmentReminder_Plugin extends PHPUnit_Framework_TestCase
+class AttachmentReminder_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/autologon/tests/Autologon.php b/plugins/autologon/tests/Autologon.php
index cd25e7558..69bee0c4e 100644
--- a/plugins/autologon/tests/Autologon.php
+++ b/plugins/autologon/tests/Autologon.php
@@ -1,6 +1,6 @@
 <?php
 
-class Autologon_Plugin extends PHPUnit_Framework_TestCase
+class Autologon_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/database_attachments/tests/DatabaseAttachments.php b/plugins/database_attachments/tests/DatabaseAttachments.php
index 99331d259..ef2b376d6 100644
--- a/plugins/database_attachments/tests/DatabaseAttachments.php
+++ b/plugins/database_attachments/tests/DatabaseAttachments.php
@@ -1,6 +1,6 @@
 <?php
 
-class DatabaseAttachments_Plugin extends PHPUnit_Framework_TestCase
+class DatabaseAttachments_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/debug_logger/tests/DebugLogger.php b/plugins/debug_logger/tests/DebugLogger.php
index 4438baf78..592fdf154 100644
--- a/plugins/debug_logger/tests/DebugLogger.php
+++ b/plugins/debug_logger/tests/DebugLogger.php
@@ -1,6 +1,6 @@
 <?php
 
-class DebugLogger_Plugin extends PHPUnit_Framework_TestCase
+class DebugLogger_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/emoticons/tests/Emoticons.php b/plugins/emoticons/tests/Emoticons.php
index 9bfa42c0a..8342847bb 100644
--- a/plugins/emoticons/tests/Emoticons.php
+++ b/plugins/emoticons/tests/Emoticons.php
@@ -1,6 +1,6 @@
 <?php
 
-class Emoticons_Plugin extends PHPUnit_Framework_TestCase
+class Emoticons_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/emoticons/tests/EmoticonsEngine.php b/plugins/emoticons/tests/EmoticonsEngine.php
index f343450e6..58ad0668c 100644
--- a/plugins/emoticons/tests/EmoticonsEngine.php
+++ b/plugins/emoticons/tests/EmoticonsEngine.php
@@ -1,6 +1,6 @@
 <?php
 
-class EmoticonsEngine extends PHPUnit_Framework_TestCase
+class EmoticonsEngine extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/enigma/tests/Enigma.php b/plugins/enigma/tests/Enigma.php
index ada3f8d5b..aa82b8b44 100644
--- a/plugins/enigma/tests/Enigma.php
+++ b/plugins/enigma/tests/Enigma.php
@@ -1,6 +1,6 @@
 <?php
 
-class Enigma_Plugin extends PHPUnit_Framework_TestCase
+class Enigma_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/example_addressbook/tests/ExampleAddressbook.php b/plugins/example_addressbook/tests/ExampleAddressbook.php
index dab035572..ff9eb8bb8 100644
--- a/plugins/example_addressbook/tests/ExampleAddressbook.php
+++ b/plugins/example_addressbook/tests/ExampleAddressbook.php
@@ -1,6 +1,6 @@
 <?php
 
-class ExampleAddressbook_Plugin extends PHPUnit_Framework_TestCase
+class ExampleAddressbook_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/filesystem_attachments/tests/FilesystemAttachments.php b/plugins/filesystem_attachments/tests/FilesystemAttachments.php
index 42b7f0685..e736b30a4 100644
--- a/plugins/filesystem_attachments/tests/FilesystemAttachments.php
+++ b/plugins/filesystem_attachments/tests/FilesystemAttachments.php
@@ -1,6 +1,6 @@
 <?php
 
-class FilesystemAttachments_Plugin extends PHPUnit_Framework_TestCase
+class FilesystemAttachments_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/help/tests/Help.php b/plugins/help/tests/Help.php
index f95da7562..d71393efb 100644
--- a/plugins/help/tests/Help.php
+++ b/plugins/help/tests/Help.php
@@ -1,6 +1,6 @@
 <?php
 
-class Help_Plugin extends PHPUnit_Framework_TestCase
+class Help_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/hide_blockquote/tests/HideBlockquote.php b/plugins/hide_blockquote/tests/HideBlockquote.php
index f4f954463..65431659e 100644
--- a/plugins/hide_blockquote/tests/HideBlockquote.php
+++ b/plugins/hide_blockquote/tests/HideBlockquote.php
@@ -1,6 +1,6 @@
 <?php
 
-class HideBlockquote_Plugin extends PHPUnit_Framework_TestCase
+class HideBlockquote_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/http_authentication/tests/HttpAuthentication.php b/plugins/http_authentication/tests/HttpAuthentication.php
index 4e76b070d..90618f38f 100644
--- a/plugins/http_authentication/tests/HttpAuthentication.php
+++ b/plugins/http_authentication/tests/HttpAuthentication.php
@@ -1,6 +1,6 @@
 <?php
 
-class HttpAuthentication_Plugin extends PHPUnit_Framework_TestCase
+class HttpAuthentication_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/identicon/tests/Identicon.php b/plugins/identicon/tests/Identicon.php
index f99a13b90..f80f1c675 100644
--- a/plugins/identicon/tests/Identicon.php
+++ b/plugins/identicon/tests/Identicon.php
@@ -1,6 +1,6 @@
 <?php
 
-class Identicon_Plugin extends PHPUnit_Framework_TestCase
+class Identicon_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/identity_select/tests/IdentitySelect.php b/plugins/identity_select/tests/IdentitySelect.php
index 447319a17..0ed35f95b 100644
--- a/plugins/identity_select/tests/IdentitySelect.php
+++ b/plugins/identity_select/tests/IdentitySelect.php
@@ -1,6 +1,6 @@
 <?php
 
-class IdentitySelect_Plugin extends PHPUnit_Framework_TestCase
+class IdentitySelect_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/jqueryui/tests/Jqueryui.php b/plugins/jqueryui/tests/Jqueryui.php
index ab0dc6232..20b959d71 100644
--- a/plugins/jqueryui/tests/Jqueryui.php
+++ b/plugins/jqueryui/tests/Jqueryui.php
@@ -1,6 +1,6 @@
 <?php
 
-class Jqueryui_Plugin extends PHPUnit_Framework_TestCase
+class Jqueryui_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/krb_authentication/tests/KrbAuthentication.php b/plugins/krb_authentication/tests/KrbAuthentication.php
index e1e4d012e..b8cca6685 100644
--- a/plugins/krb_authentication/tests/KrbAuthentication.php
+++ b/plugins/krb_authentication/tests/KrbAuthentication.php
@@ -1,6 +1,6 @@
 <?php
 
-class KrbAuthentication_Plugin extends PHPUnit_Framework_TestCase
+class KrbAuthentication_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/managesieve/tests/Managesieve.php b/plugins/managesieve/tests/Managesieve.php
index 2cce9473e..650fd656d 100644
--- a/plugins/managesieve/tests/Managesieve.php
+++ b/plugins/managesieve/tests/Managesieve.php
@@ -1,6 +1,6 @@
 <?php
 
-class Managesieve_Plugin extends PHPUnit_Framework_TestCase
+class Managesieve_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/managesieve/tests/Parser.php b/plugins/managesieve/tests/Parser.php
index 33edce0f0..e8cd553ee 100644
--- a/plugins/managesieve/tests/Parser.php
+++ b/plugins/managesieve/tests/Parser.php
@@ -1,6 +1,6 @@
 <?php
 
-class Parser extends PHPUnit_Framework_TestCase
+class Parser extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/managesieve/tests/Tokenizer.php b/plugins/managesieve/tests/Tokenizer.php
index f40901594..ad2186bcb 100644
--- a/plugins/managesieve/tests/Tokenizer.php
+++ b/plugins/managesieve/tests/Tokenizer.php
@@ -1,6 +1,6 @@
 <?php
 
-class Tokenizer extends PHPUnit_Framework_TestCase
+class Tokenizer extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/managesieve/tests/Vacation.php b/plugins/managesieve/tests/Vacation.php
index 5ab169ffe..85fcd33c8 100644
--- a/plugins/managesieve/tests/Vacation.php
+++ b/plugins/managesieve/tests/Vacation.php
@@ -1,6 +1,6 @@
 <?php
 
-class Managesieve_Vacation extends PHPUnit_Framework_TestCase
+class Managesieve_Vacation extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/markasjunk/tests/Markasjunk.php b/plugins/markasjunk/tests/Markasjunk.php
index dbf337aee..5e84ce4f7 100644
--- a/plugins/markasjunk/tests/Markasjunk.php
+++ b/plugins/markasjunk/tests/Markasjunk.php
@@ -1,6 +1,6 @@
 <?php
 
-class Markasjunk_Plugin extends PHPUnit_Framework_TestCase
+class Markasjunk_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/new_user_dialog/tests/NewUserDialog.php b/plugins/new_user_dialog/tests/NewUserDialog.php
index fdb0c6511..e38a6b39c 100644
--- a/plugins/new_user_dialog/tests/NewUserDialog.php
+++ b/plugins/new_user_dialog/tests/NewUserDialog.php
@@ -1,6 +1,6 @@
 <?php
 
-class NewUserDialog_Plugin extends PHPUnit_Framework_TestCase
+class NewUserDialog_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/new_user_identity/tests/NewUserIdentity.php b/plugins/new_user_identity/tests/NewUserIdentity.php
index beda199e3..cc04b3dba 100644
--- a/plugins/new_user_identity/tests/NewUserIdentity.php
+++ b/plugins/new_user_identity/tests/NewUserIdentity.php
@@ -1,6 +1,6 @@
 <?php
 
-class NewUserIdentity_Plugin extends PHPUnit_Framework_TestCase
+class NewUserIdentity_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/newmail_notifier/tests/NewmailNotifier.php b/plugins/newmail_notifier/tests/NewmailNotifier.php
index 3ab6d4142..3c98d805e 100644
--- a/plugins/newmail_notifier/tests/NewmailNotifier.php
+++ b/plugins/newmail_notifier/tests/NewmailNotifier.php
@@ -1,6 +1,6 @@
 <?php
 
-class NewmailNotifier_Plugin extends PHPUnit_Framework_TestCase
+class NewmailNotifier_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/password/tests/Password.php b/plugins/password/tests/Password.php
index a5be3fe69..4e1cc237c 100644
--- a/plugins/password/tests/Password.php
+++ b/plugins/password/tests/Password.php
@@ -1,6 +1,6 @@
 <?php
 
-class Password_Plugin extends PHPUnit_Framework_TestCase
+class Password_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/redundant_attachments/tests/RedundantAttachments.php b/plugins/redundant_attachments/tests/RedundantAttachments.php
index b283f1036..1240b5c29 100644
--- a/plugins/redundant_attachments/tests/RedundantAttachments.php
+++ b/plugins/redundant_attachments/tests/RedundantAttachments.php
@@ -1,6 +1,6 @@
 <?php
 
-class RedundantAttachments_Plugin extends PHPUnit_Framework_TestCase
+class RedundantAttachments_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/show_additional_headers/tests/ShowAdditionalHeaders.php b/plugins/show_additional_headers/tests/ShowAdditionalHeaders.php
index 803f47f1d..d2a84a709 100644
--- a/plugins/show_additional_headers/tests/ShowAdditionalHeaders.php
+++ b/plugins/show_additional_headers/tests/ShowAdditionalHeaders.php
@@ -1,6 +1,6 @@
 <?php
 
-class ShowAdditionalHeaders_Plugin extends PHPUnit_Framework_TestCase
+class ShowAdditionalHeaders_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php b/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php
index f28da512b..f7929af8e 100644
--- a/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php
+++ b/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php
@@ -1,6 +1,6 @@
 <?php
 
-class SquirrelmailUsercopy_Plugin extends PHPUnit_Framework_TestCase
+class SquirrelmailUsercopy_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/subscriptions_option/tests/SubscriptionsOption.php b/plugins/subscriptions_option/tests/SubscriptionsOption.php
index c8ca50bbb..bbb573fda 100644
--- a/plugins/subscriptions_option/tests/SubscriptionsOption.php
+++ b/plugins/subscriptions_option/tests/SubscriptionsOption.php
@@ -1,6 +1,6 @@
 <?php
 
-class SubscriptionsOption_Plugin extends PHPUnit_Framework_TestCase
+class SubscriptionsOption_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/userinfo/tests/Userinfo.php b/plugins/userinfo/tests/Userinfo.php
index 36fa1a389..dc02bebfb 100644
--- a/plugins/userinfo/tests/Userinfo.php
+++ b/plugins/userinfo/tests/Userinfo.php
@@ -1,6 +1,6 @@
 <?php
 
-class Userinfo_Plugin extends PHPUnit_Framework_TestCase
+class Userinfo_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/vcard_attachments/tests/VcardAttachments.php b/plugins/vcard_attachments/tests/VcardAttachments.php
index 0e42f4897..7dde2f224 100644
--- a/plugins/vcard_attachments/tests/VcardAttachments.php
+++ b/plugins/vcard_attachments/tests/VcardAttachments.php
@@ -1,6 +1,6 @@
 <?php
 
-class VcardAttachments_Plugin extends PHPUnit_Framework_TestCase
+class VcardAttachments_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/virtuser_file/tests/VirtuserFile.php b/plugins/virtuser_file/tests/VirtuserFile.php
index 49eb094fc..f83c73661 100644
--- a/plugins/virtuser_file/tests/VirtuserFile.php
+++ b/plugins/virtuser_file/tests/VirtuserFile.php
@@ -1,6 +1,6 @@
 <?php
 
-class VirtuserFile_Plugin extends PHPUnit_Framework_TestCase
+class VirtuserFile_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/virtuser_query/tests/VirtuserQuery.php b/plugins/virtuser_query/tests/VirtuserQuery.php
index b41372b25..ced2c84b2 100644
--- a/plugins/virtuser_query/tests/VirtuserQuery.php
+++ b/plugins/virtuser_query/tests/VirtuserQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-class VirtuserQuery_Plugin extends PHPUnit_Framework_TestCase
+class VirtuserQuery_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/plugins/zipdownload/tests/Zipdownload.php b/plugins/zipdownload/tests/Zipdownload.php
index ec83d081a..180866591 100644
--- a/plugins/zipdownload/tests/Zipdownload.php
+++ b/plugins/zipdownload/tests/Zipdownload.php
@@ -1,6 +1,6 @@
 <?php
 
-class Zipdownload_Plugin extends PHPUnit_Framework_TestCase
+class Zipdownload_Plugin extends PHPUnit\Framework\TestCase
 {
 
     function setUp()