From 782420af7fb3f24295a61101d7e9296110c894e4 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Sun, 29 Oct 2017 17:13:28 +0100 Subject: [PATCH] Replace deprecated VersionConstraint with Composer\Semver package (#14) --- composer.json | 3 ++- src/Roundcube/Composer/PluginInstaller.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 45e6cab..8da64e8 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,8 @@ "src/bin/rcubeinitdb.sh" ], "require": { - "php": ">=5.3.0" + "php": ">=5.3.0", + "composer/semver": "^1.4.2" }, "require-dev": { "composer/composer": "*" diff --git a/src/Roundcube/Composer/PluginInstaller.php b/src/Roundcube/Composer/PluginInstaller.php index c02b399..4cfe5aa 100644 --- a/src/Roundcube/Composer/PluginInstaller.php +++ b/src/Roundcube/Composer/PluginInstaller.php @@ -4,7 +4,7 @@ use Composer\Installer\LibraryInstaller; use Composer\Package\Version\VersionParser; -use Composer\Package\LinkConstraint\VersionConstraint; +use Composer\Semver\Constraint\Constraint; use Composer\Package\PackageInterface; use Composer\Repository\InstalledRepositoryInterface; use Composer\Util\ProcessExecutor; @@ -177,7 +177,7 @@ private function rcubeVersionCheck($package) foreach (array('min-version' => '>=', 'max-version' => '<=') as $key => $operator) { if (!empty($extra['roundcube'][$key])) { $version = $parser->normalize(str_replace('-git', '.999', $extra['roundcube'][$key])); - $constraint = new VersionConstraint($operator, $version); + $constraint = new Constraint($operator, $version); if (!$constraint->versionCompare($rcubeVersion, $version, $operator)) { throw new \Exception("Version check failed! " . $package->getName() . " requires Roundcube version $operator $version, $rcubeVersion was detected."); }