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

Fixed tests related to constraint changes

pull/8850/head
Yanick Witschi 2020-04-30 17:40:06 +02:00 committed by Jordi Boggiano
parent bca88bdd4b
commit 8e2dd62d10
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/Composer/Test/DependencyResolver/RequestTest.php
View File

@ -14,6 +14,7 @@ namespace Composer\Test\DependencyResolver;
use Composer\DependencyResolver\Request; use Composer\DependencyResolver\Request;
use Composer\Repository\ArrayRepository; use Composer\Repository\ArrayRepository;
use Composer\Semver\Constraint\EmptyConstraint;
use Composer\Test\TestCase; use Composer\Test\TestCase;
class RequestTest extends TestCase class RequestTest extends TestCase
@ -34,7 +35,7 @@ class RequestTest extends TestCase
$this->assertEquals( $this->assertEquals(
array( array(
'foo' => null, 'foo' => new EmptyConstraint(),
), ),
$request->getRequires() $request->getRequires()
); );

2
tests/Composer/Test/DependencyResolver/RuleTest.php
View File

@ -104,6 +104,6 @@ class RuleTest extends TestCase
$rule = new GenericRule(array($p1->getId(), -$p2->getId()), Rule::RULE_PACKAGE_REQUIRES, new Link('baz', 'foo')); $rule = new GenericRule(array($p1->getId(), -$p2->getId()), Rule::RULE_PACKAGE_REQUIRES, new Link('baz', 'foo'));
$this->assertEquals('baz 1.1 relates to foo -> satisfiable by foo[2.1].', $rule->getPrettyString($repositorySetMock, $requestMock, $pool, false)); $this->assertEquals('baz 1.1 relates to foo [] -> satisfiable by foo[2.1].', $rule->getPrettyString($repositorySetMock, $requestMock, $pool, false));
} }
} }

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

@ -652,9 +652,9 @@ class SolverTest extends TestCase
$msg = "\n"; $msg = "\n";
$msg .= " Problem 1\n"; $msg .= " Problem 1\n";
$msg .= " - Root composer.json requires a -> satisfiable by A[1.0].\n"; $msg .= " - Root composer.json requires a [] -> satisfiable by A[1.0].\n";
$msg .= " - A 1.0 conflicts with B 1.0.\n"; $msg .= " - A 1.0 conflicts with B 1.0.\n";
$msg .= " - Root composer.json requires b -> satisfiable by B[1.0].\n"; $msg .= " - Root composer.json requires b [] -> satisfiable by B[1.0].\n";
$this->assertEquals($msg, $e->getPrettyString($this->repoSet, $this->request, $this->pool, false)); $this->assertEquals($msg, $e->getPrettyString($this->repoSet, $this->request, $this->pool, false));
} }
} }
@ -683,7 +683,7 @@ class SolverTest extends TestCase
$msg = "\n"; $msg = "\n";
$msg .= " Problem 1\n"; $msg .= " Problem 1\n";
$msg .= " - Root composer.json requires a -> satisfiable by A[1.0].\n"; $msg .= " - Root composer.json requires a [] -> satisfiable by A[1.0].\n";
$msg .= " - A 1.0 requires b >= 2.0 -> found B[1.0] but it does not match the constraint.\n"; $msg .= " - A 1.0 requires b >= 2.0 -> found B[1.0] but it does not match the constraint.\n";
$this->assertEquals($msg, $e->getPrettyString($this->repoSet, $this->request, $this->pool, false)); $this->assertEquals($msg, $e->getPrettyString($this->repoSet, $this->request, $this->pool, false));
} }