From ac762ba6e968f6ae16cbebf6e02562cc00d4b194 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 5 Jun 2012 11:04:09 +0200 Subject: [PATCH] Correctly resolve branches if necessary --- src/Composer/DependencyResolver/Solver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php index ff7e736df..f9dc9cbc0 100644 --- a/src/Composer/DependencyResolver/Solver.php +++ b/src/Composer/DependencyResolver/Solver.php @@ -758,7 +758,7 @@ class Solver } if ($lastLiteral) { - $this->branches[$lastBranchIndex][$lastBranchOffset] = null; + $this->branches[$lastBranchIndex][$lastBranchOffset] = array(); $minimizationSteps++; $level = $lastLevel;