update to 1.5-beta

drop dependency on pear/net_idna2
raise dependency on pear/net_smtp 1.9
raise dependency on masterminds/html5 2.7
add dependency on guzzlehttp/guzzle
switc from mkopinsky/zxcvbn-php to bjeavons/zxcvbn-php

34 files changed, 93 insertions, 70 deletions

diff --git a/plugins/acl/composer.json b/plugins/acl/composer.json
index 7b80e4e..1583435 100644
--- a/plugins/acl/composer.json
+++ b/plugins/acl/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/acl",
     "type": "roundcube-plugin",
     "description": "IMAP Folders Access Control Lists Management (RFC4314, RFC2086).",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.8",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/additional_message_headers/composer.json b/plugins/additional_message_headers/composer.json
index 6a58736..4f0f15c 100644
--- a/plugins/additional_message_headers/composer.json
+++ b/plugins/additional_message_headers/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/additional_message_headers",
     "type": "roundcube-plugin",
     "description": "Very simple plugin which will add additional headers to or remove them from outgoing messages.",
-    "license": "GPLv2",
+    "license": "GPL-3.0-or-later",
     "version": "1.2.1",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/archive/composer.json b/plugins/archive/composer.json
index ca53d9e..4cb752a 100644
--- a/plugins/archive/composer.json
+++ b/plugins/archive/composer.json
@@ -2,8 +2,8 @@
     "name": "roundcube/archive",
     "type": "roundcube-plugin",
     "description": "This adds a button to move the selected messages to an archive folder. The folder (and the optional structure of subfolders) can be selected in the settings panel.",
