* Iterate over all files in the given directory searching for classes
* Iterate over all files in the given directory searching for classes
*
*
* @param \Iterator|string $path The path to search in or an iterator
* @param \Iterator|string $path The path to search in or an iterator
* @param string $blacklist Regex that matches against the file path that exclude from the classmap.
* @param string $excluded Regex that matches against the file path that exclude from the classmap.
* @param IOInterface $io IO object
* @param IOInterface $io IO object
* @param string $namespace Optional namespace prefix to filter by
* @param string $namespace Optional namespace prefix to filter by
* @param string $autoloadType psr-0|psr-4 Optional autoload standard to use mapping rules
* @param string $autoloadType psr-0|psr-4 Optional autoload standard to use mapping rules
@ -59,7 +59,7 @@ class ClassMapGenerator
* @throws \RuntimeException When the path is neither an existing file nor directory
* @throws \RuntimeException When the path is neither an existing file nor directory
* @return array A class map array
* @return array A class map array
*/
*/
public static function createMap($path, $blacklist = null, IOInterface $io = null, $namespace = null, $autoloadType = null, &$scannedFiles = array())
public static function createMap($path, $excluded = null, IOInterface $io = null, $namespace = null, $autoloadType = null, &$scannedFiles = array())
{
{
if (is_string($path)) {
if (is_string($path)) {
$basePath = $path;
$basePath = $path;
@ -102,12 +102,12 @@ class ClassMapGenerator
continue;
continue;
}
}
// check the realpath of the file against the blacklist as the path might be a symlink and the blacklist is realpath'd so symlink are resolved
// check the realpath of the file against the excluded paths as the path might be a symlink and the excluded path is realpath'd so symlink are resolved
if ($blacklist && preg_match($blacklist, strtr($realPath, '\\', '/'))) {
if ($excluded && preg_match($excluded, strtr($realPath, '\\', '/'))) {
continue;
continue;
}
}
// check non-realpath of file for directories symlink in project dir
// check non-realpath of file for directories symlink in project dir
if ($blacklist && preg_match($blacklist, strtr($filePath, '\\', '/'))) {
if ($excluded && preg_match($excluded, strtr($filePath, '\\', '/'))) {
@ -49,8 +49,8 @@ class UpdateCommand extends BaseCommand
new InputOption('no-scripts', null, InputOption::VALUE_NONE, 'Skips the execution of all scripts defined in composer.json file.'),
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('no-progress', null, InputOption::VALUE_NONE, 'Do not output download progress.'),
new InputOption('no-suggest', null, InputOption::VALUE_NONE, 'Do not show package suggestions.'),
new InputOption('no-suggest', null, InputOption::VALUE_NONE, 'Do not show package suggestions.'),
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-dependencies', null, InputOption::VALUE_NONE, 'Add also dependencies of allowed packages to the allow list, 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-all-dependencies', null, InputOption::VALUE_NONE, 'Add also all dependencies of allowed packages to the allow list, including those defined in root package.'),
new InputOption('verbose', 'v|vv|vvv', InputOption::VALUE_NONE, 'Shows more details including new commits pulled in when updating packages.'),
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('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`.'),
new InputOption('classmap-authoritative', 'a', InputOption::VALUE_NONE, 'Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.'),
foreach ($rootRequiredPackageNames as $rootRequiredPackageName) {
foreach ($rootRequiredPackageNames as $rootRequiredPackageName) {
if (preg_match($whitelistPatternRegexp, $rootRequiredPackageName)) {
if (preg_match($allowListPatternRegexp, $rootRequiredPackageName)) {
$nameMatchesRequiredPackage = true;
$nameMatchesRequiredPackage = true;
break;
break;
}
}
@ -1404,7 +1404,7 @@ class Installer
}
}
if (isset($skipPackages[$requirePackage->getName()]) && !preg_match(BasePackage::packageNameToRegexp($packageName), $requirePackage->getName())) {
if (isset($skipPackages[$requirePackage->getName()]) && !preg_match(BasePackage::packageNameToRegexp($packageName), $requirePackage->getName())) {
$this->io->writeError('<warning>Dependency "' . $requirePackage->getName() . '" is also a root requirement, but is not explicitly whitelisted. Ignoring.</warning>');
$this->io->writeError('<warning>Dependency "' . $requirePackage->getName() . '" is also a root requirement, but is not explicitly allowed. Ignoring.</warning>');
continue;
continue;
}
}
@ -1679,6 +1679,8 @@ class Installer
* restrict the update operation to a few packages, all other packages
* restrict the update operation to a few packages, all other packages
* that are already installed will be kept at their current version
* that are already installed will be kept at their current version
*
*
* @deprecated use setAllowList instead
*
* @param array $packages
* @param array $packages
* @return Installer
* @return Installer
*/
*/
@ -1690,7 +1692,20 @@ class Installer
}
}
/**
/**
* @deprecated use setWhitelistTransitiveDependencies instead
* restrict the update operation to a few packages, all other packages
* that are already installed will be kept at their current version
*
* @param array $packages
* @return Installer
*/
public function setUpdateAllowList(array $packages)
{
// call original method for BC
return $this->setUpdateWhitelist($packages);
}
/**
* @deprecated use setAllowListTransitiveDependencies instead
*/
*/
public function setWhitelistDependencies($updateDependencies = true)
public function setWhitelistDependencies($updateDependencies = true)
{
{
@ -1698,11 +1713,13 @@ class Installer
}
}
/**
/**
* Should dependencies of whitelisted packages (but not direct dependencies) be updated?
* Should dependencies of allowed packages (but not direct dependencies) be updated?
*
*
* This will NOT whitelist any dependencies that are also directly defined
* This will NOT allow list any dependencies that are also directly defined
* in the root package.
* in the root package.
*
*
* @deprecated use setAllowListTransitiveDependencies instead
*
* @param bool $updateTransitiveDependencies
* @param bool $updateTransitiveDependencies
* @return Installer
* @return Installer
*/
*/
@ -1714,11 +1731,28 @@ class Installer
}
}
/**
/**
* Should all dependencies of whitelisted packages be updated recursively?
* Should dependencies of allowed packages (but not direct dependencies) be updated?
*
* This will NOT allow list any dependencies that are also directly defined
* in the root package.
*
*
* This will whitelist any dependencies of the whitelisted packages, including
* @param bool $updateTransitiveDependencies
* @return Installer
*/
public function setAllowListTransitiveDependencies($updateTransitiveDependencies = true)
Update with a package whitelist pattern and all-dependencies flag updates packages and their dependencies, even if defined as root dependency, matching the pattern
Update with a package allowed list pattern and all-dependencies flag updates packages and their dependencies, even if defined as root dependency, matching the pattern
--COMPOSER--
--COMPOSER--
{
{
"repositories": [
"repositories": [
@ -8,10 +8,10 @@ Update with a package whitelist pattern and all-dependencies flag updates packag
See Github issue #6661 ( github.com/composer/composer/issues/6661 ).
See Github issue #6661 ( github.com/composer/composer/issues/6661 ).
When `--with-all-dependencies` is used, Composer\Installer::whitelistUpdateDependencies should update the dependencies of all whitelisted packages, even if the dependency is a root requirement.
When `--with-all-dependencies` is used, Composer\Installer::allowListUpdateDependencies should update the dependencies of all allowed packages, even if the dependency is a root requirement.
Jordi Boggiano
4 years ago