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.

CHANGELOG

@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Add support for PHPUnit 6 and 7 (#6870)
 - Plugin API: Make actionbefore, before<action>, actionafter and after<action> events working with plugin actions (#7106)
 - Managesieve: Replace "Filter disabled" with "Filter enabled" (#7028)
 - Managesieve: Fix so modifier type select wasn't hidden after hiding modifier select on header change

composer.json-dist

@@ -22,7 +22,7 @@
         "endroid/qr-code": "~1.6.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36 || ^5.7.21"
+        "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6 || ^7"
     },
     "suggest": {
         "kolab/net_ldap3": "~1.1.1 required for connecting to LDAP",

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()

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()

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()

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()

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()

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()

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()

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()

plugins/emoticons/tests/EmoticonsEngine.php

@@ -1,6 +1,6 @@
 <?php
 
-class EmoticonsEngine extends PHPUnit_Framework_TestCase
+class EmoticonsEngine extends PHPUnit\Framework\TestCase
 {
 
     function setUp()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

plugins/managesieve/tests/Parser.php

@@ -1,6 +1,6 @@
 <?php
 
-class Parser extends PHPUnit_Framework_TestCase
+class Parser extends PHPUnit\Framework\TestCase
 {
 
     function setUp()

plugins/managesieve/tests/Tokenizer.php

@@ -1,6 +1,6 @@
 <?php
 
-class Tokenizer extends PHPUnit_Framework_TestCase
+class Tokenizer extends PHPUnit\Framework\TestCase
 {
 
     function setUp()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

tests/Framework/BaseReplacer.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_BaseReplacer extends PHPUnit_Framework_TestCase
+class Framework_BaseReplacer extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Bootstrap.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Bootstrap extends PHPUnit_Framework_TestCase
+class Framework_Bootstrap extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Browser.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Browser extends PHPUnit_Framework_TestCase
+class Framework_Browser extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Cache.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Cache extends PHPUnit_Framework_TestCase
+class Framework_Cache extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Charset.php

@@ -7,7 +7,7 @@
  * @group iconv
  * @group mbstring
  */
-class Framework_Charset extends PHPUnit_Framework_TestCase
+class Framework_Charset extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Config.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Config extends PHPUnit_Framework_TestCase
+class Framework_Config extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Contacts.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Contacts extends PHPUnit_Framework_TestCase
+class Framework_Contacts extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/ContentFilter.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ContentFilter extends PHPUnit_Framework_TestCase
+class Framework_ContentFilter extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Csv2vcard.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Csv2vcard extends PHPUnit_Framework_TestCase
+class Framework_Csv2vcard extends PHPUnit\Framework\TestCase
 {
 
     function test_import_generic()

tests/Framework/DB.php

@@ -6,7 +6,7 @@
  * @package Tests
  * @group database
  */
-class Framework_DB extends PHPUnit_Framework_TestCase
+class Framework_DB extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/DBMssql.php

@@ -7,7 +7,7 @@
  * @group database
  * @group mssql
  */
-class Framework_DBMssql extends PHPUnit_Framework_TestCase
+class Framework_DBMssql extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/DBMysql.php

@@ -7,7 +7,7 @@
  * @group database
  * @group mysql
  */
-class Framework_DBMysql extends PHPUnit_Framework_TestCase
+class Framework_DBMysql extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/DBOracle.php

@@ -7,7 +7,7 @@
  * @group database
  * @group oracle
  */
-class Framework_DBOracle extends PHPUnit_Framework_TestCase
+class Framework_DBOracle extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/DBPgsql.php

@@ -7,7 +7,7 @@
  * @group database
  * @group postgres
  */
-class Framework_DBPgsql extends PHPUnit_Framework_TestCase
+class Framework_DBPgsql extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/DBSqlite.php

@@ -7,7 +7,7 @@
  * @group database
  * @group sqlite
  */
-class Framework_DBSqlite extends PHPUnit_Framework_TestCase
+class Framework_DBSqlite extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/DBSqlsrv.php

@@ -7,7 +7,7 @@
  * @group database
  * @group sqlrsv
  */
-class Framework_DBSqlsrv extends PHPUnit_Framework_TestCase
+class Framework_DBSqlsrv extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Enriched.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Enriched extends PHPUnit_Framework_TestCase
+class Framework_Enriched extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Html.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Html extends PHPUnit_Framework_TestCase
+class Framework_Html extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Html2text.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class rc_html2text extends PHPUnit_Framework_TestCase
+class rc_html2text extends PHPUnit\Framework\TestCase
 {
 
     function data_html2text()

tests/Framework/Image.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Image extends PHPUnit_Framework_TestCase
+class Framework_Image extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Imap.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Imap extends PHPUnit_Framework_TestCase
+class Framework_Imap extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/ImapCache.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ImapCache extends PHPUnit_Framework_TestCase
+class Framework_ImapCache extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/ImapGeneric.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ImapGeneric extends PHPUnit_Framework_TestCase
+class Framework_ImapGeneric extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/ImapSearch.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ImapSearch extends PHPUnit_Framework_TestCase
+class Framework_ImapSearch extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Ldap.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Ldap extends PHPUnit_Framework_TestCase
+class Framework_Ldap extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/LdapGeneric.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_LdapGeneric extends PHPUnit_Framework_TestCase
+class Framework_LdapGeneric extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/MessageHeader.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_MessageHeader extends PHPUnit_Framework_TestCase
+class Framework_MessageHeader extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/MessagePart.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_MessagePart extends PHPUnit_Framework_TestCase
+class Framework_MessagePart extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Mime.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Mime extends PHPUnit_Framework_TestCase
+class Framework_Mime extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Rcube.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Rcube extends PHPUnit_Framework_TestCase
+class Framework_Rcube extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/ResultIndex.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ResultIndex extends PHPUnit_Framework_TestCase
+class Framework_ResultIndex extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/ResultMultifolder.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ResultMultifolder extends PHPUnit_Framework_TestCase
+class Framework_ResultMultifolder extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/ResultSet.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ResultSet extends PHPUnit_Framework_TestCase
+class Framework_ResultSet extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/ResultThread.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ResultThread extends PHPUnit_Framework_TestCase
+class Framework_ResultThread extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Smtp.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Smtp extends PHPUnit_Framework_TestCase
+class Framework_Smtp extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Spellchecker.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Spellchecker extends PHPUnit_Framework_TestCase
+class Framework_Spellchecker extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/SpellcheckerAtd.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_SpellcheckerAtd extends PHPUnit_Framework_TestCase
+class Framework_SpellcheckerAtd extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/SpellcheckerEnchant.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_SpellcheckerEnchant extends PHPUnit_Framework_TestCase
+class Framework_SpellcheckerEnchant extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/SpellcheckerGoogie.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_SpellcheckerGoogie extends PHPUnit_Framework_TestCase
+class Framework_SpellcheckerGoogie extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/SpellcheckerPspell.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_SpellcheckerPspell extends PHPUnit_Framework_TestCase
+class Framework_SpellcheckerPspell extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/StringReplacer.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_StringReplacer extends PHPUnit_Framework_TestCase
+class Framework_StringReplacer extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Text2Html.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Text2Html extends PHPUnit_Framework_TestCase
+class Framework_Text2Html extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/User.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_User extends PHPUnit_Framework_TestCase
+class Framework_User extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/Utils.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Utils extends PHPUnit_Framework_TestCase
+class Framework_Utils extends PHPUnit\Framework\TestCase
 {
 
     /**

tests/Framework/VCard.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_VCard extends PHPUnit_Framework_TestCase
+class Framework_VCard extends PHPUnit\Framework\TestCase
 {
 
     function _srcpath($fn)

tests/Framework/Washtml.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Washtml extends PHPUnit_Framework_TestCase
+class Framework_Washtml extends PHPUnit\Framework\TestCase
 {
     /**
      * A helper method to remove comments added by rcube_washtml

tests/MailFunc.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class MailFunc extends PHPUnit_Framework_TestCase
+class MailFunc extends PHPUnit\Framework\TestCase
 {
 
     function setUp()

tests/Rcmail/OutputHtml.php

@@ -4,7 +4,7 @@
  *
  * @package Tests
  */
-class Rcmail_OutputHtml extends PHPUnit_Framework_TestCase
+class Rcmail_OutputHtml extends PHPUnit\Framework\TestCase
 {
     /**
      * Test get_template_logo()

tests/Rcmail/Rcmail.php

@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Rcmail_Rcmail extends PHPUnit_Framework_TestCase
+class Rcmail_Rcmail extends PHPUnit\Framework\TestCase
 {
     function setUp()
     {