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.

49 files changed, 49 insertions, 49 deletions

diff --git a/tests/Framework/BaseReplacer.php b/tests/Framework/BaseReplacer.php
index 2255e9af2..fd0c7c30c 100644
--- a/tests/Framework/BaseReplacer.php
+++ b/tests/Framework/BaseReplacer.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_BaseReplacer extends PHPUnit_Framework_TestCase
+class Framework_BaseReplacer extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Bootstrap.php b/tests/Framework/Bootstrap.php
index eeac418eb..9f6ca1242 100644
--- a/tests/Framework/Bootstrap.php
+++ b/tests/Framework/Bootstrap.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Bootstrap extends PHPUnit_Framework_TestCase
+class Framework_Bootstrap extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Browser.php b/tests/Framework/Browser.php
index 8cd7f8166..09465478d 100644
--- a/tests/Framework/Browser.php
+++ b/tests/Framework/Browser.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Browser extends PHPUnit_Framework_TestCase
+class Framework_Browser extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Cache.php b/tests/Framework/Cache.php
index dc026a634..330076ac9 100644
--- a/tests/Framework/Cache.php
+++ b/tests/Framework/Cache.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Cache extends PHPUnit_Framework_TestCase
+class Framework_Cache extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Charset.php b/tests/Framework/Charset.php
index f36b7b969..b970ff61f 100644
--- a/tests/Framework/Charset.php
+++ b/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
 {
 
     /**
diff --git a/tests/Framework/Config.php b/tests/Framework/Config.php
index 6569fd5cf..5c521cf09 100644
--- a/tests/Framework/Config.php
+++ b/tests/Framework/Config.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Config extends PHPUnit_Framework_TestCase
+class Framework_Config extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Contacts.php b/tests/Framework/Contacts.php
index 0167ea366..08e60d1cc 100644
--- a/tests/Framework/Contacts.php
+++ b/tests/Framework/Contacts.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Contacts extends PHPUnit_Framework_TestCase
+class Framework_Contacts extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ContentFilter.php b/tests/Framework/ContentFilter.php
index 9bee9368b..a5fb25e2a 100644
--- a/tests/Framework/ContentFilter.php
+++ b/tests/Framework/ContentFilter.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ContentFilter extends PHPUnit_Framework_TestCase
+class Framework_ContentFilter extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Csv2vcard.php b/tests/Framework/Csv2vcard.php
index 34faf7d8d..5bd917f1b 100644
--- a/tests/Framework/Csv2vcard.php
+++ b/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()
diff --git a/tests/Framework/DB.php b/tests/Framework/DB.php
index 4350675e9..581f17374 100644
--- a/tests/Framework/DB.php
+++ b/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
 {
 
     /**
diff --git a/tests/Framework/DBMssql.php b/tests/Framework/DBMssql.php
index 47ab6037b..a1dced142 100644
--- a/tests/Framework/DBMssql.php
+++ b/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
 {
 
     /**
diff --git a/tests/Framework/DBMysql.php b/tests/Framework/DBMysql.php
index 472657c27..1d5a3fc9a 100644
--- a/tests/Framework/DBMysql.php
+++ b/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
 {
 
     /**
diff --git a/tests/Framework/DBOracle.php b/tests/Framework/DBOracle.php
index 27e138d1f..8fff546e0 100644
--- a/tests/Framework/DBOracle.php
+++ b/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
 {
 
     /**
diff --git a/tests/Framework/DBPgsql.php b/tests/Framework/DBPgsql.php
index a7cb005d1..b3054f928 100644
--- a/tests/Framework/DBPgsql.php
+++ b/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
 {
 
     /**
diff --git a/tests/Framework/DBSqlite.php b/tests/Framework/DBSqlite.php
index 00de37e9a..7f33cec09 100644
--- a/tests/Framework/DBSqlite.php
+++ b/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
 {
 
     /**
diff --git a/tests/Framework/DBSqlsrv.php b/tests/Framework/DBSqlsrv.php
index 9114cc5cc..345d38827 100644
--- a/tests/Framework/DBSqlsrv.php
+++ b/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
 {
 
     /**
diff --git a/tests/Framework/Enriched.php b/tests/Framework/Enriched.php
index 26bbc3b4e..de33c512d 100644
--- a/tests/Framework/Enriched.php
+++ b/tests/Framework/Enriched.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Enriched extends PHPUnit_Framework_TestCase
+class Framework_Enriched extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Html.php b/tests/Framework/Html.php
index 8507477c2..01e2a4915 100644
--- a/tests/Framework/Html.php
+++ b/tests/Framework/Html.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Html extends PHPUnit_Framework_TestCase
+class Framework_Html extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Html2text.php b/tests/Framework/Html2text.php
index 202812c38..bfbac7a0c 100644
--- a/tests/Framework/Html2text.php
+++ b/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()
diff --git a/tests/Framework/Image.php b/tests/Framework/Image.php
index 31e852042..d45bbeebf 100644
--- a/tests/Framework/Image.php
+++ b/tests/Framework/Image.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Image extends PHPUnit_Framework_TestCase
+class Framework_Image extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Imap.php b/tests/Framework/Imap.php
index 3f52e07be..bebee465e 100644
--- a/tests/Framework/Imap.php
+++ b/tests/Framework/Imap.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Imap extends PHPUnit_Framework_TestCase
+class Framework_Imap extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ImapCache.php b/tests/Framework/ImapCache.php
index 6c7f98807..074ebd281 100644
--- a/tests/Framework/ImapCache.php
+++ b/tests/Framework/ImapCache.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ImapCache extends PHPUnit_Framework_TestCase
+class Framework_ImapCache extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ImapGeneric.php b/tests/Framework/ImapGeneric.php
index af73158e5..b76589cac 100644
--- a/tests/Framework/ImapGeneric.php
+++ b/tests/Framework/ImapGeneric.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ImapGeneric extends PHPUnit_Framework_TestCase
+class Framework_ImapGeneric extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ImapSearch.php b/tests/Framework/ImapSearch.php
index f91139c00..80882b001 100644
--- a/tests/Framework/ImapSearch.php
+++ b/tests/Framework/ImapSearch.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ImapSearch extends PHPUnit_Framework_TestCase
+class Framework_ImapSearch extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Ldap.php b/tests/Framework/Ldap.php
index 8306907e4..fd266f656 100644
--- a/tests/Framework/Ldap.php
+++ b/tests/Framework/Ldap.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Ldap extends PHPUnit_Framework_TestCase
+class Framework_Ldap extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/LdapGeneric.php b/tests/Framework/LdapGeneric.php
index dd4db4193..efeefb9cc 100644
--- a/tests/Framework/LdapGeneric.php
+++ b/tests/Framework/LdapGeneric.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_LdapGeneric extends PHPUnit_Framework_TestCase
+class Framework_LdapGeneric extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/MessageHeader.php b/tests/Framework/MessageHeader.php
index e5bc1752f..8ba0ab2ad 100644
--- a/tests/Framework/MessageHeader.php
+++ b/tests/Framework/MessageHeader.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_MessageHeader extends PHPUnit_Framework_TestCase
+class Framework_MessageHeader extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/MessagePart.php b/tests/Framework/MessagePart.php
index deb426024..dc3cc7597 100644
--- a/tests/Framework/MessagePart.php
+++ b/tests/Framework/MessagePart.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_MessagePart extends PHPUnit_Framework_TestCase
+class Framework_MessagePart extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Mime.php b/tests/Framework/Mime.php
index bbab0e64b..6768531fe 100644
--- a/tests/Framework/Mime.php
+++ b/tests/Framework/Mime.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Mime extends PHPUnit_Framework_TestCase
+class Framework_Mime extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Rcube.php b/tests/Framework/Rcube.php
index 637558dc9..3bec0be7b 100644
--- a/tests/Framework/Rcube.php
+++ b/tests/Framework/Rcube.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Rcube extends PHPUnit_Framework_TestCase
+class Framework_Rcube extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ResultIndex.php b/tests/Framework/ResultIndex.php
index da1cc628f..fada6075e 100644
--- a/tests/Framework/ResultIndex.php
+++ b/tests/Framework/ResultIndex.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ResultIndex extends PHPUnit_Framework_TestCase
+class Framework_ResultIndex extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ResultMultifolder.php b/tests/Framework/ResultMultifolder.php
index 83a2b1d96..b7045d590 100644
--- a/tests/Framework/ResultMultifolder.php
+++ b/tests/Framework/ResultMultifolder.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ResultMultifolder extends PHPUnit_Framework_TestCase
+class Framework_ResultMultifolder extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ResultSet.php b/tests/Framework/ResultSet.php
index 2d04e53c0..886c01774 100644
--- a/tests/Framework/ResultSet.php
+++ b/tests/Framework/ResultSet.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ResultSet extends PHPUnit_Framework_TestCase
+class Framework_ResultSet extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/ResultThread.php b/tests/Framework/ResultThread.php
index 55fca4c6a..5b6c7bafd 100644
--- a/tests/Framework/ResultThread.php
+++ b/tests/Framework/ResultThread.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_ResultThread extends PHPUnit_Framework_TestCase
+class Framework_ResultThread extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Smtp.php b/tests/Framework/Smtp.php
index 4bd78d097..d38f987b5 100644
--- a/tests/Framework/Smtp.php
+++ b/tests/Framework/Smtp.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Smtp extends PHPUnit_Framework_TestCase
+class Framework_Smtp extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Spellchecker.php b/tests/Framework/Spellchecker.php
index 9c3e92ffd..b1963bb59 100644
--- a/tests/Framework/Spellchecker.php
+++ b/tests/Framework/Spellchecker.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Spellchecker extends PHPUnit_Framework_TestCase
+class Framework_Spellchecker extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/SpellcheckerAtd.php b/tests/Framework/SpellcheckerAtd.php
index d3152eaf3..eb8f12338 100644
--- a/tests/Framework/SpellcheckerAtd.php
+++ b/tests/Framework/SpellcheckerAtd.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_SpellcheckerAtd extends PHPUnit_Framework_TestCase
+class Framework_SpellcheckerAtd extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/SpellcheckerEnchant.php b/tests/Framework/SpellcheckerEnchant.php
index aad69d9db..39fad30ba 100644
--- a/tests/Framework/SpellcheckerEnchant.php
+++ b/tests/Framework/SpellcheckerEnchant.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_SpellcheckerEnchant extends PHPUnit_Framework_TestCase
+class Framework_SpellcheckerEnchant extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/SpellcheckerGoogie.php b/tests/Framework/SpellcheckerGoogie.php
index f1713eb11..8c1f1734c 100644
--- a/tests/Framework/SpellcheckerGoogie.php
+++ b/tests/Framework/SpellcheckerGoogie.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_SpellcheckerGoogie extends PHPUnit_Framework_TestCase
+class Framework_SpellcheckerGoogie extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/SpellcheckerPspell.php b/tests/Framework/SpellcheckerPspell.php
index 5888a8c0a..12a0edf55 100644
--- a/tests/Framework/SpellcheckerPspell.php
+++ b/tests/Framework/SpellcheckerPspell.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_SpellcheckerPspell extends PHPUnit_Framework_TestCase
+class Framework_SpellcheckerPspell extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/StringReplacer.php b/tests/Framework/StringReplacer.php
index 543601d35..6adaee4ce 100644
--- a/tests/Framework/StringReplacer.php
+++ b/tests/Framework/StringReplacer.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_StringReplacer extends PHPUnit_Framework_TestCase
+class Framework_StringReplacer extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Text2Html.php b/tests/Framework/Text2Html.php
index c85e44a4c..52d448090 100644
--- a/tests/Framework/Text2Html.php
+++ b/tests/Framework/Text2Html.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Text2Html extends PHPUnit_Framework_TestCase
+class Framework_Text2Html extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/User.php b/tests/Framework/User.php
index 3b1983c58..9065209ef 100644
--- a/tests/Framework/User.php
+++ b/tests/Framework/User.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_User extends PHPUnit_Framework_TestCase
+class Framework_User extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/Utils.php b/tests/Framework/Utils.php
index 3df90ffd0..770d87014 100644
--- a/tests/Framework/Utils.php
+++ b/tests/Framework/Utils.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class Framework_Utils extends PHPUnit_Framework_TestCase
+class Framework_Utils extends PHPUnit\Framework\TestCase
 {
 
     /**
diff --git a/tests/Framework/VCard.php b/tests/Framework/VCard.php
index 2827f9f01..1347c18bd 100644
--- a/tests/Framework/VCard.php
+++ b/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)
diff --git a/tests/Framework/Washtml.php b/tests/Framework/Washtml.php
index 45042b968..84c9af646 100644
--- a/tests/Framework/Washtml.php
+++ b/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
diff --git a/tests/MailFunc.php b/tests/MailFunc.php
index a231644ff..678882413 100644
--- a/tests/MailFunc.php
+++ b/tests/MailFunc.php
@@ -5,7 +5,7 @@
  *
  * @package Tests
  */
-class MailFunc extends PHPUnit_Framework_TestCase
+class MailFunc extends PHPUnit\Framework\TestCase
 {
 
     function setUp()
diff --git a/tests/Rcmail/OutputHtml.php b/tests/Rcmail/OutputHtml.php
index 0aa24c9b4..54ca576cd 100644
--- a/tests/Rcmail/OutputHtml.php
+++ b/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()
diff --git a/tests/Rcmail/Rcmail.php b/tests/Rcmail/Rcmail.php
index e6ed769e9..7a94d347a 100644
--- a/tests/Rcmail/Rcmail.php
+++ b/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()
     {