Преглед на файлове

Trying to fix update behavior.

Matthew Grasmick преди 7 години
родител
ревизия
6db92eae92
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      src/Composer/Installer.php

+ 2 - 2
src/Composer/Installer.php

@@ -1362,11 +1362,11 @@ class Installer
                     $requirePackages = $pool->whatProvides($require->getTarget());
 
                     foreach ($requirePackages as $requirePackage) {
-                        if (!$this->whitelistAllDependencies && isset($this->updateWhitelist[$requirePackage->getName()])) {
+                        if (isset($this->updateWhitelist[$requirePackage->getName()])) {
                             continue;
                         }
 
-                        if (isset($skipPackages[$requirePackage->getName()])) {
+                        if (!$this->whitelistAllDependencies && isset($skipPackages[$requirePackage->getName()])) {
                             $this->io->writeError('<warning>Dependency "' . $requirePackage->getName() . '" is also a root requirement, but is not explicitly whitelisted. Ignoring.</warning>');
                             continue;
                         }