소스 검색

Updating var names.

Matthew Grasmick 7 년 전
부모
커밋
ad465aa769
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 3
      src/Composer/Installer.php
  2. 1 1
      tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test

+ 3 - 3
src/Composer/Installer.php

@@ -125,7 +125,7 @@ class Installer
      * @var array|null
      */
     protected $updateWhitelist = null;
-    protected $whitelistDependencies = false;
+    protected $whitelistIndirectDependencies = false;
     protected $whitelistAllDependencies = false;
 
     /**
@@ -1352,7 +1352,7 @@ class Installer
                 $seen[$package->getId()] = true;
                 $this->updateWhitelist[$package->getName()] = true;
 
-                if (!$this->whitelistDependencies && !$this->whitelistAllDependencies) {
+                if (!$this->whitelistIndirectDependencies && !$this->whitelistAllDependencies) {
                     continue;
                 }
 
@@ -1663,7 +1663,7 @@ class Installer
      */
     public function setIndirectWhitelistDependencies($updateDependencies = true)
     {
-        $this->whitelistDependencies = (bool) $updateDependencies;
+        $this->whitelistIndirectDependencies = (bool) $updateDependencies;
 
         return $this;
     }

+ 1 - 1
tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test

@@ -18,7 +18,7 @@ When `with-all-dependencies` is used, Composer\Installer::whitelistUpdateDepende
         }
     ],
     "require": {
-        "a": "^1.0",
+        "a": "~1.0",
         "b": "~1.0"
     }
 }