New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow using temporary update constraints on all packages (incl non-root) #10773
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| <?php declare(strict_types=1); | ||
|
|
||
| /* | ||
| * This file is part of Composer. | ||
| * | ||
| * (c) Nils Adermann <naderman@naderman.de> | ||
| * Jordi Boggiano <j.boggiano@seld.be> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Composer\Test\Command; | ||
|
|
||
| use Composer\Test\TestCase; | ||
|
|
||
| class UpdateCommandTest extends TestCase | ||
| { | ||
| /** | ||
| * @dataProvider provideUpdates | ||
| * @param array<mixed> $composerJson | ||
| * @param array<mixed> $command | ||
| */ | ||
| public function testUpdate(array $composerJson, array $command, string $expected): void | ||
| { | ||
| $this->initTempComposer($composerJson); | ||
|
|
||
| $appTester = $this->getApplicationTester(); | ||
| $appTester->run(array_merge(['command' => 'update', '--dry-run' => true], $command)); | ||
|
|
||
| $this->assertSame(trim($expected), trim($appTester->getDisplay())); | ||
| } | ||
|
|
||
| public function provideUpdates(): \Generator | ||
| { | ||
| $rootDepAndTransitiveDep = [ | ||
| 'repositories' => [ | ||
| 'packages' => [ | ||
| 'type' => 'package', | ||
| 'package' => [ | ||
| ['name' => 'root/req', 'version' => '1.0.0', 'require' => ['dep/pkg' => '^1']], | ||
| ['name' => 'dep/pkg', 'version' => '1.0.0'], | ||
| ['name' => 'dep/pkg', 'version' => '1.0.1'], | ||
| ['name' => 'dep/pkg', 'version' => '1.0.2'], | ||
| ], | ||
| ], | ||
| ], | ||
| 'require' => [ | ||
| 'root/req' => '1.*', | ||
| ], | ||
| ]; | ||
|
|
||
| yield 'simple update' => [ | ||
| $rootDepAndTransitiveDep, | ||
| [], | ||
| <<<OUTPUT | ||
| Loading composer repositories with package information | ||
| Updating dependencies | ||
| Lock file operations: 2 installs, 0 updates, 0 removals | ||
| - Locking dep/pkg (1.0.2) | ||
| - Locking root/req (1.0.0) | ||
| Installing dependencies from lock file (including require-dev) | ||
| Package operations: 2 installs, 0 updates, 0 removals | ||
| - Installing dep/pkg (1.0.2) | ||
| - Installing root/req (1.0.0) | ||
| OUTPUT | ||
| ]; | ||
|
|
||
| yield 'update with temporary constraint + --no-install' => [ | ||
| $rootDepAndTransitiveDep, | ||
| ['--with' => ['dep/pkg:1.0.0'], '--no-install' => true], | ||
| <<<OUTPUT | ||
| Loading composer repositories with package information | ||
| Updating dependencies | ||
| Lock file operations: 2 installs, 0 updates, 0 removals | ||
| - Locking dep/pkg (1.0.0) | ||
| - Locking root/req (1.0.0) | ||
| OUTPUT | ||
| ]; | ||
|
|
||
| yield 'update with temporary constraint failing resolution' => [ | ||
| $rootDepAndTransitiveDep, | ||
| ['--with' => ['dep/pkg:^2']], | ||
| <<<OUTPUT | ||
| Loading composer repositories with package information | ||
| Updating dependencies | ||
| Your requirements could not be resolved to an installable set of packages. | ||
| Problem 1 | ||
| - Root composer.json requires root/req 1.* -> satisfiable by root/req[1.0.0]. | ||
| - root/req 1.0.0 requires dep/pkg ^1 -> found dep/pkg[1.0.0, 1.0.1, 1.0.2] but it conflicts with your temporary update constraint (dep/pkg:^2). | ||
| OUTPUT | ||
| ]; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouldn't the unsetting be done separately for each package depending on whether it matches or no ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure.. the package and its aliases are usually connected and have to be all installed or none. So here we keep the whole group if any of the aliased or alias matches the constraint, and if none match the whole thing is removed. I think this is correct.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, indeed