wip php minimum & stability

joomla · Jun 11, 2022 · 5585d32 · 5585d32
1 parent f6ac9c5
commit 5585d32
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/libraries/src/Updater/ConstrainChecker.php b/libraries/src/Updater/ConstrainChecker.php
@@ -59,7 +59,7 @@ public function check($constraints)
 		}
 
 		// Check stability
-		if (isset($constraints['stability']) && !$this->checkStability($constraints['stability']))
+		if (isset($constraints['stability']) && !$this->checkStability($constraints['stability']['tags']))
 		{
 			return false;
 		}
@@ -103,10 +103,7 @@ protected function checkTargetplatform($targetPlatform)
 	protected function checkPhpMinimum($phpMinimum)
 	{
 		// Check if PHP version supported via <php_minimum> tag, assume true if tag isn't present
-		if (version_compare(PHP_VERSION, $phpMinimum, '>='))
-		{
-			return true;
-		}
+		return version_compare(PHP_VERSION, $phpMinimum, '>=');
 	}
 
 	/**
@@ -150,24 +147,27 @@ protected function checkSupportedDatabases($supportedDatabases)
 	/**
 	 * Check the stability
 	 *
-	 * @param   string  $stability  Stability tag to check
+	 * @param   array  $stabilityTags  Stability tags to check
 	 *
 	 * @return  bool
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
-	protected function checkStability($stability)
+	protected function checkStability($stabilityTags)
 	{
 		$minimumStability = ComponentHelper::getParams('com_installer')->get('minimum_stability', Updater::STABILITY_STABLE);
 
-		$stability = $this->stabilityTagToInteger($stability);
-
-		if (($stability < $minimumStability))
+		foreach ($stabilityTags as $tag)
 		{
-			return false;
-		}
+			$stability = $this->stabilityTagToInteger($stability);
 
-		return true;
+			if (($stability < $minimumStability))
+			{
+				return false;
+			}
+
+			return true;
+		}
 	}
 
 	/**