Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2020-03-07 05:39:42 +0300
committerGitHub <noreply@github.com>2020-03-07 05:39:42 +0300
commitd6df56cb86f74b4fd3406b2802945470449b4b0a (patch)
tree5ce6e017d05a079923b2ec358397c0ca5a20006d
parent8f7befe2711df64f144d418d68af2d3669df62b9 (diff)
activate warning for php versions incompatible with next major release (#15670)
-rw-r--r--core/Plugin/ControllerAdmin.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
index be2f5a977e..87c0873dd0 100644
--- a/core/Plugin/ControllerAdmin.php
+++ b/core/Plugin/ControllerAdmin.php
@@ -207,12 +207,12 @@ abstract class ControllerAdmin extends Controller
}
/**
- * PHP Version required by the next major Piwik version
+ * PHP Version required by the next major Matomo version
* @return string
*/
private static function getNextRequiredMinimumPHP()
{
- return '7.1';
+ return '7.2';
}
private static function isUsingPhpVersionCompatibleWithNextPiwik()
@@ -222,8 +222,6 @@ abstract class ControllerAdmin extends Controller
private static function notifyWhenPhpVersionIsNotCompatibleWithNextMajorPiwik()
{
- return; // no major version coming
-
if (self::isUsingPhpVersionCompatibleWithNextPiwik()) {
return;
}