public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Bump to use composer/semver 3.x

pull/8845/head
Jordi Boggiano 2020-05-26 18:03:49 +02:00
parent d72a07db06
commit 863e7076ba
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -24,7 +24,7 @@
"require": { "require": {
"php": "^5.3.2 || ^7.0", "php": "^5.3.2 || ^7.0",
"composer/ca-bundle": "^1.0", "composer/ca-bundle": "^1.0",
"composer/semver": "^2.1@dev", "composer/semver": "^3.0@dev",
"composer/spdx-licenses": "^1.2", "composer/spdx-licenses": "^1.2",
"composer/xdebug-handler": "^1.1", "composer/xdebug-handler": "^1.1",
"justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",

12
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "aaa28d3c716a6b5d973347f4046f4931", "content-hash": "b596d49d8047528b59baeab735f1f98f",
"packages": [ "packages": [
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
@ -83,12 +83,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/semver.git", "url": "https://github.com/composer/semver.git",
"reference": "7401fc3628694736b1cac8ec8d5c7dfdcfe54ea6" "reference": "e28fa06aecbe17194fed4c58ee1de18190892677"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/semver/zipball/7401fc3628694736b1cac8ec8d5c7dfdcfe54ea6", "url": "https://api.github.com/repos/composer/semver/zipball/e28fa06aecbe17194fed4c58ee1de18190892677",
"reference": "7401fc3628694736b1cac8ec8d5c7dfdcfe54ea6", "reference": "e28fa06aecbe17194fed4c58ee1de18190892677",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -101,7 +101,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.x-dev" "dev-master": "3.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -156,7 +156,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-05-21T14:08:19+00:00" "time": "2020-05-26T12:57:06+00:00"
}, },
{ {
"name": "composer/spdx-licenses", "name": "composer/spdx-licenses",

4
tests/Composer/Test/DependencyResolver/SolverTest.php
View File

@ -25,7 +25,7 @@ use Composer\Repository\InstalledArrayRepository;
use Composer\Repository\RepositorySet; use Composer\Repository\RepositorySet;
use Composer\Test\TestCase; use Composer\Test\TestCase;
use Composer\Semver\Constraint\MultiConstraint; use Composer\Semver\Constraint\MultiConstraint;
use Composer\Semver\Constraint\EmptyConstraint; use Composer\Semver\Constraint\MatchNoneConstraint;
class SolverTest extends TestCase class SolverTest extends TestCase
{ {
@ -379,7 +379,7 @@ class SolverTest extends TestCase
{ {
$this->repoLocked->addPackage($packageA = $this->getPackage('A', '1.0')); $this->repoLocked->addPackage($packageA = $this->getPackage('A', '1.0'));
$this->repo->addPackage($packageB = $this->getPackage('B', '1.0')); $this->repo->addPackage($packageB = $this->getPackage('B', '1.0'));
$packageB->setReplaces(array('a' => new Link('B', 'A', new EmptyConstraint()))); $packageB->setReplaces(array('a' => new Link('B', 'A', new MatchNoneConstraint())));
$this->reposComplete(); $this->reposComplete();

6
tests/Composer/Test/Repository/FilterRepositoryTest.php
View File

@ -15,7 +15,7 @@ namespace Composer\Test\Repository;
use Composer\Test\TestCase; use Composer\Test\TestCase;
use Composer\Repository\FilterRepository; use Composer\Repository\FilterRepository;
use Composer\Repository\ArrayRepository; use Composer\Repository\ArrayRepository;
use Composer\Semver\Constraint\EmptyConstraint; use Composer\Semver\Constraint\MatchNoneConstraint;
use Composer\Package\BasePackage; use Composer\Package\BasePackage;
class FilterRepositoryTest extends TestCase class FilterRepositoryTest extends TestCase
@ -54,7 +54,7 @@ class FilterRepositoryTest extends TestCase
public function testCanonicalDefaultTrue() public function testCanonicalDefaultTrue()
{ {
$repo = new FilterRepository($this->arrayRepo, array()); $repo = new FilterRepository($this->arrayRepo, array());
$result = $repo->loadPackages(array('foo/aaa' => new EmptyConstraint), BasePackage::$stabilities, array()); $result = $repo->loadPackages(array('foo/aaa' => new MatchNoneConstraint), BasePackage::$stabilities, array());
$this->assertCount(1, $result['packages']); $this->assertCount(1, $result['packages']);
$this->assertCount(1, $result['namesFound']); $this->assertCount(1, $result['namesFound']);
} }
@ -62,7 +62,7 @@ class FilterRepositoryTest extends TestCase
public function testNonCanonical() public function testNonCanonical()
{ {
$repo = new FilterRepository($this->arrayRepo, array('canonical' => false)); $repo = new FilterRepository($this->arrayRepo, array('canonical' => false));
$result = $repo->loadPackages(array('foo/aaa' => new EmptyConstraint), BasePackage::$stabilities, array()); $result = $repo->loadPackages(array('foo/aaa' => new MatchNoneConstraint), BasePackage::$stabilities, array());
$this->assertCount(1, $result['packages']); $this->assertCount(1, $result['packages']);
$this->assertCount(0, $result['namesFound']); $this->assertCount(0, $result['namesFound']);
} }