Handle array candidates in whatProvides

2014-02-21 16:52:27 +01:00 · 2014-02-21 16:52:27 +01:00 · aa74818fe0
parent eb5c785dcd
commit aa74818fe0
1 changed files with 4 additions and 1 deletions
--- a/src/Composer/DependencyResolver/Pool.php
+++ b/src/Composer/DependencyResolver/Pool.php
@ -268,7 +268,10 @@ class Pool
        $nameMatch = false;

        foreach ($candidates as $candidate) {
-            if ($this->whitelist !== null && !isset($this->whitelist[$candidate->getId()])) {
+            if ($this->whitelist !== null && (
+                (is_array($candidate) && isset($candidate['id']) && !isset($this->whitelist[$candidate['id']])) ||
+                (is_object($candidate) && !isset($this->whitelist[$candidate->getId()]))
+            )) {
                continue;
            }
            switch ($this->match($candidate, $name, $constraint)) {