Revert #129 to fix regression

composer · Feb 4, 2022 · a951f61 · a951f61
1 parent 84ce71b
commit a951f61
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git 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
@@ -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
         ));
     }