public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix handling of inline-update-constraints with refs or stability flags, fixes #9847

pull/9873/head
Jordi Boggiano 2021-05-04 14:14:57 +02:00
parent a677d3e9a4
commit a844fce23e
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Composer/Command/UpdateCommand.php
View File

@ -16,6 +16,7 @@ use Composer\Composer;
use Composer\DependencyResolver\Request; use Composer\DependencyResolver\Request;
use Composer\Installer; use Composer\Installer;
use Composer\IO\IOInterface; use Composer\IO\IOInterface;
use Composer\Package\Loader\RootPackageLoader;
use Composer\Plugin\CommandEvent; use Composer\Plugin\CommandEvent;
use Composer\Plugin\PluginEvents; use Composer\Plugin\PluginEvents;
use Composer\Package\Version\VersionParser; use Composer\Package\Version\VersionParser;
@ -139,8 +140,9 @@ EOT
} }
} }
$rootRequires = $composer->getPackage()->getRequires(); $rootPackage = $composer->getPackage();
$rootDevRequires = $composer->getPackage()->getDevRequires(); $rootRequires = $rootPackage->getRequires();
$rootDevRequires = $rootPackage->getDevRequires();
foreach ($reqs as $package => $constraint) { foreach ($reqs as $package => $constraint) {
if (isset($rootRequires[$package])) { if (isset($rootRequires[$package])) {
$rootRequires[$package] = $this->appendConstraintToLink($rootRequires[$package], $constraint); $rootRequires[$package] = $this->appendConstraintToLink($rootRequires[$package], $constraint);
@ -150,8 +152,10 @@ EOT
throw new \UnexpectedValueException('Only root package requirements can receive temporary constraints and '.$package.' is not one'); throw new \UnexpectedValueException('Only root package requirements can receive temporary constraints and '.$package.' is not one');
} }
} }
$composer->getPackage()->setRequires($rootRequires); $rootPackage->setRequires($rootRequires);
$composer->getPackage()->setDevRequires($rootDevRequires); $rootPackage->setDevRequires($rootDevRequires);
$rootPackage->setReferences(RootPackageLoader::extractReferences($reqs, $rootPackage->getReferences()));
$rootPackage->setStabilityFlags(RootPackageLoader::extractStabilityFlags($reqs, $rootPackage->getMinimumStability(), $rootPackage->getStabilityFlags()));
if ($input->getOption('interactive')) { if ($input->getOption('interactive')) {
$packages = $this->getPackagesInteractively($io, $input, $output, $composer, $packages); $packages = $this->getPackagesInteractively($io, $input, $output, $composer, $packages);

14
src/Composer/Package/Loader/RootPackageLoader.php
View File

@ -130,8 +130,8 @@ class RootPackageLoader extends ArrayLoader
$links[$link->getTarget()] = $link->getConstraint()->getPrettyString(); $links[$link->getTarget()] = $link->getConstraint()->getPrettyString();
} }
$aliases = $this->extractAliases($links, $aliases); $aliases = $this->extractAliases($links, $aliases);
$stabilityFlags = $this->extractStabilityFlags($links, $stabilityFlags, $realPackage->getMinimumStability()); $stabilityFlags = self::extractStabilityFlags($links, $realPackage->getMinimumStability(), $stabilityFlags);
$references = $this->extractReferences($links, $references); $references = self::extractReferences($links, $references);
if (isset($links[$config['name']])) { if (isset($links[$config['name']])) {
throw new \RuntimeException(sprintf('Root package \'%s\' cannot require itself in its composer.json' . PHP_EOL . throw new \RuntimeException(sprintf('Root package \'%s\' cannot require itself in its composer.json' . PHP_EOL .
@ -189,7 +189,10 @@ class RootPackageLoader extends ArrayLoader
return $aliases; return $aliases;
} }
private function extractStabilityFlags(array $requires, array $stabilityFlags, $minimumStability) /**
* @internal
*/
public static function extractStabilityFlags(array $requires, $minimumStability, array $stabilityFlags)
{ {
$stabilities = BasePackage::$stabilities; $stabilities = BasePackage::$stabilities;
$minimumStability = $stabilities[$minimumStability]; $minimumStability = $stabilities[$minimumStability];
@ -242,7 +245,10 @@ class RootPackageLoader extends ArrayLoader
return $stabilityFlags; return $stabilityFlags;
} }
private function extractReferences(array $requires, array $references) /**
* @internal
*/
public static function extractReferences(array $requires, array $references)
{ {
foreach ($requires as $reqName => $reqVersion) { foreach ($requires as $reqName => $reqVersion) {
$reqVersion = preg_replace('{^([^,\s@]+) as .+$}', '$1', $reqVersion); $reqVersion = preg_replace('{^([^,\s@]+) as .+$}', '$1', $reqVersion);