From a2946bd67d7432e73cee54809f79010c9c20d534 Mon Sep 17 00:00:00 2001 From: "Fedor A. Fetisov" <faf@ossg.ru> Date: Tue, 22 Jan 2019 10:50:53 +0300 Subject: [PATCH] Loose down semantic versioning expressions See https://github.com/Mibew/geo-ip-plugin/issues/6 for details --- src/mibew/libs/classes/Mibew/Plugin/DependencyGraph.php | 2 +- src/mibew/libs/classes/Mibew/Plugin/PluginInfo.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mibew/libs/classes/Mibew/Plugin/DependencyGraph.php b/src/mibew/libs/classes/Mibew/Plugin/DependencyGraph.php index f9924469..7c4ff07c 100644 --- a/src/mibew/libs/classes/Mibew/Plugin/DependencyGraph.php +++ b/src/mibew/libs/classes/Mibew/Plugin/DependencyGraph.php @@ -281,7 +281,7 @@ class DependencyGraph // Check that version of the dependency satisfied requirements $version_constrain = new VersionExpression($required_version); $dependency = $this->getPlugin($dependency_name); - if (!$version_constrain->satisfiedBy(new Version($dependency->getInstalledVersion()))) { + if (!$version_constrain->satisfiedBy(new Version($dependency->getInstalledVersion(), true))) { trigger_error( sprintf( 'Plugin "%s" has version incompatible with "%s" requirements!', diff --git a/src/mibew/libs/classes/Mibew/Plugin/PluginInfo.php b/src/mibew/libs/classes/Mibew/Plugin/PluginInfo.php index 56d61590..7cc42bf7 100644 --- a/src/mibew/libs/classes/Mibew/Plugin/PluginInfo.php +++ b/src/mibew/libs/classes/Mibew/Plugin/PluginInfo.php @@ -268,7 +268,7 @@ class PluginInfo // Check exact version of the library $version_constrain = new VersionExpression($required_version); - if (!$version_constrain->satisfiedBy(new Version($system_info[$lib]))) { + if (!$version_constrain->satisfiedBy(new Version($system_info[$lib], true))) { return true; } }