diff --git a/composer.json b/composer.json index 35dce0c530837ffc339cef00454002a815e7971d..61770642bec1bab2dac973a747b9752a21971b38 100644 --- a/composer.json +++ b/composer.json @@ -20,11 +20,11 @@ }, "config":{ "platform": { - "php": "5.5.0" + "php": "5.5.9" } }, "require": { - "php": ">=5.5.0", + "php": ">=5.5.9", "twig/twig": "~1.0", "leafo/lessphp": "~0.5.0", "symfony/console": "~2.6.0", diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php index a63453ea85db1388edbc3008e6e3f4e9d19835a0..adc4b487db99c694e919d2453d59e3d8da3507f0 100644 --- a/core/testMinimumPhpVersion.php +++ b/core/testMinimumPhpVersion.php @@ -19,7 +19,7 @@ $piwik_errorMessage = ''; // NOTE: when changing this variable, we also need to update // 1) api.piwik.org // 2) tests/travis/generator/Generator.php -$piwik_minimumPHPVersion = '5.5.0'; +$piwik_minimumPHPVersion = '5.5.9'; $piwik_currentPHPVersion = PHP_VERSION; $minimumPhpInvalid = version_compare($piwik_minimumPHPVersion, $piwik_currentPHPVersion) > 0; if ($minimumPhpInvalid) { diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement index aec4bb7995238d8dbf7f8399e46a4b1f547b327f..c7fd2972773b2b20c4162e9c27eb4cea74cf3c3a 160000 --- a/plugins/AnonymousPiwikUsageMeasurement +++ b/plugins/AnonymousPiwikUsageMeasurement @@ -1 +1 @@ -Subproject commit aec4bb7995238d8dbf7f8399e46a4b1f547b327f +Subproject commit c7fd2972773b2b20c4162e9c27eb4cea74cf3c3a diff --git a/plugins/CorePluginsAdmin/lang/en.json b/plugins/CorePluginsAdmin/lang/en.json index 89157cdaae4c0b4bb29f9ae0d24af3446e4c1af7..124b5d7293e98425cb63c4eb5d99501237917a69 100644 --- a/plugins/CorePluginsAdmin/lang/en.json +++ b/plugins/CorePluginsAdmin/lang/en.json @@ -23,7 +23,6 @@ "Developer": "Developer", "DevelopersLearnHowToDevelopPlugins": "Developers: Learn how you can extend and customize Piwik by %1$sdeveloping plugins or themes%2$s.", "DoMoreContactPiwikAdmins": "To install a new plugin or a new theme, please get in touch with your Piwik admins.", - "EmailToEnquireUpdatedVersion": "Please email %1$s and enquire an updated version of %2$s.", "FeaturedPlugin": "Featured plugin", "ChangeLookByManageThemes": "You can change the appearance of Piwik by %1$sManaging Themes%2$s.", "GetEarlyAccessForPaidPlugins": "Note: all plugins are available for free at present; in the future we will enable Paid Plugins in the Marketplace (%1$scontact us%2$s for early access).", diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig index 5a855c20d60075491efe1d1caa56d941b5d05a38..bd2120d5e4a145fad74cb8604e285a3d2a8f60b8 100644 --- a/plugins/CorePluginsAdmin/templates/macros.twig +++ b/plugins/CorePluginsAdmin/templates/macros.twig @@ -105,13 +105,6 @@ {% endfor %} {{ 'CorePluginsAdmin_PluginRequirement'|translate(pluginName, causedBy) }} - - {% if metadata is defined - and metadata.support is defined - and metadata.support.email - and pluginName not in marketplacePluginNames %} - {{ 'CorePluginsAdmin_EmailToEnquireUpdatedVersion'|translate('<a href="mailto:' ~ metadata.support.email|e('html_attr') ~'">' ~ metadata.support.email ~ '</a>', pluginName)|raw }} - {% endif %} {% endmacro %} {% macro tablePlugins(pluginsInfo, pluginNamesHavingSettings, activateNonce, deactivateNonce, uninstallNonce, isTheme, marketplacePluginNames, displayAdminLinks) %} diff --git a/plugins/LoginHttpAuth b/plugins/LoginHttpAuth index f65b922a4219237dd5824cf607df43d825175e5e..a285693bd66bc3758483d4da839d2466a1700e87 160000 --- a/plugins/LoginHttpAuth +++ b/plugins/LoginHttpAuth @@ -1 +1 @@ -Subproject commit f65b922a4219237dd5824cf607df43d825175e5e +Subproject commit a285693bd66bc3758483d4da839d2466a1700e87 diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo index 45b014472fe4d6c0fbc1c1d4557b3991164c2f50..48a4541999e6fded6820d8363b6671a0d0dbb0ec 160000 --- a/plugins/SecurityInfo +++ b/plugins/SecurityInfo @@ -1 +1 @@ -Subproject commit 45b014472fe4d6c0fbc1c1d4557b3991164c2f50 +Subproject commit 48a4541999e6fded6820d8363b6671a0d0dbb0ec diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization index 88e3a37febbd01c4f4c76f3554d3bbf772dd0eda..a570cc0efd4068e355674904fcfce2c8b3e42aeb 160000 --- a/plugins/TreemapVisualization +++ b/plugins/TreemapVisualization @@ -1 +1 @@ -Subproject commit 88e3a37febbd01c4f4c76f3554d3bbf772dd0eda +Subproject commit a570cc0efd4068e355674904fcfce2c8b3e42aeb diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator index b42147eafeba690614ef538ebd944b15a0cf1b41..068f1b0cddf5056d0c079e1cfcb2c771a9307c73 160000 --- a/plugins/VisitorGenerator +++ b/plugins/VisitorGenerator @@ -1 +1 @@ -Subproject commit b42147eafeba690614ef538ebd944b15a0cf1b41 +Subproject commit 068f1b0cddf5056d0c079e1cfcb2c771a9307c73 diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php index 41e46b0cc68ab9952b867e3dc5eb5061b648cf0d..8357826275b0b6c60dbe352ecc73aab8ae090d2e 100644 --- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php @@ -28,7 +28,7 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase { private $globalConfig; - const MINIMUM_PHP_VERSION = '5.5.0'; + const MINIMUM_PHP_VERSION = '5.5.9'; public function setUp() {