Fixed MultiConstraint with MatchAllConstraint

Author: Toflar

src/Constraint/MultiConstraint.php

@@ -207,6 +207,12 @@ public static function create(array $constraints, $conjunctive = true)
             return $constraints[0];
         }
 
+        foreach ($constraints as $constraint) {
+            if ($constraint instanceof MatchAllConstraint) {
+                return new MatchAllConstraint();
+            }
+        }
+
         $optimized = self::optimizeConstraints($constraints, $conjunctive);
         if ($optimized !== null) {
             list($constraints, $conjunctive) = $optimized;

tests/Constraint/MultiConstraintTest.php

@@ -275,6 +275,20 @@ public function testCreatesMatchAllConstraintIfNoneGiven()
         $this->assertInstanceOf('Composer\Semver\Constraint\MatchAllConstraint', MultiConstraint::create(array()));
     }
 
+    public function testCreatesMatchAllConstraintIfConjunctiveAndCombinedWithAnotherONe()
+    {
+        $this->assertInstanceOf('Composer\Semver\Constraint\MatchAllConstraint', MultiConstraint::create(
+            array(new Constraint('>=', '2.5.0.0-dev'), new MatchAllConstraint())
+        ));
+    }
+
+    public function testCreatesMatchAllConstraintIfDisjunctiveAndCombinedWithAnotherONe()
+    {
+        $this->assertInstanceOf('Composer\Semver\Constraint\MatchAllConstraint', MultiConstraint::create(
+            array(new Constraint('>=', '2.5.0.0-dev'), new MatchAllConstraint()), false
+        ));
+    }
+
     /**
      * @dataProvider multiConstraintOptimizations
      *