diff --git a/.github/run.sh b/.github/run.sh index 6e2c73458b5..f24c052250f 100755 --- a/.github/run.sh +++ b/.github/run.sh @@ -31,9 +31,9 @@ wget -q https://repo1.maven.org/maven2/com/icegreen/greenmail-standalone/$GMV/gr # Run tests echo "TESTS_MODE: DESKTOP" \ -&& TESTS_MODE=desktop vendor/bin/phpunit -c tests/Browser/phpunit.xml --exclude-group=failsonga \ +&& TESTS_MODE=desktop vendor/bin/phpunit -c tests/Browser/phpunit.xml --fail-on-warning --fail-on-risky --exclude-group=failsonga \ && echo "TESTS_MODE: TABLET" \ -&& TESTS_MODE=tablet vendor/bin/phpunit -c tests/Browser/phpunit.xml --exclude-group=failsonga-tablet \ +&& TESTS_MODE=tablet vendor/bin/phpunit -c tests/Browser/phpunit.xml --fail-on-warning --fail-on-risky --exclude-group=failsonga-tablet \ # Mobile mode tests are unreliable on Github Actions # && echo "TESTS_MODE: PHONE" \ -# && TESTS_MODE=phone vendor/bin/phpunit -c tests/Browser/phpunit.xml --exclude-group=failsonga-phone \ +# && TESTS_MODE=phone vendor/bin/phpunit -c tests/Browser/phpunit.xml --fail-on-warning --fail-on-risky --exclude-group=failsonga-phone \ diff --git a/.github/workflows/browser_tests.yml b/.github/workflows/browser_tests.yml index 55086b799e7..5eb68152b59 100644 --- a/.github/workflows/browser_tests.yml +++ b/.github/workflows/browser_tests.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - php: ["8.1"] + php: ["8.1", "8.3"] name: Linux / PHP ${{ matrix.php }} @@ -44,7 +44,9 @@ jobs: run: sudo apt-get -y install aspell aspell-en aspell-de - name: Setup composer - run: composer require "laravel/dusk:^7.9" --no-update + run: | + composer require "nesbot/carbon:^2.62.1" --no-update + composer require "laravel/dusk:^7.9" --no-update - name: Install dependencies run: composer update --prefer-dist --no-interaction --no-progress @@ -63,5 +65,9 @@ jobs: npm install --force -g less-plugin-clean-css npm install --force -g uglify-js + - name: Downgrade dependencies (for PHP 8.3 only) + if: matrix.php == '8.3' + run: composer update --prefer-dist --prefer-stable --prefer-lowest --no-interaction --no-progress --optimize-autoloader + - name: Execute tests run: .github/run.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d23a1f0840..d7f1960805b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,6 +40,15 @@ jobs: npm add -D eslint eslint-plugin-import eslint-config-airbnb-base eslint-plugin-unicorn npx eslint --ext .js . + - name: Plugins - Check composer.json format + run: | + for plugin_dir in plugins/*/; do ( + echo "========== $plugin_dir ==========" + cd "$plugin_dir" + composer validate --strict --no-check-lock && composer normalize --dry-run --no-check-lock "$plugin_dir/composer.json" + echo " " + ); done + phpstan: runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')" diff --git a/plugins/acl/composer.json b/plugins/acl/composer.json index 09f7a833cf1..e123d86e68f 100644 --- a/plugins/acl/composer.json +++ b/plugins/acl/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/acl/tests/Acl.php b/plugins/acl/tests/AclTest.php similarity index 100% rename from plugins/acl/tests/Acl.php rename to plugins/acl/tests/AclTest.php diff --git a/plugins/additional_message_headers/composer.json b/plugins/additional_message_headers/composer.json index 08f422d4f26..546dcd9e1a0 100644 --- a/plugins/additional_message_headers/composer.json +++ b/plugins/additional_message_headers/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php b/plugins/additional_message_headers/tests/AdditionalMessageHeadersTest.php similarity index 100% rename from plugins/additional_message_headers/tests/AdditionalMessageHeaders.php rename to plugins/additional_message_headers/tests/AdditionalMessageHeadersTest.php diff --git a/plugins/archive/composer.json b/plugins/archive/composer.json index 9ef4cb1d190..54c8ccc5881 100644 --- a/plugins/archive/composer.json +++ b/plugins/archive/composer.json @@ -16,12 +16,6 @@ "role": "Developer" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/archive/tests/Archive.php b/plugins/archive/tests/ArchiveTest.php similarity index 100% rename from plugins/archive/tests/Archive.php rename to plugins/archive/tests/ArchiveTest.php diff --git a/plugins/attachment_reminder/composer.json b/plugins/attachment_reminder/composer.json index 0a0e8842145..fe8f36e343c 100644 --- a/plugins/attachment_reminder/composer.json +++ b/plugins/attachment_reminder/composer.json @@ -12,16 +12,9 @@ }, { "name": "Thomas Yu - Sian, Liu", - "email": "", "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/attachment_reminder/tests/AttachmentReminder.php b/plugins/attachment_reminder/tests/AttachmentReminderTest.php similarity index 100% rename from plugins/attachment_reminder/tests/AttachmentReminder.php rename to plugins/attachment_reminder/tests/AttachmentReminderTest.php diff --git a/plugins/autologon/composer.json b/plugins/autologon/composer.json index 5797fb9e78d..90876674a99 100644 --- a/plugins/autologon/composer.json +++ b/plugins/autologon/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/autologon/tests/Autologon.php b/plugins/autologon/tests/AutologonTest.php similarity index 100% rename from plugins/autologon/tests/Autologon.php rename to plugins/autologon/tests/AutologonTest.php diff --git a/plugins/autologout/composer.json b/plugins/autologout/composer.json index 98ab1d90297..455262a9d12 100644 --- a/plugins/autologout/composer.json +++ b/plugins/autologout/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/autologout", "type": "roundcube-plugin", "description": "Plugin to auto log out users with a POST request sent from an external site.", - "license": "GPLv3+", + "license": "GPL-3.0-or-later", "version": "1.0", "authors": [ { diff --git a/plugins/autologout/tests/Autologout.php b/plugins/autologout/tests/AutologoutTest.php similarity index 100% rename from plugins/autologout/tests/Autologout.php rename to plugins/autologout/tests/AutologoutTest.php diff --git a/plugins/database_attachments/composer.json b/plugins/database_attachments/composer.json index 16b3311a333..2c39f07d387 100644 --- a/plugins/database_attachments/composer.json +++ b/plugins/database_attachments/composer.json @@ -16,12 +16,6 @@ "role": "Developer" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3", diff --git a/plugins/database_attachments/tests/DatabaseAttachments.php b/plugins/database_attachments/tests/DatabaseAttachmentsTest.php similarity index 100% rename from plugins/database_attachments/tests/DatabaseAttachments.php rename to plugins/database_attachments/tests/DatabaseAttachmentsTest.php diff --git a/plugins/debug_logger/composer.json b/plugins/debug_logger/composer.json index bdd516cfc51..c3476b896e6 100644 --- a/plugins/debug_logger/composer.json +++ b/plugins/debug_logger/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/debug_logger/tests/DebugLogger.php b/plugins/debug_logger/tests/DebugLoggerTest.php similarity index 100% rename from plugins/debug_logger/tests/DebugLogger.php rename to plugins/debug_logger/tests/DebugLoggerTest.php diff --git a/plugins/emoticons/composer.json b/plugins/emoticons/composer.json index 3b9faa9835a..672fc9db8e1 100644 --- a/plugins/emoticons/composer.json +++ b/plugins/emoticons/composer.json @@ -16,12 +16,6 @@ "role": "Developer" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/emoticons/tests/Emoticons.php b/plugins/emoticons/tests/EmoticonsTest.php similarity index 100% rename from plugins/emoticons/tests/Emoticons.php rename to plugins/emoticons/tests/EmoticonsTest.php diff --git a/plugins/enigma/composer.json b/plugins/enigma/composer.json index f86c03dc753..858ea8e2100 100644 --- a/plugins/enigma/composer.json +++ b/plugins/enigma/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": "~0.1.6", diff --git a/plugins/enigma/tests/EnigmaDriverGnupg.php b/plugins/enigma/tests/EnigmaDriverGnupgTest.php similarity index 100% rename from plugins/enigma/tests/EnigmaDriverGnupg.php rename to plugins/enigma/tests/EnigmaDriverGnupgTest.php diff --git a/plugins/enigma/tests/EnigmaEngine.php b/plugins/enigma/tests/EnigmaEngineTest.php similarity index 100% rename from plugins/enigma/tests/EnigmaEngine.php rename to plugins/enigma/tests/EnigmaEngineTest.php diff --git a/plugins/enigma/tests/EnigmaError.php b/plugins/enigma/tests/EnigmaErrorTest.php similarity index 100% rename from plugins/enigma/tests/EnigmaError.php rename to plugins/enigma/tests/EnigmaErrorTest.php diff --git a/plugins/enigma/tests/EnigmaKey.php b/plugins/enigma/tests/EnigmaKeyTest.php similarity index 100% rename from plugins/enigma/tests/EnigmaKey.php rename to plugins/enigma/tests/EnigmaKeyTest.php diff --git a/plugins/enigma/tests/EnigmaMimeMessage.php b/plugins/enigma/tests/EnigmaMimeMessageTest.php similarity index 100% rename from plugins/enigma/tests/EnigmaMimeMessage.php rename to plugins/enigma/tests/EnigmaMimeMessageTest.php diff --git a/plugins/enigma/tests/EnigmaSignature.php b/plugins/enigma/tests/EnigmaSignatureTest.php similarity index 100% rename from plugins/enigma/tests/EnigmaSignature.php rename to plugins/enigma/tests/EnigmaSignatureTest.php diff --git a/plugins/enigma/tests/EnigmaSubkey.php b/plugins/enigma/tests/EnigmaSubkeyTest.php similarity index 100% rename from plugins/enigma/tests/EnigmaSubkey.php rename to plugins/enigma/tests/EnigmaSubkeyTest.php diff --git a/plugins/enigma/tests/Enigma.php b/plugins/enigma/tests/EnigmaTest.php similarity index 100% rename from plugins/enigma/tests/Enigma.php rename to plugins/enigma/tests/EnigmaTest.php diff --git a/plugins/enigma/tests/EnigmaUserid.php b/plugins/enigma/tests/EnigmaUseridTest.php similarity index 100% rename from plugins/enigma/tests/EnigmaUserid.php rename to plugins/enigma/tests/EnigmaUseridTest.php diff --git a/plugins/example_addressbook/composer.json b/plugins/example_addressbook/composer.json index 3a20e16bd85..faadf2d9f57 100644 --- a/plugins/example_addressbook/composer.json +++ b/plugins/example_addressbook/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/example_addressbook/tests/ExampleAddressbook.php b/plugins/example_addressbook/tests/ExampleAddressbookTest.php similarity index 100% rename from plugins/example_addressbook/tests/ExampleAddressbook.php rename to plugins/example_addressbook/tests/ExampleAddressbookTest.php diff --git a/plugins/filesystem_attachments/composer.json b/plugins/filesystem_attachments/composer.json index 4bb44669e0b..ecd97a660aa 100644 --- a/plugins/filesystem_attachments/composer.json +++ b/plugins/filesystem_attachments/composer.json @@ -16,12 +16,6 @@ "role": "Developer" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/filesystem_attachments/tests/FilesystemAttachments.php b/plugins/filesystem_attachments/tests/FilesystemAttachmentsTest.php similarity index 100% rename from plugins/filesystem_attachments/tests/FilesystemAttachments.php rename to plugins/filesystem_attachments/tests/FilesystemAttachmentsTest.php diff --git a/plugins/help/composer.json b/plugins/help/composer.json index 121b1d05d94..00cc19c305d 100644 --- a/plugins/help/composer.json +++ b/plugins/help/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/help/tests/Help.php b/plugins/help/tests/HelpTest.php similarity index 100% rename from plugins/help/tests/Help.php rename to plugins/help/tests/HelpTest.php diff --git a/plugins/hide_blockquote/composer.json b/plugins/hide_blockquote/composer.json index 9d44b95a935..314cbc007d9 100644 --- a/plugins/hide_blockquote/composer.json +++ b/plugins/hide_blockquote/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/hide_blockquote/tests/HideBlockquote.php b/plugins/hide_blockquote/tests/HideBlockquoteTest.php similarity index 100% rename from plugins/hide_blockquote/tests/HideBlockquote.php rename to plugins/hide_blockquote/tests/HideBlockquoteTest.php diff --git a/plugins/http_authentication/composer.json b/plugins/http_authentication/composer.json index e996b15dcf2..03b120eacec 100644 --- a/plugins/http_authentication/composer.json +++ b/plugins/http_authentication/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/http_authentication/tests/HttpAuthentication.php b/plugins/http_authentication/tests/HttpAuthenticationTest.php similarity index 100% rename from plugins/http_authentication/tests/HttpAuthentication.php rename to plugins/http_authentication/tests/HttpAuthenticationTest.php diff --git a/plugins/identicon/composer.json b/plugins/identicon/composer.json index cb1017f4c0f..1af7abfe7e4 100644 --- a/plugins/identicon/composer.json +++ b/plugins/identicon/composer.json @@ -11,15 +11,9 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", - "php-gd": "*", + "ext-gd": "*", "roundcube/plugin-installer": ">=0.1.3" } } diff --git a/plugins/identicon/tests/IdenticonEngine.php b/plugins/identicon/tests/IdenticonEngineTest.php similarity index 100% rename from plugins/identicon/tests/IdenticonEngine.php rename to plugins/identicon/tests/IdenticonEngineTest.php diff --git a/plugins/identicon/tests/Identicon.php b/plugins/identicon/tests/IdenticonTest.php similarity index 100% rename from plugins/identicon/tests/Identicon.php rename to plugins/identicon/tests/IdenticonTest.php diff --git a/plugins/identity_select/composer.json b/plugins/identity_select/composer.json index 07eb5703f55..7632cc3f5ff 100644 --- a/plugins/identity_select/composer.json +++ b/plugins/identity_select/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/identity_select/tests/IdentitySelect.php b/plugins/identity_select/tests/IdentitySelectTest.php similarity index 100% rename from plugins/identity_select/tests/IdentitySelect.php rename to plugins/identity_select/tests/IdentitySelectTest.php diff --git a/plugins/jqueryui/composer.json b/plugins/jqueryui/composer.json index 97ed998984f..21de0d94385 100644 --- a/plugins/jqueryui/composer.json +++ b/plugins/jqueryui/composer.json @@ -16,12 +16,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/jqueryui/tests/Jqueryui.php b/plugins/jqueryui/tests/JqueryuiTest.php similarity index 100% rename from plugins/jqueryui/tests/Jqueryui.php rename to plugins/jqueryui/tests/JqueryuiTest.php diff --git a/plugins/krb_authentication/composer.json b/plugins/krb_authentication/composer.json index 9c4c3041274..f0ab56a359e 100644 --- a/plugins/krb_authentication/composer.json +++ b/plugins/krb_authentication/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/krb_authentication/tests/KrbAuthentication.php b/plugins/krb_authentication/tests/KrbAuthenticationTest.php similarity index 100% rename from plugins/krb_authentication/tests/KrbAuthentication.php rename to plugins/krb_authentication/tests/KrbAuthenticationTest.php diff --git a/plugins/managesieve/composer.json b/plugins/managesieve/composer.json index 981bebbef2a..06272ee06e7 100644 --- a/plugins/managesieve/composer.json +++ b/plugins/managesieve/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3", diff --git a/plugins/managesieve/tests/Engine.php b/plugins/managesieve/tests/EngineTest.php similarity index 100% rename from plugins/managesieve/tests/Engine.php rename to plugins/managesieve/tests/EngineTest.php diff --git a/plugins/managesieve/tests/Forward.php b/plugins/managesieve/tests/ForwardTest.php similarity index 100% rename from plugins/managesieve/tests/Forward.php rename to plugins/managesieve/tests/ForwardTest.php diff --git a/plugins/managesieve/tests/Managesieve.php b/plugins/managesieve/tests/ManagesieveTest.php similarity index 100% rename from plugins/managesieve/tests/Managesieve.php rename to plugins/managesieve/tests/ManagesieveTest.php diff --git a/plugins/managesieve/tests/Script.php b/plugins/managesieve/tests/ScriptTest.php similarity index 100% rename from plugins/managesieve/tests/Script.php rename to plugins/managesieve/tests/ScriptTest.php diff --git a/plugins/managesieve/tests/Vacation.php b/plugins/managesieve/tests/VacationTest.php similarity index 100% rename from plugins/managesieve/tests/Vacation.php rename to plugins/managesieve/tests/VacationTest.php diff --git a/plugins/markasjunk/composer.json b/plugins/markasjunk/composer.json index dc68f61a817..4b86ea42b6d 100644 --- a/plugins/markasjunk/composer.json +++ b/plugins/markasjunk/composer.json @@ -16,12 +16,6 @@ "role": "Developer" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/markasjunk/tests/Markasjunk.php b/plugins/markasjunk/tests/MarkasjunkTest.php similarity index 100% rename from plugins/markasjunk/tests/Markasjunk.php rename to plugins/markasjunk/tests/MarkasjunkTest.php diff --git a/plugins/new_user_dialog/composer.json b/plugins/new_user_dialog/composer.json index 2b9cd507349..157988020cb 100644 --- a/plugins/new_user_dialog/composer.json +++ b/plugins/new_user_dialog/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/new_user_dialog/tests/NewUserDialog.php b/plugins/new_user_dialog/tests/NewUserDialogTest.php similarity index 100% rename from plugins/new_user_dialog/tests/NewUserDialog.php rename to plugins/new_user_dialog/tests/NewUserDialogTest.php diff --git a/plugins/new_user_identity/composer.json b/plugins/new_user_identity/composer.json index 4f0ba5c03ae..89484fa49ff 100644 --- a/plugins/new_user_identity/composer.json +++ b/plugins/new_user_identity/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/new_user_identity/tests/NewUserIdentity.php b/plugins/new_user_identity/tests/NewUserIdentityTest.php similarity index 100% rename from plugins/new_user_identity/tests/NewUserIdentity.php rename to plugins/new_user_identity/tests/NewUserIdentityTest.php diff --git a/plugins/newmail_notifier/composer.json b/plugins/newmail_notifier/composer.json index d98a8d61afb..cc72755c01e 100644 --- a/plugins/newmail_notifier/composer.json +++ b/plugins/newmail_notifier/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/newmail_notifier/tests/NewmailNotifier.php b/plugins/newmail_notifier/tests/NewmailNotifierTest.php similarity index 100% rename from plugins/newmail_notifier/tests/NewmailNotifier.php rename to plugins/newmail_notifier/tests/NewmailNotifierTest.php diff --git a/plugins/password/composer.json b/plugins/password/composer.json index 725ce7109b1..c49886847ee 100644 --- a/plugins/password/composer.json +++ b/plugins/password/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/password/tests/Password.php b/plugins/password/tests/PasswordTest.php similarity index 100% rename from plugins/password/tests/Password.php rename to plugins/password/tests/PasswordTest.php diff --git a/plugins/reconnect/composer.json b/plugins/reconnect/composer.json index c7a990bc82c..f67284a8546 100644 --- a/plugins/reconnect/composer.json +++ b/plugins/reconnect/composer.json @@ -1,5 +1,5 @@ { - "name": "reconnect", + "name": "roundcube/reconnect", "type": "roundcube-plugin", "description": "Reconnects to server for several attempts.", "license": "GPL-3.0-or-later", @@ -10,12 +10,6 @@ "email": "hefee@debian.org" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/reconnect/tests/ReconnectTest.php b/plugins/reconnect/tests/ReconnectTest.php new file mode 100644 index 00000000000..d4f106d57a8 --- /dev/null +++ b/plugins/reconnect/tests/ReconnectTest.php @@ -0,0 +1,23 @@ +plugins); + + $this->assertInstanceOf('reconnect', $plugin); + $this->assertInstanceOf('rcube_plugin', $plugin); + } +} diff --git a/plugins/redundant_attachments/composer.json b/plugins/redundant_attachments/composer.json index b893918650b..4613d674116 100644 --- a/plugins/redundant_attachments/composer.json +++ b/plugins/redundant_attachments/composer.json @@ -16,12 +16,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3", diff --git a/plugins/redundant_attachments/tests/RedundantAttachments.php b/plugins/redundant_attachments/tests/RedundantAttachmentsTest.php similarity index 100% rename from plugins/redundant_attachments/tests/RedundantAttachments.php rename to plugins/redundant_attachments/tests/RedundantAttachmentsTest.php diff --git a/plugins/show_additional_headers/composer.json b/plugins/show_additional_headers/composer.json index 7ca83cad2ec..10a4e25ab3b 100644 --- a/plugins/show_additional_headers/composer.json +++ b/plugins/show_additional_headers/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/show_additional_headers/tests/ShowAdditionalHeaders.php b/plugins/show_additional_headers/tests/ShowAdditionalHeadersTest.php similarity index 100% rename from plugins/show_additional_headers/tests/ShowAdditionalHeaders.php rename to plugins/show_additional_headers/tests/ShowAdditionalHeadersTest.php diff --git a/plugins/squirrelmail_usercopy/composer.json b/plugins/squirrelmail_usercopy/composer.json index 0272b22acbe..700f0527290 100644 --- a/plugins/squirrelmail_usercopy/composer.json +++ b/plugins/squirrelmail_usercopy/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php b/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopyTest.php similarity index 100% rename from plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php rename to plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopyTest.php diff --git a/plugins/subscriptions_option/composer.json b/plugins/subscriptions_option/composer.json index a0fbcab534b..67a8ee0a66c 100644 --- a/plugins/subscriptions_option/composer.json +++ b/plugins/subscriptions_option/composer.json @@ -16,12 +16,6 @@ "role": "Developer" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/subscriptions_option/tests/SubscriptionsOption.php b/plugins/subscriptions_option/tests/SubscriptionsOptionTest.php similarity index 100% rename from plugins/subscriptions_option/tests/SubscriptionsOption.php rename to plugins/subscriptions_option/tests/SubscriptionsOptionTest.php diff --git a/plugins/userinfo/composer.json b/plugins/userinfo/composer.json index e41c01574e0..d8b528ba729 100644 --- a/plugins/userinfo/composer.json +++ b/plugins/userinfo/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/userinfo/tests/Userinfo.php b/plugins/userinfo/tests/UserinfoTest.php similarity index 100% rename from plugins/userinfo/tests/Userinfo.php rename to plugins/userinfo/tests/UserinfoTest.php diff --git a/plugins/vcard_attachments/composer.json b/plugins/vcard_attachments/composer.json index cd593e93e34..4bca6994eaa 100644 --- a/plugins/vcard_attachments/composer.json +++ b/plugins/vcard_attachments/composer.json @@ -16,12 +16,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/vcard_attachments/tests/VcardAttachments.php b/plugins/vcard_attachments/tests/VcardAttachmentsTest.php similarity index 100% rename from plugins/vcard_attachments/tests/VcardAttachments.php rename to plugins/vcard_attachments/tests/VcardAttachmentsTest.php diff --git a/plugins/virtuser_file/composer.json b/plugins/virtuser_file/composer.json index 83c2f07520c..38d4a5c5d51 100644 --- a/plugins/virtuser_file/composer.json +++ b/plugins/virtuser_file/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/virtuser_file/tests/VirtuserFile.php b/plugins/virtuser_file/tests/VirtuserFileTest.php similarity index 100% rename from plugins/virtuser_file/tests/VirtuserFile.php rename to plugins/virtuser_file/tests/VirtuserFileTest.php diff --git a/plugins/virtuser_query/composer.json b/plugins/virtuser_query/composer.json index cc9367b4497..df8c7bb3101 100644 --- a/plugins/virtuser_query/composer.json +++ b/plugins/virtuser_query/composer.json @@ -11,12 +11,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3" diff --git a/plugins/virtuser_query/tests/VirtuserQuery.php b/plugins/virtuser_query/tests/VirtuserQueryTest.php similarity index 100% rename from plugins/virtuser_query/tests/VirtuserQuery.php rename to plugins/virtuser_query/tests/VirtuserQueryTest.php diff --git a/plugins/zipdownload/composer.json b/plugins/zipdownload/composer.json index f5b5ab5b9e1..a03dcb1d7cb 100644 --- a/plugins/zipdownload/composer.json +++ b/plugins/zipdownload/composer.json @@ -16,12 +16,6 @@ "role": "Lead" } ], - "repositories": [ - { - "type": "composer", - "url": "https://plugins.roundcube.net" - } - ], "require": { "php": ">=7.3.0", "roundcube/plugin-installer": ">=0.1.3", diff --git a/plugins/zipdownload/tests/Zipdownload.php b/plugins/zipdownload/tests/ZipdownloadTest.php similarity index 100% rename from plugins/zipdownload/tests/Zipdownload.php rename to plugins/zipdownload/tests/ZipdownloadTest.php diff --git a/tests/ActionTestCase.php b/tests/ActionTestCase.php index 17222bb1322..90da1e80ed1 100644 --- a/tests/ActionTestCase.php +++ b/tests/ActionTestCase.php @@ -28,6 +28,8 @@ public static function tearDownAfterClass(): void $rcmail = rcmail::get_instance(); $rcmail->shutdown(); + + html::$doctype = 'xhtml'; } protected function setUp(): void diff --git a/tests/Actions/Contacts/Copy.php b/tests/Actions/Contacts/CopyTest.php similarity index 100% rename from tests/Actions/Contacts/Copy.php rename to tests/Actions/Contacts/CopyTest.php diff --git a/tests/Actions/Contacts/Delete.php b/tests/Actions/Contacts/DeleteTest.php similarity index 100% rename from tests/Actions/Contacts/Delete.php rename to tests/Actions/Contacts/DeleteTest.php diff --git a/tests/Actions/Contacts/Edit.php b/tests/Actions/Contacts/EditTest.php similarity index 100% rename from tests/Actions/Contacts/Edit.php rename to tests/Actions/Contacts/EditTest.php diff --git a/tests/Actions/Contacts/Export.php b/tests/Actions/Contacts/ExportTest.php similarity index 100% rename from tests/Actions/Contacts/Export.php rename to tests/Actions/Contacts/ExportTest.php diff --git a/tests/Actions/Contacts/GroupAddmembers.php b/tests/Actions/Contacts/GroupAddmembersTest.php similarity index 100% rename from tests/Actions/Contacts/GroupAddmembers.php rename to tests/Actions/Contacts/GroupAddmembersTest.php diff --git a/tests/Actions/Contacts/GroupCreate.php b/tests/Actions/Contacts/GroupCreateTest.php similarity index 100% rename from tests/Actions/Contacts/GroupCreate.php rename to tests/Actions/Contacts/GroupCreateTest.php diff --git a/tests/Actions/Contacts/GroupDelete.php b/tests/Actions/Contacts/GroupDeleteTest.php similarity index 100% rename from tests/Actions/Contacts/GroupDelete.php rename to tests/Actions/Contacts/GroupDeleteTest.php diff --git a/tests/Actions/Contacts/GroupDelmembers.php b/tests/Actions/Contacts/GroupDelmembersTest.php similarity index 100% rename from tests/Actions/Contacts/GroupDelmembers.php rename to tests/Actions/Contacts/GroupDelmembersTest.php diff --git a/tests/Actions/Contacts/GroupRename.php b/tests/Actions/Contacts/GroupRenameTest.php similarity index 100% rename from tests/Actions/Contacts/GroupRename.php rename to tests/Actions/Contacts/GroupRenameTest.php diff --git a/tests/Actions/Contacts/Import.php b/tests/Actions/Contacts/ImportTest.php similarity index 100% rename from tests/Actions/Contacts/Import.php rename to tests/Actions/Contacts/ImportTest.php diff --git a/tests/Actions/Contacts/Index.php b/tests/Actions/Contacts/IndexTest.php similarity index 100% rename from tests/Actions/Contacts/Index.php rename to tests/Actions/Contacts/IndexTest.php diff --git a/tests/Actions/Contacts/List.php b/tests/Actions/Contacts/ListTest.php similarity index 100% rename from tests/Actions/Contacts/List.php rename to tests/Actions/Contacts/ListTest.php diff --git a/tests/Actions/Contacts/Mailto.php b/tests/Actions/Contacts/MailtoTest.php similarity index 100% rename from tests/Actions/Contacts/Mailto.php rename to tests/Actions/Contacts/MailtoTest.php diff --git a/tests/Actions/Contacts/Move.php b/tests/Actions/Contacts/MoveTest.php similarity index 100% rename from tests/Actions/Contacts/Move.php rename to tests/Actions/Contacts/MoveTest.php diff --git a/tests/Actions/Contacts/Photo.php b/tests/Actions/Contacts/PhotoTest.php similarity index 100% rename from tests/Actions/Contacts/Photo.php rename to tests/Actions/Contacts/PhotoTest.php diff --git a/tests/Actions/Contacts/Print.php b/tests/Actions/Contacts/PrintTest.php similarity index 100% rename from tests/Actions/Contacts/Print.php rename to tests/Actions/Contacts/PrintTest.php diff --git a/tests/Actions/Contacts/Qrcode.php b/tests/Actions/Contacts/QrcodeTest.php similarity index 100% rename from tests/Actions/Contacts/Qrcode.php rename to tests/Actions/Contacts/QrcodeTest.php diff --git a/tests/Actions/Contacts/Save.php b/tests/Actions/Contacts/SaveTest.php similarity index 100% rename from tests/Actions/Contacts/Save.php rename to tests/Actions/Contacts/SaveTest.php diff --git a/tests/Actions/Contacts/SearchCreate.php b/tests/Actions/Contacts/SearchCreateTest.php similarity index 100% rename from tests/Actions/Contacts/SearchCreate.php rename to tests/Actions/Contacts/SearchCreateTest.php diff --git a/tests/Actions/Contacts/SearchDelete.php b/tests/Actions/Contacts/SearchDeleteTest.php similarity index 100% rename from tests/Actions/Contacts/SearchDelete.php rename to tests/Actions/Contacts/SearchDeleteTest.php diff --git a/tests/Actions/Contacts/Search.php b/tests/Actions/Contacts/SearchTest.php similarity index 100% rename from tests/Actions/Contacts/Search.php rename to tests/Actions/Contacts/SearchTest.php diff --git a/tests/Actions/Contacts/Show.php b/tests/Actions/Contacts/ShowTest.php similarity index 100% rename from tests/Actions/Contacts/Show.php rename to tests/Actions/Contacts/ShowTest.php diff --git a/tests/Actions/Contacts/Undo.php b/tests/Actions/Contacts/UndoTest.php similarity index 100% rename from tests/Actions/Contacts/Undo.php rename to tests/Actions/Contacts/UndoTest.php diff --git a/tests/Actions/Contacts/UploadPhoto.php b/tests/Actions/Contacts/UploadPhotoTest.php similarity index 100% rename from tests/Actions/Contacts/UploadPhoto.php rename to tests/Actions/Contacts/UploadPhotoTest.php diff --git a/tests/Actions/Login/Oauth.php b/tests/Actions/Login/OauthTest.php similarity index 100% rename from tests/Actions/Login/Oauth.php rename to tests/Actions/Login/OauthTest.php diff --git a/tests/Actions/Mail/Addcontact.php b/tests/Actions/Mail/AddcontactTest.php similarity index 100% rename from tests/Actions/Mail/Addcontact.php rename to tests/Actions/Mail/AddcontactTest.php diff --git a/tests/Actions/Mail/AttachmentDelete.php b/tests/Actions/Mail/AttachmentDeleteTest.php similarity index 100% rename from tests/Actions/Mail/AttachmentDelete.php rename to tests/Actions/Mail/AttachmentDeleteTest.php diff --git a/tests/Actions/Mail/AttachmentDisplay.php b/tests/Actions/Mail/AttachmentDisplayTest.php similarity index 100% rename from tests/Actions/Mail/AttachmentDisplay.php rename to tests/Actions/Mail/AttachmentDisplayTest.php diff --git a/tests/Actions/Mail/AttachmentRename.php b/tests/Actions/Mail/AttachmentRenameTest.php similarity index 100% rename from tests/Actions/Mail/AttachmentRename.php rename to tests/Actions/Mail/AttachmentRenameTest.php diff --git a/tests/Actions/Mail/AttachmentUpload.php b/tests/Actions/Mail/AttachmentUploadTest.php similarity index 100% rename from tests/Actions/Mail/AttachmentUpload.php rename to tests/Actions/Mail/AttachmentUploadTest.php diff --git a/tests/Actions/Mail/Autocomplete.php b/tests/Actions/Mail/AutocompleteTest.php similarity index 100% rename from tests/Actions/Mail/Autocomplete.php rename to tests/Actions/Mail/AutocompleteTest.php diff --git a/tests/Actions/Mail/Bounce.php b/tests/Actions/Mail/BounceTest.php similarity index 100% rename from tests/Actions/Mail/Bounce.php rename to tests/Actions/Mail/BounceTest.php diff --git a/tests/Actions/Mail/CheckRecent.php b/tests/Actions/Mail/CheckRecentTest.php similarity index 100% rename from tests/Actions/Mail/CheckRecent.php rename to tests/Actions/Mail/CheckRecentTest.php diff --git a/tests/Actions/Mail/Compose.php b/tests/Actions/Mail/ComposeTest.php similarity index 100% rename from tests/Actions/Mail/Compose.php rename to tests/Actions/Mail/ComposeTest.php diff --git a/tests/Actions/Mail/Copy.php b/tests/Actions/Mail/CopyTest.php similarity index 100% rename from tests/Actions/Mail/Copy.php rename to tests/Actions/Mail/CopyTest.php diff --git a/tests/Actions/Mail/Delete.php b/tests/Actions/Mail/DeleteTest.php similarity index 100% rename from tests/Actions/Mail/Delete.php rename to tests/Actions/Mail/DeleteTest.php diff --git a/tests/Actions/Mail/FolderExpunge.php b/tests/Actions/Mail/FolderExpungeTest.php similarity index 100% rename from tests/Actions/Mail/FolderExpunge.php rename to tests/Actions/Mail/FolderExpungeTest.php diff --git a/tests/Actions/Mail/FolderPurge.php b/tests/Actions/Mail/FolderPurgeTest.php similarity index 100% rename from tests/Actions/Mail/FolderPurge.php rename to tests/Actions/Mail/FolderPurgeTest.php diff --git a/tests/Actions/Mail/Get.php b/tests/Actions/Mail/GetTest.php similarity index 100% rename from tests/Actions/Mail/Get.php rename to tests/Actions/Mail/GetTest.php diff --git a/tests/Actions/Mail/Getunread.php b/tests/Actions/Mail/GetunreadTest.php similarity index 100% rename from tests/Actions/Mail/Getunread.php rename to tests/Actions/Mail/GetunreadTest.php diff --git a/tests/Actions/Mail/GroupExpand.php b/tests/Actions/Mail/GroupExpandTest.php similarity index 100% rename from tests/Actions/Mail/GroupExpand.php rename to tests/Actions/Mail/GroupExpandTest.php diff --git a/tests/Actions/Mail/Headers.php b/tests/Actions/Mail/HeadersTest.php similarity index 100% rename from tests/Actions/Mail/Headers.php rename to tests/Actions/Mail/HeadersTest.php diff --git a/tests/Actions/Mail/Import.php b/tests/Actions/Mail/ImportTest.php similarity index 100% rename from tests/Actions/Mail/Import.php rename to tests/Actions/Mail/ImportTest.php diff --git a/tests/Actions/Mail/Index.php b/tests/Actions/Mail/IndexTest.php similarity index 100% rename from tests/Actions/Mail/Index.php rename to tests/Actions/Mail/IndexTest.php diff --git a/tests/Actions/Mail/ListContacts.php b/tests/Actions/Mail/ListContactsTest.php similarity index 100% rename from tests/Actions/Mail/ListContacts.php rename to tests/Actions/Mail/ListContactsTest.php diff --git a/tests/Actions/Mail/List.php b/tests/Actions/Mail/ListTest.php similarity index 100% rename from tests/Actions/Mail/List.php rename to tests/Actions/Mail/ListTest.php diff --git a/tests/Actions/Mail/Mark.php b/tests/Actions/Mail/MarkTest.php similarity index 100% rename from tests/Actions/Mail/Mark.php rename to tests/Actions/Mail/MarkTest.php diff --git a/tests/Actions/Mail/Move.php b/tests/Actions/Mail/MoveTest.php similarity index 100% rename from tests/Actions/Mail/Move.php rename to tests/Actions/Mail/MoveTest.php diff --git a/tests/Actions/Mail/Pagenav.php b/tests/Actions/Mail/PagenavTest.php similarity index 100% rename from tests/Actions/Mail/Pagenav.php rename to tests/Actions/Mail/PagenavTest.php diff --git a/tests/Actions/Mail/SearchContacts.php b/tests/Actions/Mail/SearchContactsTest.php similarity index 100% rename from tests/Actions/Mail/SearchContacts.php rename to tests/Actions/Mail/SearchContactsTest.php diff --git a/tests/Actions/Mail/Search.php b/tests/Actions/Mail/SearchTest.php similarity index 100% rename from tests/Actions/Mail/Search.php rename to tests/Actions/Mail/SearchTest.php diff --git a/tests/Actions/Mail/Send.php b/tests/Actions/Mail/SendTest.php similarity index 100% rename from tests/Actions/Mail/Send.php rename to tests/Actions/Mail/SendTest.php diff --git a/tests/Actions/Mail/Sendmdn.php b/tests/Actions/Mail/SendmdnTest.php similarity index 100% rename from tests/Actions/Mail/Sendmdn.php rename to tests/Actions/Mail/SendmdnTest.php diff --git a/tests/Actions/Mail/Show.php b/tests/Actions/Mail/ShowTest.php similarity index 100% rename from tests/Actions/Mail/Show.php rename to tests/Actions/Mail/ShowTest.php diff --git a/tests/Actions/Mail/Viewsource.php b/tests/Actions/Mail/ViewsourceTest.php similarity index 100% rename from tests/Actions/Mail/Viewsource.php rename to tests/Actions/Mail/ViewsourceTest.php diff --git a/tests/Actions/Settings/About.php b/tests/Actions/Settings/AboutTest.php similarity index 100% rename from tests/Actions/Settings/About.php rename to tests/Actions/Settings/AboutTest.php diff --git a/tests/Actions/Settings/FolderCreate.php b/tests/Actions/Settings/FolderCreateTest.php similarity index 100% rename from tests/Actions/Settings/FolderCreate.php rename to tests/Actions/Settings/FolderCreateTest.php diff --git a/tests/Actions/Settings/FolderDelete.php b/tests/Actions/Settings/FolderDeleteTest.php similarity index 100% rename from tests/Actions/Settings/FolderDelete.php rename to tests/Actions/Settings/FolderDeleteTest.php diff --git a/tests/Actions/Settings/FolderEdit.php b/tests/Actions/Settings/FolderEditTest.php similarity index 100% rename from tests/Actions/Settings/FolderEdit.php rename to tests/Actions/Settings/FolderEditTest.php diff --git a/tests/Actions/Settings/FolderPurge.php b/tests/Actions/Settings/FolderPurgeTest.php similarity index 100% rename from tests/Actions/Settings/FolderPurge.php rename to tests/Actions/Settings/FolderPurgeTest.php diff --git a/tests/Actions/Settings/FolderRename.php b/tests/Actions/Settings/FolderRenameTest.php similarity index 100% rename from tests/Actions/Settings/FolderRename.php rename to tests/Actions/Settings/FolderRenameTest.php diff --git a/tests/Actions/Settings/FolderSave.php b/tests/Actions/Settings/FolderSaveTest.php similarity index 100% rename from tests/Actions/Settings/FolderSave.php rename to tests/Actions/Settings/FolderSaveTest.php diff --git a/tests/Actions/Settings/FolderSize.php b/tests/Actions/Settings/FolderSizeTest.php similarity index 100% rename from tests/Actions/Settings/FolderSize.php rename to tests/Actions/Settings/FolderSizeTest.php diff --git a/tests/Actions/Settings/FolderSubscribe.php b/tests/Actions/Settings/FolderSubscribeTest.php similarity index 100% rename from tests/Actions/Settings/FolderSubscribe.php rename to tests/Actions/Settings/FolderSubscribeTest.php diff --git a/tests/Actions/Settings/FolderUnsubscribe.php b/tests/Actions/Settings/FolderUnsubscribeTest.php similarity index 100% rename from tests/Actions/Settings/FolderUnsubscribe.php rename to tests/Actions/Settings/FolderUnsubscribeTest.php diff --git a/tests/Actions/Settings/Folders.php b/tests/Actions/Settings/FoldersTest.php similarity index 100% rename from tests/Actions/Settings/Folders.php rename to tests/Actions/Settings/FoldersTest.php diff --git a/tests/Actions/Settings/Identities.php b/tests/Actions/Settings/IdentitiesTest.php similarity index 100% rename from tests/Actions/Settings/Identities.php rename to tests/Actions/Settings/IdentitiesTest.php diff --git a/tests/Actions/Settings/IdentityCreate.php b/tests/Actions/Settings/IdentityCreateTest.php similarity index 100% rename from tests/Actions/Settings/IdentityCreate.php rename to tests/Actions/Settings/IdentityCreateTest.php diff --git a/tests/Actions/Settings/IdentityDelete.php b/tests/Actions/Settings/IdentityDeleteTest.php similarity index 100% rename from tests/Actions/Settings/IdentityDelete.php rename to tests/Actions/Settings/IdentityDeleteTest.php diff --git a/tests/Actions/Settings/IdentityEdit.php b/tests/Actions/Settings/IdentityEditTest.php similarity index 100% rename from tests/Actions/Settings/IdentityEdit.php rename to tests/Actions/Settings/IdentityEditTest.php diff --git a/tests/Actions/Settings/IdentitySave.php b/tests/Actions/Settings/IdentitySaveTest.php similarity index 100% rename from tests/Actions/Settings/IdentitySave.php rename to tests/Actions/Settings/IdentitySaveTest.php diff --git a/tests/Actions/Settings/Index.php b/tests/Actions/Settings/IndexTest.php similarity index 99% rename from tests/Actions/Settings/Index.php rename to tests/Actions/Settings/IndexTest.php index f93906afce6..a0525cb7324 100644 --- a/tests/Actions/Settings/Index.php +++ b/tests/Actions/Settings/IndexTest.php @@ -29,7 +29,7 @@ public function test_run() public function test_sections_list() { $result = rcmail_action_settings_index::sections_list([]); - $this->assertTrue(strpos($result, '') === 0); + $this->assertTrue(strpos($result, '
- - - - Logon + + . - - Contacts - - - Settings - - - Mail - - - ../../plugins/*/tests/Browser + + ../../plugins/*/tests/Browser diff --git a/tests/Framework/Addressbook.php b/tests/Framework/AddressbookTest.php similarity index 100% rename from tests/Framework/Addressbook.php rename to tests/Framework/AddressbookTest.php diff --git a/tests/Framework/Addresses.php b/tests/Framework/AddressesTest.php similarity index 100% rename from tests/Framework/Addresses.php rename to tests/Framework/AddressesTest.php diff --git a/tests/Framework/BaseReplacer.php b/tests/Framework/BaseReplacerTest.php similarity index 100% rename from tests/Framework/BaseReplacer.php rename to tests/Framework/BaseReplacerTest.php diff --git a/tests/Framework/Bootstrap.php b/tests/Framework/BootstrapTest.php similarity index 100% rename from tests/Framework/Bootstrap.php rename to tests/Framework/BootstrapTest.php diff --git a/tests/Framework/Browser.php b/tests/Framework/BrowserTest.php similarity index 100% rename from tests/Framework/Browser.php rename to tests/Framework/BrowserTest.php diff --git a/tests/Framework/CacheDB.php b/tests/Framework/CacheDBTest.php similarity index 100% rename from tests/Framework/CacheDB.php rename to tests/Framework/CacheDBTest.php diff --git a/tests/Framework/Cache.php b/tests/Framework/CacheTest.php similarity index 100% rename from tests/Framework/Cache.php rename to tests/Framework/CacheTest.php diff --git a/tests/Framework/Charset.php b/tests/Framework/CharsetTest.php similarity index 100% rename from tests/Framework/Charset.php rename to tests/Framework/CharsetTest.php diff --git a/tests/Framework/Config.php b/tests/Framework/ConfigTest.php similarity index 100% rename from tests/Framework/Config.php rename to tests/Framework/ConfigTest.php diff --git a/tests/Framework/Contacts.php b/tests/Framework/ContactsTest.php similarity index 100% rename from tests/Framework/Contacts.php rename to tests/Framework/ContactsTest.php diff --git a/tests/Framework/ContentFilter.php b/tests/Framework/ContentFilterTest.php similarity index 100% rename from tests/Framework/ContentFilter.php rename to tests/Framework/ContentFilterTest.php diff --git a/tests/Framework/Csv2vcard.php b/tests/Framework/Csv2vcardTest.php similarity index 100% rename from tests/Framework/Csv2vcard.php rename to tests/Framework/Csv2vcardTest.php diff --git a/tests/Framework/DBMysql.php b/tests/Framework/DBMysqlTest.php similarity index 100% rename from tests/Framework/DBMysql.php rename to tests/Framework/DBMysqlTest.php diff --git a/tests/Framework/DBPgsql.php b/tests/Framework/DBPgsqlTest.php similarity index 100% rename from tests/Framework/DBPgsql.php rename to tests/Framework/DBPgsqlTest.php diff --git a/tests/Framework/DBSqlite.php b/tests/Framework/DBSqliteTest.php similarity index 100% rename from tests/Framework/DBSqlite.php rename to tests/Framework/DBSqliteTest.php diff --git a/tests/Framework/DB.php b/tests/Framework/DBTest.php similarity index 100% rename from tests/Framework/DB.php rename to tests/Framework/DBTest.php diff --git a/tests/Framework/Enriched.php b/tests/Framework/EnrichedTest.php similarity index 100% rename from tests/Framework/Enriched.php rename to tests/Framework/EnrichedTest.php diff --git a/tests/Framework/Html2text.php b/tests/Framework/Html2textTest.php similarity index 100% rename from tests/Framework/Html2text.php rename to tests/Framework/Html2textTest.php diff --git a/tests/Framework/HtmlCheckbox.php b/tests/Framework/HtmlCheckboxTest.php similarity index 100% rename from tests/Framework/HtmlCheckbox.php rename to tests/Framework/HtmlCheckboxTest.php diff --git a/tests/Framework/Html.php b/tests/Framework/HtmlTest.php similarity index 100% rename from tests/Framework/Html.php rename to tests/Framework/HtmlTest.php diff --git a/tests/Framework/Image.php b/tests/Framework/ImageTest.php similarity index 100% rename from tests/Framework/Image.php rename to tests/Framework/ImageTest.php diff --git a/tests/Framework/ImapCache.php b/tests/Framework/ImapCacheTest.php similarity index 100% rename from tests/Framework/ImapCache.php rename to tests/Framework/ImapCacheTest.php diff --git a/tests/Framework/ImapGeneric.php b/tests/Framework/ImapGenericTest.php similarity index 100% rename from tests/Framework/ImapGeneric.php rename to tests/Framework/ImapGenericTest.php diff --git a/tests/Framework/ImapSearch.php b/tests/Framework/ImapSearchTest.php similarity index 100% rename from tests/Framework/ImapSearch.php rename to tests/Framework/ImapSearchTest.php diff --git a/tests/Framework/Imap.php b/tests/Framework/ImapTest.php similarity index 100% rename from tests/Framework/Imap.php rename to tests/Framework/ImapTest.php diff --git a/tests/Framework/LdapGeneric.php b/tests/Framework/LdapGenericTest.php similarity index 100% rename from tests/Framework/LdapGeneric.php rename to tests/Framework/LdapGenericTest.php diff --git a/tests/Framework/Ldap.php b/tests/Framework/LdapTest.php similarity index 100% rename from tests/Framework/Ldap.php rename to tests/Framework/LdapTest.php diff --git a/tests/Framework/MessageHeader.php b/tests/Framework/MessageHeaderTest.php similarity index 100% rename from tests/Framework/MessageHeader.php rename to tests/Framework/MessageHeaderTest.php diff --git a/tests/Framework/MessagePart.php b/tests/Framework/MessagePartTest.php similarity index 100% rename from tests/Framework/MessagePart.php rename to tests/Framework/MessagePartTest.php diff --git a/tests/Framework/Message.php b/tests/Framework/MessageTest.php similarity index 100% rename from tests/Framework/Message.php rename to tests/Framework/MessageTest.php diff --git a/tests/Framework/MimeDecode.php b/tests/Framework/MimeDecodeTest.php similarity index 100% rename from tests/Framework/MimeDecode.php rename to tests/Framework/MimeDecodeTest.php diff --git a/tests/Framework/Mime.php b/tests/Framework/MimeTest.php similarity index 100% rename from tests/Framework/Mime.php rename to tests/Framework/MimeTest.php diff --git a/tests/Framework/Output.php b/tests/Framework/OutputTest.php similarity index 100% rename from tests/Framework/Output.php rename to tests/Framework/OutputTest.php diff --git a/tests/Framework/PluginApi.php b/tests/Framework/PluginApiTest.php similarity index 100% rename from tests/Framework/PluginApi.php rename to tests/Framework/PluginApiTest.php diff --git a/tests/Framework/Rcube.php b/tests/Framework/RcubeTest.php similarity index 100% rename from tests/Framework/Rcube.php rename to tests/Framework/RcubeTest.php diff --git a/tests/Framework/ResultIndex.php b/tests/Framework/ResultIndexTest.php similarity index 100% rename from tests/Framework/ResultIndex.php rename to tests/Framework/ResultIndexTest.php diff --git a/tests/Framework/ResultMultifolder.php b/tests/Framework/ResultMultifolderTest.php similarity index 100% rename from tests/Framework/ResultMultifolder.php rename to tests/Framework/ResultMultifolderTest.php diff --git a/tests/Framework/ResultSet.php b/tests/Framework/ResultSetTest.php similarity index 100% rename from tests/Framework/ResultSet.php rename to tests/Framework/ResultSetTest.php diff --git a/tests/Framework/ResultThread.php b/tests/Framework/ResultThreadTest.php similarity index 100% rename from tests/Framework/ResultThread.php rename to tests/Framework/ResultThreadTest.php diff --git a/tests/Framework/Session.php b/tests/Framework/SessionTest.php similarity index 100% rename from tests/Framework/Session.php rename to tests/Framework/SessionTest.php diff --git a/tests/Framework/Smtp.php b/tests/Framework/SmtpTest.php similarity index 100% rename from tests/Framework/Smtp.php rename to tests/Framework/SmtpTest.php diff --git a/tests/Framework/SpellcheckerAtd.php b/tests/Framework/SpellcheckerAtdTest.php similarity index 100% rename from tests/Framework/SpellcheckerAtd.php rename to tests/Framework/SpellcheckerAtdTest.php diff --git a/tests/Framework/SpellcheckerEnchant.php b/tests/Framework/SpellcheckerEnchantTest.php similarity index 100% rename from tests/Framework/SpellcheckerEnchant.php rename to tests/Framework/SpellcheckerEnchantTest.php diff --git a/tests/Framework/SpellcheckerGoogie.php b/tests/Framework/SpellcheckerGoogieTest.php similarity index 100% rename from tests/Framework/SpellcheckerGoogie.php rename to tests/Framework/SpellcheckerGoogieTest.php diff --git a/tests/Framework/SpellcheckerPspell.php b/tests/Framework/SpellcheckerPspellTest.php similarity index 100% rename from tests/Framework/SpellcheckerPspell.php rename to tests/Framework/SpellcheckerPspellTest.php diff --git a/tests/Framework/Spellchecker.php b/tests/Framework/SpellcheckerTest.php similarity index 100% rename from tests/Framework/Spellchecker.php rename to tests/Framework/SpellcheckerTest.php diff --git a/tests/Framework/Spoofchecker.php b/tests/Framework/SpoofcheckerTest.php similarity index 100% rename from tests/Framework/Spoofchecker.php rename to tests/Framework/SpoofcheckerTest.php diff --git a/tests/Framework/StringReplacer.php b/tests/Framework/StringReplacerTest.php similarity index 100% rename from tests/Framework/StringReplacer.php rename to tests/Framework/StringReplacerTest.php diff --git a/tests/Framework/Text2Html.php b/tests/Framework/Text2HtmlTest.php similarity index 100% rename from tests/Framework/Text2Html.php rename to tests/Framework/Text2HtmlTest.php diff --git a/tests/Framework/TnefDecoder.php b/tests/Framework/TnefDecoderTest.php similarity index 100% rename from tests/Framework/TnefDecoder.php rename to tests/Framework/TnefDecoderTest.php diff --git a/tests/Framework/User.php b/tests/Framework/UserTest.php similarity index 100% rename from tests/Framework/User.php rename to tests/Framework/UserTest.php diff --git a/tests/Framework/Utils.php b/tests/Framework/UtilsTest.php similarity index 100% rename from tests/Framework/Utils.php rename to tests/Framework/UtilsTest.php diff --git a/tests/Framework/VCard.php b/tests/Framework/VCardTest.php similarity index 100% rename from tests/Framework/VCard.php rename to tests/Framework/VCardTest.php diff --git a/tests/Framework/Washtml.php b/tests/Framework/WashtmlTest.php similarity index 100% rename from tests/Framework/Washtml.php rename to tests/Framework/WashtmlTest.php diff --git a/tests/Rcmail/Action.php b/tests/Rcmail/ActionTest.php similarity index 100% rename from tests/Rcmail/Action.php rename to tests/Rcmail/ActionTest.php diff --git a/tests/Rcmail/AttachmentHandler.php b/tests/Rcmail/AttachmentHandlerTest.php similarity index 100% rename from tests/Rcmail/AttachmentHandler.php rename to tests/Rcmail/AttachmentHandlerTest.php diff --git a/tests/Rcmail/HtmlPage.php b/tests/Rcmail/HtmlPageTest.php similarity index 100% rename from tests/Rcmail/HtmlPage.php rename to tests/Rcmail/HtmlPageTest.php diff --git a/tests/Rcmail/Install.php b/tests/Rcmail/InstallTest.php similarity index 100% rename from tests/Rcmail/Install.php rename to tests/Rcmail/InstallTest.php diff --git a/tests/Rcmail/Oauth.php b/tests/Rcmail/OauthTest.php similarity index 100% rename from tests/Rcmail/Oauth.php rename to tests/Rcmail/OauthTest.php diff --git a/tests/Rcmail/OutputCli.php b/tests/Rcmail/OutputCliTest.php similarity index 100% rename from tests/Rcmail/OutputCli.php rename to tests/Rcmail/OutputCliTest.php diff --git a/tests/Rcmail/OutputHtml.php b/tests/Rcmail/OutputHtmlTest.php similarity index 100% rename from tests/Rcmail/OutputHtml.php rename to tests/Rcmail/OutputHtmlTest.php diff --git a/tests/Rcmail/OutputJson.php b/tests/Rcmail/OutputJsonTest.php similarity index 100% rename from tests/Rcmail/OutputJson.php rename to tests/Rcmail/OutputJsonTest.php diff --git a/tests/Rcmail/Rcmail.php b/tests/Rcmail/RcmailTest.php similarity index 98% rename from tests/Rcmail/Rcmail.php rename to tests/Rcmail/RcmailTest.php index 5e665f42949..7140ee6c9f3 100644 --- a/tests/Rcmail/Rcmail.php +++ b/tests/Rcmail/RcmailTest.php @@ -264,6 +264,10 @@ public function test_format_date() { $rcmail = rcmail::get_instance(); + // this test depends on system timezone if not set + date_default_timezone_set('UTC'); + $rcmail->config->set('prettydate', true); + $date = $rcmail->format_date(date('Y-m-d H:i:s')); $this->assertSame('Today ' . date('H:i'), $date); diff --git a/tests/Rcmail/ResendMail.php b/tests/Rcmail/ResendMailTest.php similarity index 100% rename from tests/Rcmail/ResendMail.php rename to tests/Rcmail/ResendMailTest.php diff --git a/tests/Rcmail/Sendmail.php b/tests/Rcmail/SendmailTest.php similarity index 100% rename from tests/Rcmail/Sendmail.php rename to tests/Rcmail/SendmailTest.php diff --git a/tests/Rcmail/StringReplacer.php b/tests/Rcmail/StringReplacerTest.php similarity index 100% rename from tests/Rcmail/StringReplacer.php rename to tests/Rcmail/StringReplacerTest.php diff --git a/tests/Rcmail/Utils.php b/tests/Rcmail/UtilsTest.php similarity index 100% rename from tests/Rcmail/Utils.php rename to tests/Rcmail/UtilsTest.php diff --git a/tests/phpunit.xml b/tests/phpunit.xml index 6fa68c5874b..f1d99faa176 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -1,68 +1,62 @@ - - ../program/lib - ../program/include - ../program/actions - ../plugins + ../program/lib + ../program/include + ../program/actions + ../plugins - - Framework + + . + Browser - - Rcmail - - - Actions/* - - - ./../plugins/acl/tests/Acl.php - ./../plugins/additional_message_headers/tests/AdditionalMessageHeaders.php - ./../plugins/archive/tests/Archive.php - ./../plugins/attachment_reminder/tests/AttachmentReminder.php - ./../plugins/autologon/tests/Autologon.php - ./../plugins/autologout/tests/Autologout.php - ./../plugins/database_attachments/tests/DatabaseAttachments.php - ./../plugins/debug_logger/tests/DebugLogger.php - ./../plugins/emoticons/tests/Emoticons.php - ./../plugins/enigma/tests - ./../plugins/example_addressbook/tests/ExampleAddressbook.php - ./../plugins/filesystem_attachments/tests/FilesystemAttachments.php - ./../plugins/help/tests/Help.php - ./../plugins/hide_blockquote/tests/HideBlockquote.php - ./../plugins/http_authentication/tests/HttpAuthentication.php - ./../plugins/identicon/tests/Identicon.php - ./../plugins/identicon/tests/IdenticonEngine.php - ./../plugins/identity_select/tests/IdentitySelect.php - ./../plugins/jqueryui/tests/Jqueryui.php - ./../plugins/krb_authentication/tests/KrbAuthentication.php - ./../plugins/managesieve/tests - ./../plugins/markasjunk/tests/Markasjunk.php - ./../plugins/new_user_dialog/tests/NewUserDialog.php - ./../plugins/new_user_identity/tests/NewUserIdentity.php - ./../plugins/newmail_notifier/tests/NewmailNotifier.php - ./../plugins/password/tests/Password.php - ./../plugins/redundant_attachments/tests/RedundantAttachments.php - ./../plugins/show_additional_headers/tests/ShowAdditionalHeaders.php - ./../plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php - ./../plugins/subscriptions_option/tests/SubscriptionsOption.php - ./../plugins/userinfo/tests/Userinfo.php - ./../plugins/vcard_attachments/tests/VcardAttachments.php - ./../plugins/virtuser_file/tests/VirtuserFile.php - ./../plugins/virtuser_query/tests/VirtuserQuery.php - ./../plugins/zipdownload/tests/Zipdownload.php + + ../plugins/acl/tests + ../plugins/additional_message_headers/tests + ../plugins/archive/tests + ../plugins/attachment_reminder/tests + ../plugins/autologon/tests + ../plugins/autologout/tests + ../plugins/database_attachments/tests + ../plugins/debug_logger/tests + ../plugins/emoticons/tests + ../plugins/enigma/tests + ../plugins/example_addressbook/tests + ../plugins/filesystem_attachments/tests + ../plugins/help/tests + ../plugins/hide_blockquote/tests + ../plugins/http_authentication/tests + ../plugins/identicon/tests + ../plugins/identity_select/tests + ../plugins/jqueryui/tests + ../plugins/krb_authentication/tests + ../plugins/managesieve/tests + ../plugins/markasjunk/tests + ../plugins/new_user_dialog/tests + ../plugins/new_user_identity/tests + ../plugins/newmail_notifier/tests + ../plugins/password/tests + ../plugins/reconnect/tests + ../plugins/redundant_attachments/tests + ../plugins/show_additional_headers/tests + ../plugins/squirrelmail_usercopy/tests + ../plugins/subscriptions_option/tests + ../plugins/userinfo/tests + ../plugins/vcard_attachments/tests + ../plugins/virtuser_file/tests + ../plugins/virtuser_query/tests + ../plugins/zipdownload/tests + ../plugins/*/tests/Browser