Fix incorrect upgrade message when Matomo is too new for plugin fixes #23945

Author: predictor2718

core/Plugin/Dependency.php

@@ -49,11 +49,16 @@ public function getMissingDependencies($requires)
             $missingVersions = $this->getMissingVersions($currentVersion, $requiredVersion);
 
             if (!empty($missingVersions)) {
+                $allUpperBounds = count(array_filter($missingVersions, function ($v) {
+                    return (bool) preg_match('/^</', $v);
+                })) === count($missingVersions);
+
                 $missingRequirements[] = array(
                     'requirement'     => $name,
                     'actualVersion'   => $currentVersion,
                     'requiredVersion' => $requiredVersion,
                     'causedBy'        => implode(', ', $missingVersions),
+                    'tooNew'          => $allUpperBounds,
                 );
             }
         }

plugins/CorePluginsAdmin/PluginInstaller.php

@@ -200,8 +200,9 @@ private function makeSureThereAreNoMissingRequirements($metadata)
                     $params   = array(ucfirst($dep['requirement']), $dep['requiredVersion'], $metadata->name);
                     $message .= Piwik::translate('CorePluginsAdmin_MissingRequirementsPleaseInstallNotice', $params);
                 } else {
-                    $params   = array(ucfirst($dep['requirement']), $dep['actualVersion'], $dep['requiredVersion']);
-                    $message .= Piwik::translate('CorePluginsAdmin_MissingRequirementsNotice', $params);
+                    $params = array(ucfirst($dep['requirement']), $dep['actualVersion'], $dep['requiredVersion']);
+                    $key    = !empty($dep['tooNew']) ? 'CorePluginsAdmin_MissingRequirementsNoticeTooNew' : 'CorePluginsAdmin_MissingRequirementsNotice';
+                    $message .= Piwik::translate($key, $params);
                 }
             }
 

plugins/CorePluginsAdmin/lang/en.json

@@ -31,6 +31,7 @@
         "OncePluginIsInstalledYouMayActivateHere": "Once a plugin is installed, you may activate it or deactivate it here.",
         "MenuPlatform": "Platform",
         "MissingRequirementsNotice": "Please update %1$s %2$s to a newer version, %1$s %3$s is required.",
+        "MissingRequirementsNoticeTooNew": "This plugin is not yet compatible with your Matomo version (%1$s %2$s). Supported versions: %3$s. Please downgrade Matomo or wait for a plugin update.",
         "MissingRequirementsPleaseInstallNotice": "Please install %1$s %2$s as it is required by %3$s.",
         "NoZipFileSelected": "Please select a ZIP file.",
         "FileExceedsUploadLimit": "The selected file exceeds the upload limit of your server.",

plugins/Marketplace/Marketplace.php

@@ -71,6 +71,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'CorePluginsAdmin_Deactivate';
         $translationKeys[] = 'CorePluginsAdmin_Marketplace';
         $translationKeys[] = 'CorePluginsAdmin_MissingRequirementsNotice';
+        $translationKeys[] = 'CorePluginsAdmin_MissingRequirementsNoticeTooNew';
         $translationKeys[] = 'CorePluginsAdmin_PluginsExtendPiwik';
         $translationKeys[] = 'CorePluginsAdmin_Status';
         $translationKeys[] = 'CorePluginsAdmin_Theme';

plugins/Marketplace/vue/src/MissingReqsNotice/MissingReqsNotice.vue

@@ -12,7 +12,9 @@
     class="alert alert-danger"
   >
     {{ translate(
-      'CorePluginsAdmin_MissingRequirementsNotice',
+      req.tooNew
+        ? 'CorePluginsAdmin_MissingRequirementsNoticeTooNew'
+        : 'CorePluginsAdmin_MissingRequirementsNotice',
       requirement(req.requirement),
       req.actualVersion,
       req.requiredVersion,