-    "license": "GPLv3+",
-    "version": "3.4",
+    "license": "GPL-3.0-or-later",
+    "version": "3.5",
     "authors": [
         {
             "name": "Thomas Bruederli",
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/attachment_reminder/composer.json b/plugins/attachment_reminder/composer.json
index 11e9ffb..f512411 100644
--- a/plugins/attachment_reminder/composer.json
+++ b/plugins/attachment_reminder/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/attachment_reminder",
     "type": "roundcube-plugin",
     "description": "This Roundcube plugin reminds the user to attach a file if the composed message text indicates that there should be any.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.1",
     "authors": [
         {
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/autologon/composer.json b/plugins/autologon/composer.json
index 371559a..2b058ce 100644
--- a/plugins/autologon/composer.json
+++ b/plugins/autologon/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/autologon",
     "type": "roundcube-plugin",
     "description": "Sample plugin to try out some hooks",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.0",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/database_attachments/composer.json b/plugins/database_attachments/composer.json
index 09914dc..841e844 100644
--- a/plugins/database_attachments/composer.json
+++ b/plugins/database_attachments/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/database_attachments",
     "type": "roundcube-plugin",
     "description": "This plugin which provides database backed storage for temporary attachment file handling. The primary advantage of this plugin is its compatibility with round-robin dns multi-server Roundcube installations.",
-    "license": "GPLv2",
+    "license": "GPL-3.0-or-later",
     "version": "1.2",
     "authors": [
         {
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3",
         "roundcube/filesystem_attachments": ">=1.0.0"
     }
diff --git a/plugins/debug_logger/composer.json b/plugins/debug_logger/composer.json
index b47f462..518a08b 100644
--- a/plugins/debug_logger/composer.json
+++ b/plugins/debug_logger/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/debug_logger",
     "type": "roundcube-plugin",
     "description": "Enhanced logging for debugging purposes. It is not recommened to be enabled on production systems without testing because of the somewhat increased memory, cpu and disk i/o overhead.",
-    "license": "GPLv2",
+    "license": "GPL-3.0-or-later",
     "version": "1.0",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/emoticons/composer.json b/plugins/emoticons/composer.json
index 30dd392..2f95f60 100644
--- a/plugins/emoticons/composer.json
+++ b/plugins/emoticons/composer.json
@@ -2,8 +2,8 @@
     "name": "roundcube/emoticons",
     "type": "roundcube-plugin",
     "description": "Plugin that adds emoticons support.",
-    "license": "GPLv3+",
-    "version": "2.0",
+    "license": "GPL-3.0-or-later",
+    "version": "3.0",
     "authors": [
         {
             "name": "Thomas Bruederli",
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/enigma/composer.json b/plugins/enigma/composer.json
index 369857d..4a6090e 100644
--- a/plugins/enigma/composer.json
+++ b/plugins/enigma/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/enigma",
     "type": "roundcube-plugin",
     "description": "Server-side PGP Encryption for Roundcube",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "0.8",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": "~0.1.6",
         "pear/crypt_gpg": "~1.6.3"
     }
diff --git a/plugins/example_addressbook/composer.json b/plugins/example_addressbook/composer.json
index d37f0a8..289e25c 100644
--- a/plugins/example_addressbook/composer.json
+++ b/plugins/example_addressbook/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/example_addressbook",
     "type": "roundcube-plugin",
     "description": "Sample plugin to add a new address book with just a static list of contacts",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.0",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/filesystem_attachments/composer.json b/plugins/filesystem_attachments/composer.json
index f0c812e..6dbf360 100644
--- a/plugins/filesystem_attachments/composer.json
+++ b/plugins/filesystem_attachments/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/filesystem_attachments",
     "type": "roundcube-plugin",
     "description": "This is a core plugin which provides basic, filesystem based attachment temporary file handling. This includes storing attachments of messages currently being composed, writing attachments to disk when drafts with attachments are re-opened and writing attachments to disk for inline display in current html compositions.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.0",
     "authors": [
         {
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/help/composer.json b/plugins/help/composer.json
index 8dee2d9..3038d42 100644
--- a/plugins/help/composer.json
+++ b/plugins/help/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/help",
     "type": "roundcube-plugin",
     "description": "Plugin adds a new item (Help) in taskbar.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.4",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/hide_blockquote/composer.json b/plugins/hide_blockquote/composer.json
index 80fe79b..91fb413 100644
--- a/plugins/hide_blockquote/composer.json
+++ b/plugins/hide_blockquote/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/hide_blockquote",
     "type": "roundcube-plugin",
     "description": "This allows to hide long blocks of cited text in messages.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.0",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/http_authentication/composer.json b/plugins/http_authentication/composer.json
index 48a0ceb..2ff5e3b 100644
--- a/plugins/http_authentication/composer.json
+++ b/plugins/http_authentication/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/http_authentication",
     "type": "roundcube-plugin",
     "description": "HTTP Basic Authentication",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.5",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/identicon/composer.json b/plugins/identicon/composer.json
index 4f3661b..3f3909b 100644
--- a/plugins/identicon/composer.json
+++ b/plugins/identicon/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/identicon",
     "type": "roundcube-plugin",
     "description": "Displays Github-like identicons for contacts/addresses without photo specified.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "0.1",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "php-gd": "*",
         "roundcube/plugin-installer": ">=0.1.3"
     }
diff --git a/plugins/identity_select/composer.json b/plugins/identity_select/composer.json
index 6b38ede..53e8b01 100644
--- a/plugins/identity_select/composer.json
+++ b/plugins/identity_select/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/identity_select",
     "type": "roundcube-plugin",
     "description": "On reply to a message user identity selection is based on\n\t\tcontent of standard headers like From, To, Cc and Return-Path.\n\t\tHere you can add header(s) set by your SMTP server (e.g.\n\t\tDelivered-To, Envelope-To, X-Envelope-To, X-RCPT-TO) to make\n\t\tidentity selection more accurate.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.1",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/jqueryui/composer.json b/plugins/jqueryui/composer.json
index 088c498..c5cfbd9 100644
--- a/plugins/jqueryui/composer.json
+++ b/plugins/jqueryui/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/jqueryui",
     "type": "roundcube-plugin",
     "description": "Plugin adds the complete jQuery-UI library including the smoothness theme to Roundcube. This allows other plugins to use jQuery-UI without having to load their own version. The benefit of using one central jQuery-UI is that we wont run into problems of conflicting jQuery libraries being loaded. All plugins that want to use jQuery-UI should use this plugin as a requirement.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.12.0",
     "authors": [
         {
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/krb_authentication/composer.json b/plugins/krb_authentication/composer.json
index a67f544..973a9e8 100644
--- a/plugins/krb_authentication/composer.json
+++ b/plugins/krb_authentication/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/krb_authentication",
     "type": "roundcube-plugin",
     "description": "Kerberos Authentication",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.2",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/managesieve/composer.json b/plugins/managesieve/composer.json
index f2bad8e..74c0db2 100644
--- a/plugins/managesieve/composer.json
+++ b/plugins/managesieve/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/managesieve",
     "type": "roundcube-plugin",
     "description": "Adds a possibility to manage Sieve scripts (incoming mail filters). It's clickable interface which operates on text scripts and communicates with server using managesieve protocol. Adds Filters tab in Settings.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "9.3",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3",
         "pear/net_sieve": "~1.4.4"
     }
diff --git a/plugins/markasjunk/composer.json b/plugins/markasjunk/composer.json
index e52ee67..2b2a5bb 100644
--- a/plugins/markasjunk/composer.json
+++ b/plugins/markasjunk/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/markasjunk",
     "type": "roundcube-plugin",
     "description": "Adds buttons to mark messages as Junk/Non-Junk with moving to the Junk folder and Spam/Ham learning.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "2.0",
     "authors": [
         {
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/new_user_dialog/composer.json b/plugins/new_user_dialog/composer.json
index b29924a..8195d0c 100644
--- a/plugins/new_user_dialog/composer.json
+++ b/plugins/new_user_dialog/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/new_user_dialog",
     "type": "roundcube-plugin",
     "description": "When a new user is created, this plugin checks the default identity and sets a session flag in case it is incomplete. An overlay box will appear on the screen until the user has reviewed/completed his identity.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "2.4",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/new_user_identity/composer.json b/plugins/new_user_identity/composer.json
index 249db6a..15aed34 100644
--- a/plugins/new_user_identity/composer.json
+++ b/plugins/new_user_identity/composer.json
@@ -2,8 +2,8 @@
     "name": "roundcube/new_user_identity",
     "type": "roundcube-plugin",
     "description": "Populates a new user's default identity from LDAP on their first visit.",
-    "license": "GPLv3+",
-    "version": "1.1",
+    "license": "GPL-3.0-or-later",
+    "version": "1.2",
     "authors": [
         {
             "name": "Aleksander Machniak",
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/newmail_notifier/composer.json b/plugins/newmail_notifier/composer.json
index 210cef0..a5ffa7e 100644
--- a/plugins/newmail_notifier/composer.json
+++ b/plugins/newmail_notifier/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/newmail_notifier",
     "type": "roundcube-plugin",
     "description": "Supports three methods of notification: 1. Basic - focus browser window and change favicon 2. Sound - play wav file 3. Desktop - display desktop notification (using HTML5 Notification API feature).",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "0.8",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/password/composer.json b/plugins/password/composer.json
index 1e7fb6f..87ff8af 100644
--- a/plugins/password/composer.json
+++ b/plugins/password/composer.json
@@ -2,8 +2,8 @@
     "name": "roundcube/password",
     "type": "roundcube-plugin",
     "description": "Password Change for Roundcube. Plugin adds a possibility to change user password using many methods (drivers) via Settings/Password tab.",
-    "license": "GPLv3+",
-    "version": "5.1",
+    "license": "GPL-3.0-or-later",
+    "version": "5.3",
     "authors": [
         {
             "name": "Aleksander Machniak",
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/reconnect/composer.json b/plugins/reconnect/composer.json
new file mode 100644
index 0000000..2b7649b
--- /dev/null
+++ b/plugins/reconnect/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "reconnect",
+    "type": "roundcube-plugin",
+    "description": "Reconnects to server for several attempts.",
+    "license": "GPL-3.0-or-later",
+    "version": "0.1",
+    "authors": [
+        {
+            "name": "Sandro Knauß",
+            "email": "hefee@debian.org"
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://plugins.roundcube.net"
+        }
+    ],
+    "require": {
+        "php": ">=5.4.0",
+        "roundcube/plugin-installer": ">=0.1.3"
+    }
+}
diff --git a/plugins/redundant_attachments/composer.json b/plugins/redundant_attachments/composer.json
index 557cf34..710076e 100644
--- a/plugins/redundant_attachments/composer.json
+++ b/plugins/redundant_attachments/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/redundant_attachments",
     "type": "roundcube-plugin",
     "description": "This plugin provides a redundant storage for temporary uploaded attachment files. They are stored in both the database backend as well as on the local file system. It provides also memcache store as a fallback.",
-    "license": "GPLv2",
+    "license": "GPL-3.0-or-later",
     "version": "1.2",
     "authors": [
         {
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3",
         "roundcube/filesystem_attachments": ">=1.0.0"
     }
diff --git a/plugins/show_additional_headers/composer.json b/plugins/show_additional_headers/composer.json
index 8b05ce3..45daeb9 100644
--- a/plugins/show_additional_headers/composer.json
+++ b/plugins/show_additional_headers/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/show_additional_headers",
     "type": "roundcube-plugin",
     "description": "Proof-of-concept plugin which will fetch additional headers and display them in the message view.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "2.0",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/squirrelmail_usercopy/composer.json b/plugins/squirrelmail_usercopy/composer.json
index f91f43d..a9342f1 100644
--- a/plugins/squirrelmail_usercopy/composer.json
+++ b/plugins/squirrelmail_usercopy/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/squirrelmail_usercopy",
     "type": "roundcube-plugin",
     "description": "Copy a new users identity and settings from a nearby Squirrelmail installation",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.6",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/subscriptions_option/composer.json b/plugins/subscriptions_option/composer.json
index 5823f04..47d024e 100644
--- a/plugins/subscriptions_option/composer.json
+++ b/plugins/subscriptions_option/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/subscriptions_option",
     "type": "roundcube-plugin",
     "description": "A plugin which can enable or disable the use of imap subscriptions. It includes a toggle on the settings page under \"Server Settings\". The preference can also be locked.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.4",
     "authors": [
         {
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/userinfo/composer.json b/plugins/userinfo/composer.json
index 3c4573b..8672cea 100644
--- a/plugins/userinfo/composer.json
+++ b/plugins/userinfo/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/userinfo",
     "type": "roundcube-plugin",
     "description": "Sample plugin that adds a new tab to the settings section to display some information about the current user.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.2",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/vcard_attachments/composer.json b/plugins/vcard_attachments/composer.json
index b43d2ca..8cc8aa9 100644
--- a/plugins/vcard_attachments/composer.json
+++ b/plugins/vcard_attachments/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/vcard_attachments",
     "type": "roundcube-plugin",
     "description": "Detects vCard attachments and allows to add them to address book. Also allows to attach vCards of your contacts to composed messages",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "4.1",
     "authors": [
         {
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/virtuser_file/composer.json b/plugins/virtuser_file/composer.json
index 178a256..8b1b240 100644
--- a/plugins/virtuser_file/composer.json
+++ b/plugins/virtuser_file/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/virtuser_file",
     "type": "roundcube-plugin",
     "description": "Plugin adds possibility to resolve user email/login according to lookup tables in files.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "1.0",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/virtuser_query/composer.json b/plugins/virtuser_query/composer.json
index e42ad89..4a2f1d3 100644
--- a/plugins/virtuser_query/composer.json
+++ b/plugins/virtuser_query/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/virtuser_query",
     "type": "roundcube-plugin",
     "description": "Plugin adds possibility to resolve user email/login according to lookup tables in SQL database.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "2.0",
     "authors": [
         {
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3"
     }
 }
diff --git a/plugins/zipdownload/composer.json b/plugins/zipdownload/composer.json
index ac7a661..bd56cfb 100644
--- a/plugins/zipdownload/composer.json
+++ b/plugins/zipdownload/composer.json
@@ -2,7 +2,7 @@
     "name": "roundcube/zipdownload",
     "type": "roundcube-plugin",
     "description": "Adds an option to download all attachments to a message in one zip file, when a message has multiple attachments. Also allows the download of a selection of messages in one zip file. Supports mbox and maildir format.",
-    "license": "GPLv3+",
+    "license": "GPL-3.0-or-later",
     "version": "3.4",
     "authors": [
         {
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=5.4.0",
         "roundcube/plugin-installer": ">=0.1.3",
         "ext-zip": "*"
     }