From a951f614bd64dcd26137bc9b7b2637ddcfc57649 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 4 Feb 2022 14:58:43 +0100 Subject: [PATCH] Revert #129 to fix regression --- src/Constraint/MultiConstraint.php | 12 ------------ tests/Constraint/MultiConstraintTest.php | 8 ++++---- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/Constraint/MultiConstraint.php b/src/Constraint/MultiConstraint.php index 94a39646..1f4c0061 100644 --- a/src/Constraint/MultiConstraint.php +++ b/src/Constraint/MultiConstraint.php @@ -228,18 +228,6 @@ public static function create(array $constraints, $conjunctive = true) return $constraints[0]; } - foreach ($constraints as $k => $constraint) { - if ($constraint instanceof MatchAllConstraint) { - if (!$conjunctive) { - return new MatchAllConstraint(); - } - unset($constraints[$k]); - if (1 === \count($constraints)) { - return $constraints[0]; - } - } - } - $optimized = self::optimizeConstraints($constraints, $conjunctive); if ($optimized !== null) { list($constraints, $conjunctive) = $optimized; diff --git a/tests/Constraint/MultiConstraintTest.php b/tests/Constraint/MultiConstraintTest.php index 7eab3f10..e27446f7 100644 --- a/tests/Constraint/MultiConstraintTest.php +++ b/tests/Constraint/MultiConstraintTest.php @@ -290,16 +290,16 @@ public function testCreatesMatchAllConstraintIfNoneGiven() $this->assertInstanceOf('Composer\Semver\Constraint\MatchAllConstraint', MultiConstraint::create(array())); } - public function testRemovesMatchAllConstraintIfConjunctiveAndCombinedWithOtherConstraints() + public function testMatchAllConstraintWithinConjunctiveMultiConstraint() { - $this->assertSame('[>= 2.5.0.0-dev <= 3.0.0.0-dev]', (string) MultiConstraint::create( + $this->assertSame('[>= 2.5.0.0-dev <= 3.0.0.0-dev *]', (string) MultiConstraint::create( array(new Constraint('>=', '2.5.0.0-dev'), new Constraint('<=', '3.0.0.0-dev'), new MatchAllConstraint()) )); } - public function testCreatesMatchAllConstraintIfDisjunctiveAndCombinedWithAnotherOne() + public function testMatchAllConstraintWithinDisjunctiveMultiConstraint() { - $this->assertInstanceOf('Composer\Semver\Constraint\MatchAllConstraint', MultiConstraint::create( + $this->assertSame('[>= 2.5.0.0-dev || *]', (string) MultiConstraint::create( array(new Constraint('>=', '2.5.0.0-dev'), new MatchAllConstraint()), false )); }