jenkins-bot has submitted this change and it was merged. Change subject: Update composer/semver to 1.4.2 ......................................................................
Update composer/semver to 1.4.2 https://github.com/composer/semver/compare/1.4.1...1.4.2 Change-Id: I46158f128edb14a5b45f3a8918acb1a7e15935e4 --- M autoload.php M composer.json M composer.lock M composer/installed.json M composer/semver/CHANGELOG.md M composer/semver/README.md M composer/semver/src/VersionParser.php 7 files changed, 79 insertions(+), 74 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/autoload.php b/autoload.php index 9bcfa9f..a5957bd 100644 --- a/autoload.php +++ b/autoload.php @@ -2,6 +2,6 @@ // autoload.php @generated by Composer -require_once __DIR__ . '/composer' . '/autoload_real.php'; +require_once __DIR__ . '/composer/autoload_real.php'; return ComposerAutoloaderInit_mediawiki_vendor::getLoader(); diff --git a/composer.json b/composer.json index 34f1ffa..433f119 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ }, "prefer-stable": true, "require": { - "composer/semver": "1.4.1", + "composer/semver": "1.4.2", "cssjanus/cssjanus": "1.1.2", "firebase/php-jwt": "3.0.0", "justinrainbow/json-schema": "3.0.0", diff --git a/composer.lock b/composer.lock index 05d57b9..58ca9d1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";, "This file is @generated automatically" ], - "hash": "eb48dbe45827add41f49b7253513f912", - "content-hash": "d685c97157a41f98d586a2fd7df50044", + "content-hash": "618ad555cbfed305fa164e3b3cfd3e50", "packages": [ { "name": "composer/semver", - "version": "1.4.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/composer/semver.git";, - "reference": "03c9de5aa25e7672c4ad251eeaba0c47a06c8b98" + "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/03c9de5aa25e7672c4ad251eeaba0c47a06c8b98";, - "reference": "03c9de5aa25e7672c4ad251eeaba0c47a06c8b98", + "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573";, + "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573", "shasum": "" }, "require": { @@ -67,7 +66,7 @@ "validation", "versioning" ], - "time": "2016-06-02 09:04:51" + "time": "2016-08-30 16:08:34" }, { "name": "cssjanus/cssjanus", diff --git a/composer/installed.json b/composer/installed.json index d565246..994e5c8 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -1624,70 +1624,6 @@ "homepage": "https://www.mediawiki.org/wiki/CDB"; }, { - "name": "composer/semver", - "version": "1.4.1", - "version_normalized": "1.4.1.0", - "source": { - "type": "git", - "url": "https://github.com/composer/semver.git";, - "reference": "03c9de5aa25e7672c4ad251eeaba0c47a06c8b98" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/03c9de5aa25e7672c4ad251eeaba0c47a06c8b98";, - "reference": "03c9de5aa25e7672c4ad251eeaba0c47a06c8b98", - "shasum": "" - }, - "require": { - "php": "^5.3.2 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.5 || ^5.0.5", - "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" - }, - "time": "2016-06-02 09:04:51", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Composer\\Semver\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/";, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nils Adermann", - "email": "[email protected]", - "homepage": "http://www.naderman.de"; - }, - { - "name": "Jordi Boggiano", - "email": "[email protected]", - "homepage": "http://seld.be"; - }, - { - "name": "Rob Bast", - "email": "[email protected]", - "homepage": "http://robbast.nl"; - } - ], - "description": "Semver library that offers utilities, version constraint parsing and validation.", - "keywords": [ - "semantic", - "semver", - "validation", - "versioning" - ] - }, - { "name": "wikimedia/wrappedstring", "version": "v2.2.0", "version_normalized": "2.2.0.0", @@ -1967,5 +1903,69 @@ ], "description": "Wait loop that reaches a condition or times out", "homepage": "https://www.mediawiki.org/wiki/WaitConditionLoop"; + }, + { + "name": "composer/semver", + "version": "1.4.2", + "version_normalized": "1.4.2.0", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git";, + "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573";, + "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.5 || ^5.0.5", + "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" + }, + "time": "2016-08-30 16:08:34", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/";, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "[email protected]", + "homepage": "http://www.naderman.de"; + }, + { + "name": "Jordi Boggiano", + "email": "[email protected]", + "homepage": "http://seld.be"; + }, + { + "name": "Rob Bast", + "email": "[email protected]", + "homepage": "http://robbast.nl"; + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ] } ] diff --git a/composer/semver/CHANGELOG.md b/composer/semver/CHANGELOG.md index 4d43030..febedc9 100644 --- a/composer/semver/CHANGELOG.md +++ b/composer/semver/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +### [1.4.2] 2016-08-30 + + * Fixed: collapsing of complex constraints lead to buggy constraints + ### [1.4.1] 2016-06-02 * Changed: branch-like requirements no longer strip build metadata - [composer/semver#38](https://github.com/composer/semver/pull/38). diff --git a/composer/semver/README.md b/composer/semver/README.md index bd2924f..143daa0 100644 --- a/composer/semver/README.md +++ b/composer/semver/README.md @@ -59,7 +59,7 @@ The `Composer\Semver\Semver` class provides the following methods: * satisfies($version, $constraints) -* satisfiedBy($constraint, array $versions) +* satisfiedBy(array $versions, $constraint) * sort($versions) * rsort($versions) diff --git a/composer/semver/src/VersionParser.php b/composer/semver/src/VersionParser.php index b6eb195..359c18c 100644 --- a/composer/semver/src/VersionParser.php +++ b/composer/semver/src/VersionParser.php @@ -265,6 +265,8 @@ // them into one constraint && $orGroups[0] instanceof MultiConstraint && $orGroups[1] instanceof MultiConstraint + && 2 === count($orGroups[0]->getConstraints()) + && 2 === count($orGroups[1]->getConstraints()) && ($a = (string) $orGroups[0]) && substr($a, 0, 3) === '[>=' && (false !== ($posA = strpos($a, '<', 4))) && ($b = (string) $orGroups[1]) -- To view, visit https://gerrit.wikimedia.org/r/313659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46158f128edb14a5b45f3a8918acb1a7e15935e4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Reedy <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
