From: Kunal Mehta Date: Fri, 25 Sep 2015 01:15:49 +0000 (-0700) Subject: Upgrade composer/semver to 1.0.0 X-Git-Tag: 1.31.0-rc.0~9600 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22lang_raccourcis%22%2C%22module=%24nom_module%22%29%20.%20%22?a=commitdiff_plain;h=11b77f3d52564fce296d0ab8a2866e8a6736098b;p=lhc%2Fweb%2Fwiklou.git Upgrade composer/semver to 1.0.0 And update the class names that changed. Bug: T113431 Change-Id: Icf73630e60fe7d586d7ed249abc1d3014b67cbe6 --- diff --git a/composer.json b/composer.json index 2fadfea284..6f859bd4ed 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "wiki": "https://www.mediawiki.org/" }, "require": { - "composer/semver": "0.1.0", + "composer/semver": "1.0.0", "cssjanus/cssjanus": "1.1.1", "ext-iconv": "*", "liuggio/statsd-php-client": "1.0.16", diff --git a/includes/registration/CoreVersionChecker.php b/includes/registration/CoreVersionChecker.php index a7a926c8fa..f64d826da0 100644 --- a/includes/registration/CoreVersionChecker.php +++ b/includes/registration/CoreVersionChecker.php @@ -18,7 +18,7 @@ */ use Composer\Semver\VersionParser; -use Composer\Semver\Constraint\VersionConstraint; +use Composer\Semver\Constraint\Constraint; /** * @since 1.26 @@ -26,7 +26,7 @@ use Composer\Semver\Constraint\VersionConstraint; class CoreVersionChecker { /** - * @var VersionConstraint|bool representing $wgVersion + * @var Constraint|bool representing $wgVersion */ private $coreVersion = false; @@ -41,7 +41,7 @@ class CoreVersionChecker { public function __construct( $coreVersion ) { $this->versionParser = new VersionParser(); try { - $this->coreVersion = new VersionConstraint( + $this->coreVersion = new Constraint( '==', $this->versionParser->normalize( $coreVersion ) );