From 392d0abd21a716fb7b2a0b19c45c5e71646db20e Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Fri, 27 Mar 2020 22:15:04 +0100 Subject: [PATCH] Rename test files and standardize on allow list rather than whitelist --- doc/01-basic-usage.md | 2 +- doc/03-cli.md | 4 ++-- src/Composer/Cache.php | 22 +++++++++---------- src/Composer/Command/InitCommand.php | 4 ++-- src/Composer/Command/RemoveCommand.php | 5 +++-- src/Composer/Command/RequireCommand.php | 13 ++++++++--- src/Composer/Command/UpdateCommand.php | 4 ++-- .../DependencyResolver/PoolBuilder.php | 9 +++++++- src/Composer/DependencyResolver/Problem.php | 4 ++-- src/Composer/Package/BasePackage.php | 8 +++---- ...downgrades-non-allow-listed-unstable.test} | 2 +- .../Fixtures/installer/solver-problems.test | 2 +- ... => update-allow-list-locked-require.test} | 0 ...-list-patterns-with-all-dependencies.test} | 0 ...llow-list-patterns-with-dependencies.test} | 0 ...list-patterns-with-root-dependencies.test} | 0 ...w-list-patterns-without-dependencies.test} | 0 ...s.test => update-allow-list-patterns.test} | 0 ...test => update-allow-list-reads-lock.test} | 0 ... => update-allow-list-removes-unused.test} | 0 ...low-list-warns-non-existing-patterns.test} | 0 ... update-allow-list-with-dependencies.test} | 0 ...-allow-list-with-dependency-conflict.test} | 0 ...-whitelist.test => update-allow-list.test} | 0 24 files changed, 47 insertions(+), 32 deletions(-) rename tests/Composer/Test/Fixtures/installer/{partial-update-downgrades-non-whitelisted-unstable.test => partial-update-downgrades-non-allow-listed-unstable.test} (96%) rename tests/Composer/Test/Fixtures/installer/{update-whitelist-locked-require.test => update-allow-list-locked-require.test} (100%) rename tests/Composer/Test/Fixtures/installer/{update-whitelist-patterns-with-all-dependencies.test => update-allow-list-patterns-with-all-dependencies.test} (100%) rename tests/Composer/Test/Fixtures/installer/{update-whitelist-patterns-with-dependencies.test => update-allow-list-patterns-with-dependencies.test} (100%) rename tests/Composer/Test/Fixtures/installer/{update-whitelist-patterns-with-root-dependencies.test => update-allow-list-patterns-with-root-dependencies.test} (100%) rename tests/Composer/Test/Fixtures/installer/{update-whitelist-patterns-without-dependencies.test => update-allow-list-patterns-without-dependencies.test} (100%) rename tests/Composer/Test/Fixtures/installer/{update-whitelist-patterns.test => update-allow-list-patterns.test} (100%) rename tests/Composer/Test/Fixtures/installer/{update-whitelist-reads-lock.test => update-allow-list-reads-lock.test} (100%) rename tests/Composer/Test/Fixtures/installer/{update-whitelist-removes-unused.test => update-allow-list-removes-unused.test} (100%) rename tests/Composer/Test/Fixtures/installer/{update-whitelist-warns-non-existing-patterns.test => update-allow-list-warns-non-existing-patterns.test} (100%) rename tests/Composer/Test/Fixtures/installer/{update-whitelist-with-dependencies.test => update-allow-list-with-dependencies.test} (100%) rename tests/Composer/Test/Fixtures/installer/{update-whitelist-with-dependency-conflict.test => update-allow-list-with-dependency-conflict.test} (100%) rename tests/Composer/Test/Fixtures/installer/{update-whitelist.test => update-allow-list.test} (100%) diff --git a/doc/01-basic-usage.md b/doc/01-basic-usage.md index 4a3880581..aa44da021 100644 --- a/doc/01-basic-usage.md +++ b/doc/01-basic-usage.md @@ -159,7 +159,7 @@ php composer.phar update > if the `composer.lock` has not been updated since changes were made to the > `composer.json` that might affect dependency resolution. -If you only want to install, upgrade or remove one dependency, you can whitelist them: +If you only want to install, upgrade or remove one dependency, you can explicitly list it as an argument: ```sh php composer.phar update monolog/monolog [...] diff --git a/doc/03-cli.md b/doc/03-cli.md index e0ae7487a..725be430b 100644 --- a/doc/03-cli.md +++ b/doc/03-cli.md @@ -155,8 +155,8 @@ php composer.phar update "vendor/*" * **--no-scripts:** Skips execution of scripts defined in `composer.json`. * **--no-progress:** Removes the progress display that can mess with some terminals or scripts which don't handle backspace characters. -* **--with-dependencies:** Add also dependencies of whitelisted packages to the whitelist, except those that are root requirements. -* **--with-all-dependencies:** Add also all dependencies of whitelisted packages to the whitelist, including those that are root requirements. +* **--with-dependencies:** Update also dependencies of packages in the argument list, except those which are root requirements. +* **--with-all-dependencies:** Update also dependencies of packages in the argument list, including those which are root requirements. * **--optimize-autoloader (-o):** Convert PSR-0/4 autoloading to classmap to get a faster autoloader. This is recommended especially for production, but can take a bit of time to run so it is currently not done by default. diff --git a/src/Composer/Cache.php b/src/Composer/Cache.php index 06c6a0996..2a4e7756f 100644 --- a/src/Composer/Cache.php +++ b/src/Composer/Cache.php @@ -28,20 +28,20 @@ class Cache private $io; private $root; private $enabled = true; - private $whitelist; + private $allowlist; private $filesystem; /** * @param IOInterface $io * @param string $cacheDir location of the cache - * @param string $whitelist List of characters that are allowed in path names (used in a regex character class) + * @param string $allowlist List of characters that are allowed in path names (used in a regex character class) * @param Filesystem $filesystem optional filesystem instance */ - public function __construct(IOInterface $io, $cacheDir, $whitelist = 'a-z0-9.', Filesystem $filesystem = null) + public function __construct(IOInterface $io, $cacheDir, $allowlist = 'a-z0-9.', Filesystem $filesystem = null) { $this->io = $io; $this->root = rtrim($cacheDir, '/\\') . '/'; - $this->whitelist = $whitelist; + $this->allowlist = $allowlist; $this->filesystem = $filesystem ?: new Filesystem(); if (!self::isUsable($cacheDir)) { @@ -77,7 +77,7 @@ class Cache public function read($file) { if ($this->enabled) { - $file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file); + $file = preg_replace('{[^'.$this->allowlist.']}i', '-', $file); if (file_exists($this->root . $file)) { $this->io->writeError('Reading '.$this->root . $file.' from cache', true, IOInterface::DEBUG); @@ -91,7 +91,7 @@ class Cache public function write($file, $contents) { if ($this->enabled) { - $file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file); + $file = preg_replace('{[^'.$this->allowlist.']}i', '-', $file); $this->io->writeError('Writing '.$this->root . $file.' into cache', true, IOInterface::DEBUG); @@ -129,7 +129,7 @@ class Cache public function copyFrom($file, $source) { if ($this->enabled) { - $file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file); + $file = preg_replace('{[^'.$this->allowlist.']}i', '-', $file); $this->filesystem->ensureDirectoryExists(dirname($this->root . $file)); if (!file_exists($source)) { @@ -150,7 +150,7 @@ class Cache public function copyTo($file, $target) { if ($this->enabled) { - $file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file); + $file = preg_replace('{[^'.$this->allowlist.']}i', '-', $file); if (file_exists($this->root . $file)) { try { touch($this->root . $file, filemtime($this->root . $file), time()); @@ -177,7 +177,7 @@ class Cache public function remove($file) { if ($this->enabled) { - $file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file); + $file = preg_replace('{[^'.$this->allowlist.']}i', '-', $file); if (file_exists($this->root . $file)) { return $this->filesystem->unlink($this->root . $file); } @@ -229,7 +229,7 @@ class Cache public function sha1($file) { if ($this->enabled) { - $file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file); + $file = preg_replace('{[^'.$this->allowlist.']}i', '-', $file); if (file_exists($this->root . $file)) { return sha1_file($this->root . $file); } @@ -241,7 +241,7 @@ class Cache public function sha256($file) { if ($this->enabled) { - $file = preg_replace('{[^'.$this->whitelist.']}i', '-', $file); + $file = preg_replace('{[^'.$this->allowlist.']}i', '-', $file); if (file_exists($this->root . $file)) { return hash_file('sha256', $this->root . $file); } diff --git a/src/Composer/Command/InitCommand.php b/src/Composer/Command/InitCommand.php index d653ad61c..8f101515c 100644 --- a/src/Composer/Command/InitCommand.php +++ b/src/Composer/Command/InitCommand.php @@ -86,8 +86,8 @@ EOT { $io = $this->getIO(); - $whitelist = array('name', 'description', 'author', 'type', 'homepage', 'require', 'require-dev', 'stability', 'license'); - $options = array_filter(array_intersect_key($input->getOptions(), array_flip($whitelist))); + $allowlist = array('name', 'description', 'author', 'type', 'homepage', 'require', 'require-dev', 'stability', 'license'); + $options = array_filter(array_intersect_key($input->getOptions(), array_flip($allowlist))); if (isset($options['author'])) { $options['authors'] = $this->formatAuthors($options['author']); diff --git a/src/Composer/Command/RemoveCommand.php b/src/Composer/Command/RemoveCommand.php index b95af9f72..0748def0c 100644 --- a/src/Composer/Command/RemoveCommand.php +++ b/src/Composer/Command/RemoveCommand.php @@ -13,6 +13,7 @@ namespace Composer\Command; use Composer\Config\JsonConfigSource; +use Composer\DependencyResolver\Request; use Composer\Installer; use Composer\Plugin\CommandEvent; use Composer\Plugin\PluginEvents; @@ -179,8 +180,8 @@ EOT ->setClassMapAuthoritative($authoritative) ->setApcuAutoloader($apcu) ->setUpdate(true) - ->setUpdateWhitelist($packages) - ->setWhitelistTransitiveDependencies(!$input->getOption('no-update-with-dependencies')) + ->setUpdateAllowList($packages) + ->setUpdateAllowTransitiveDependencies($input->getOption('no-update-with-dependencies') ? Request::UPDATE_ONLY_LISTED : Request::UPDATE_TRANSITIVE_DEPENDENCIES) ->setIgnorePlatformRequirements($input->getOption('ignore-platform-reqs')) ->setRunScripts(!$input->getOption('no-scripts')) ->setDryRun($dryRun) diff --git a/src/Composer/Command/RequireCommand.php b/src/Composer/Command/RequireCommand.php index 97fbfe5f2..3277a1538 100644 --- a/src/Composer/Command/RequireCommand.php +++ b/src/Composer/Command/RequireCommand.php @@ -12,6 +12,7 @@ namespace Composer\Command; +use Composer\DependencyResolver\Request; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; @@ -248,6 +249,13 @@ EOT $authoritative = $input->getOption('classmap-authoritative') || $composer->getConfig()->get('classmap-authoritative'); $apcu = $input->getOption('apcu-autoloader') || $composer->getConfig()->get('apcu-autoloader'); + $updateAllowTransitiveDependencies = Request::UPDATE_ONLY_LISTED; + if ($input->getOption('update-with-all-dependencies')) { + $updateAllowTransitiveDependencies = Request::UPDATE_TRANSITIVE_ROOT_DEPENDENCIES; + } elseif ($input->getOption('update-with-dependencies')) { + $updateAllowTransitiveDependencies = Request::UPDATE_TRANSITIVE_DEPENDENCIES; + } + $commandEvent = new CommandEvent(PluginEvents::COMMAND, 'require', $input, $output); $composer->getEventDispatcher()->dispatch($commandEvent->getName(), $commandEvent); @@ -264,8 +272,7 @@ EOT ->setClassMapAuthoritative($authoritative) ->setApcuAutoloader($apcu) ->setUpdate(true) - ->setWhitelistTransitiveDependencies($input->getOption('update-with-dependencies')) - ->setWhitelistAllDependencies($input->getOption('update-with-all-dependencies')) + ->setUpdateAllowTransitiveDependencies($updateAllowTransitiveDependencies) ->setIgnorePlatformRequirements($input->getOption('ignore-platform-reqs')) ->setPreferStable($input->getOption('prefer-stable')) ->setPreferLowest($input->getOption('prefer-lowest')) @@ -275,7 +282,7 @@ EOT // if no lock is present, or the file is brand new, we do not do a // partial update as this is not supported by the Installer if (!$this->firstRequire && $composer->getConfig()->get('lock')) { - $install->setUpdateWhitelist(array_keys($requirements)); + $install->setUpdateAllowList(array_keys($requirements)); } $status = $install->run(); diff --git a/src/Composer/Command/UpdateCommand.php b/src/Composer/Command/UpdateCommand.php index 127676d81..77e166dec 100644 --- a/src/Composer/Command/UpdateCommand.php +++ b/src/Composer/Command/UpdateCommand.php @@ -49,8 +49,8 @@ class UpdateCommand extends BaseCommand new InputOption('no-autoloader', null, InputOption::VALUE_NONE, 'Skips autoloader generation'), new InputOption('no-scripts', null, InputOption::VALUE_NONE, 'Skips the execution of all scripts defined in composer.json file.'), new InputOption('no-progress', null, InputOption::VALUE_NONE, 'Do not output download progress.'), - new InputOption('with-dependencies', null, InputOption::VALUE_NONE, 'Add also dependencies of whitelisted packages to the whitelist, except those defined in root package.'), - new InputOption('with-all-dependencies', null, InputOption::VALUE_NONE, 'Add also all dependencies of whitelisted packages to the whitelist, including those defined in root package.'), + new InputOption('with-dependencies', null, InputOption::VALUE_NONE, 'Update also dependencies of packages in the argument list, except those which are root requirements.'), + new InputOption('with-all-dependencies', null, InputOption::VALUE_NONE, 'Update also dependencies of packages in the argument list, including those which are root requirements.'), new InputOption('verbose', 'v|vv|vvv', InputOption::VALUE_NONE, 'Shows more details including new commits pulled in when updating packages.'), new InputOption('optimize-autoloader', 'o', InputOption::VALUE_NONE, 'Optimize autoloader during autoloader dump.'), new InputOption('classmap-authoritative', 'a', InputOption::VALUE_NONE, 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'), diff --git a/src/Composer/DependencyResolver/PoolBuilder.php b/src/Composer/DependencyResolver/PoolBuilder.php index 2037a0a9d..e458c6222 100644 --- a/src/Composer/DependencyResolver/PoolBuilder.php +++ b/src/Composer/DependencyResolver/PoolBuilder.php @@ -300,12 +300,19 @@ class PoolBuilder { if ($this->io) { foreach ($this->updateAllowList as $pattern => $void) { + $patternRegexp = BasePackage::packageNameToRegexp($pattern); + // update pattern matches a locked package? => all good foreach ($request->getLockedRepository()->getPackages() as $package) { - $patternRegexp = BasePackage::packageNameToRegexp($pattern); if (preg_match($patternRegexp, $package->getName())) { continue 2; } } + // update pattern matches a root require? => all good, probably a new package + foreach ($request->getRequires() as $packageName => $constraint) { + if (preg_match($patternRegexp, $packageName)) { + continue 2; + } + } if (strpos($pattern, '*') !== false) { $this->io->writeError('Pattern "' . $pattern . '" listed for update does not match any locked packages.'); } else { diff --git a/src/Composer/DependencyResolver/Problem.php b/src/Composer/DependencyResolver/Problem.php index ad9989d19..a26cc47de 100644 --- a/src/Composer/DependencyResolver/Problem.php +++ b/src/Composer/DependencyResolver/Problem.php @@ -182,7 +182,7 @@ class Problem if ($package->getName() === $packageName) { $fixedPackage = $package; if ($pool->isUnacceptableFixedPackage($package)) { - return array("- ", $package->getPrettyName().' is fixed to '.$package->getPrettyVersion().' (lock file version) by a partial update but that version is rejected by your minimum-stability. Make sure you whitelist it for update.'); + return array("- ", $package->getPrettyName().' is fixed to '.$package->getPrettyVersion().' (lock file version) by a partial update but that version is rejected by your minimum-stability. Make sure you list it as an argument for the update command.'); } break; } @@ -207,7 +207,7 @@ class Problem return $fixedConstraint->matches(new Constraint('==', $p->getVersion())); }); if (0 === count($filtered)) { - return array("- Root composer.json requires $packageName".self::constraintToText($constraint) . ', ', 'found '.self::getPackageList($packages).' but the package is fixed to '.$fixedPackage->getPrettyVersion().' (lock file version) by a partial update and that version does not match. Make sure you whitelist it for update.'); + return array("- Root composer.json requires $packageName".self::constraintToText($constraint) . ', ', 'found '.self::getPackageList($packages).' but the package is fixed to '.$fixedPackage->getPrettyVersion().' (lock file version) by a partial update and that version does not match. Make sure you list it as an argument for the update command.'); } } diff --git a/src/Composer/Package/BasePackage.php b/src/Composer/Package/BasePackage.php index 0c40a3016..9ecbcb332 100644 --- a/src/Composer/Package/BasePackage.php +++ b/src/Composer/Package/BasePackage.php @@ -250,14 +250,14 @@ abstract class BasePackage implements PackageInterface /** * Build a regexp from a package name, expanding * globs as required * - * @param string $whiteListedPattern + * @param string $allowPattern * @param string $wrap Wrap the cleaned string by the given string * @return string */ - public static function packageNameToRegexp($whiteListedPattern, $wrap = '{^%s$}i') + public static function packageNameToRegexp($allowPattern, $wrap = '{^%s$}i') { - $cleanedWhiteListedPattern = str_replace('\\*', '.*', preg_quote($whiteListedPattern)); + $cleanedAllowPattern = str_replace('\\*', '.*', preg_quote($allowPattern)); - return sprintf($wrap, $cleanedWhiteListedPattern); + return sprintf($wrap, $cleanedAllowPattern); } } diff --git a/tests/Composer/Test/Fixtures/installer/partial-update-downgrades-non-whitelisted-unstable.test b/tests/Composer/Test/Fixtures/installer/partial-update-downgrades-non-allow-listed-unstable.test similarity index 96% rename from tests/Composer/Test/Fixtures/installer/partial-update-downgrades-non-whitelisted-unstable.test rename to tests/Composer/Test/Fixtures/installer/partial-update-downgrades-non-allow-listed-unstable.test index 8e0b18e05..25bd4a9c6 100644 --- a/tests/Composer/Test/Fixtures/installer/partial-update-downgrades-non-whitelisted-unstable.test +++ b/tests/Composer/Test/Fixtures/installer/partial-update-downgrades-non-allow-listed-unstable.test @@ -59,4 +59,4 @@ Updating dependencies Your requirements could not be resolved to an installable set of packages. Problem 1 - - b/unstable is fixed to 1.1.0-alpha (lock file version) by a partial update but that version is rejected by your minimum-stability. Make sure you whitelist it for update. + - b/unstable is fixed to 1.1.0-alpha (lock file version) by a partial update but that version is rejected by your minimum-stability. Make sure you list it as an argument for the update command. diff --git a/tests/Composer/Test/Fixtures/installer/solver-problems.test b/tests/Composer/Test/Fixtures/installer/solver-problems.test index 005047127..9c3d0e534 100644 --- a/tests/Composer/Test/Fixtures/installer/solver-problems.test +++ b/tests/Composer/Test/Fixtures/installer/solver-problems.test @@ -117,7 +117,7 @@ Your requirements could not be resolved to an installable set of packages. Problem 3 - Root composer.json requires non-existent/pkg, it could not be found in any version, there may be a typo in the package name. Problem 4 - - Root composer.json requires stable-requiree-excluded/pkg 1.0.1, found stable-requiree-excluded/pkg[1.0.1] but the package is fixed to 1.0.0 (lock file version) by a partial update and that version does not match. Make sure you whitelist it for update. + - Root composer.json requires stable-requiree-excluded/pkg 1.0.1, found stable-requiree-excluded/pkg[1.0.1] but the package is fixed to 1.0.0 (lock file version) by a partial update and that version does not match. Make sure you list it as an argument for the update command. Problem 5 - Root composer.json requires linked library lib-xml 1002.* but it has the wrong version installed or is missing from your system, make sure to load the extension providing it. Problem 6 diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-locked-require.test b/tests/Composer/Test/Fixtures/installer/update-allow-list-locked-require.test similarity index 100% rename from tests/Composer/Test/Fixtures/installer/update-whitelist-locked-require.test rename to tests/Composer/Test/Fixtures/installer/update-allow-list-locked-require.test diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-all-dependencies.test b/tests/Composer/Test/Fixtures/installer/update-allow-list-patterns-with-all-dependencies.test similarity index 100% rename from tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-all-dependencies.test rename to tests/Composer/Test/Fixtures/installer/update-allow-list-patterns-with-all-dependencies.test diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-dependencies.test b/tests/Composer/Test/Fixtures/installer/update-allow-list-patterns-with-dependencies.test similarity index 100% rename from tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-dependencies.test rename to tests/Composer/Test/Fixtures/installer/update-allow-list-patterns-with-dependencies.test diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-root-dependencies.test b/tests/Composer/Test/Fixtures/installer/update-allow-list-patterns-with-root-dependencies.test similarity index 100% rename from tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-with-root-dependencies.test rename to tests/Composer/Test/Fixtures/installer/update-allow-list-patterns-with-root-dependencies.test diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-without-dependencies.test b/tests/Composer/Test/Fixtures/installer/update-allow-list-patterns-without-dependencies.test similarity index 100% rename from tests/Composer/Test/Fixtures/installer/update-whitelist-patterns-without-dependencies.test rename to tests/Composer/Test/Fixtures/installer/update-allow-list-patterns-without-dependencies.test diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-patterns.test b/tests/Composer/Test/Fixtures/installer/update-allow-list-patterns.test similarity index 100% rename from tests/Composer/Test/Fixtures/installer/update-whitelist-patterns.test rename to tests/Composer/Test/Fixtures/installer/update-allow-list-patterns.test diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-reads-lock.test b/tests/Composer/Test/Fixtures/installer/update-allow-list-reads-lock.test similarity index 100% rename from tests/Composer/Test/Fixtures/installer/update-whitelist-reads-lock.test rename to tests/Composer/Test/Fixtures/installer/update-allow-list-reads-lock.test diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-removes-unused.test b/tests/Composer/Test/Fixtures/installer/update-allow-list-removes-unused.test similarity index 100% rename from tests/Composer/Test/Fixtures/installer/update-whitelist-removes-unused.test rename to tests/Composer/Test/Fixtures/installer/update-allow-list-removes-unused.test diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-warns-non-existing-patterns.test b/tests/Composer/Test/Fixtures/installer/update-allow-list-warns-non-existing-patterns.test similarity index 100% rename from tests/Composer/Test/Fixtures/installer/update-whitelist-warns-non-existing-patterns.test rename to tests/Composer/Test/Fixtures/installer/update-allow-list-warns-non-existing-patterns.test diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-with-dependencies.test b/tests/Composer/Test/Fixtures/installer/update-allow-list-with-dependencies.test similarity index 100% rename from tests/Composer/Test/Fixtures/installer/update-whitelist-with-dependencies.test rename to tests/Composer/Test/Fixtures/installer/update-allow-list-with-dependencies.test diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist-with-dependency-conflict.test b/tests/Composer/Test/Fixtures/installer/update-allow-list-with-dependency-conflict.test similarity index 100% rename from tests/Composer/Test/Fixtures/installer/update-whitelist-with-dependency-conflict.test rename to tests/Composer/Test/Fixtures/installer/update-allow-list-with-dependency-conflict.test diff --git a/tests/Composer/Test/Fixtures/installer/update-whitelist.test b/tests/Composer/Test/Fixtures/installer/update-allow-list.test similarity index 100% rename from tests/Composer/Test/Fixtures/installer/update-whitelist.test rename to tests/Composer/Test/Fixtures/installer/update-allow-list.test