Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Dependency patch resolution #547

Merged
merged 7 commits into from
Feb 14, 2024
Merged

Dependency patch resolution #547

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4c645c5
Draft of simplified dependency patch resolution
cweagans Feb 13, 2024
5131800
Small cleanups
cweagans Feb 13, 2024
077e67f
We have three now :)
cweagans Feb 13, 2024
1158fa3
Add tests
cweagans Feb 13, 2024
c19a396
Fix tests
cweagans Feb 13, 2024
68c371c
Docs updates
cweagans Feb 14, 2024
5d52614
Add test for disabling the dependency patches resolver + fix a bug fo…
cweagans Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix tests
  • Loading branch information
@cweagans
cweagans committed Feb 14, 2024
commit c19a396a22a76ac17c75a3340a371e4f3c320a92
4 changes: 2 additions & 2 deletions tests/acceptance/CommandsCept.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
$I->runComposerCommand('install', ['-vvv']);

$I->openFile('patches.lock.json');
$I->seeInThisFile('725f2631cb6a92c8c3ffc2e396e89f73b726869131d4c4d2a5903aae6854a260');
$I->seeInThisFile('4dc9f5061770f76d203942a3a7f211fe6bbcbde58a185605afc038002f538c9f');

$I->runShellCommand('composer patches-relock');
$I->openFile('patches.lock.json');
$I->seeInThisFile('725f2631cb6a92c8c3ffc2e396e89f73b726869131d4c4d2a5903aae6854a260');
$I->seeInThisFile('4dc9f5061770f76d203942a3a7f211fe6bbcbde58a185605afc038002f538c9f');

$I->runShellCommand('composer patches-repatch 2>&1');
$I->canSeeInShellOutput('Removing cweagans/composer-patches-testrepo');
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/CustomComposerJsonFilenameCept.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
$I->canSeeFileFound('./composer-a-patches.lock.json');

$I->openFile('composer-a-patches.lock.json');
$I->seeInThisFile('725f2631cb6a92c8c3ffc2e396e89f73b726869131d4c4d2a5903aae6854a260');
$I->seeInThisFile('4dc9f5061770f76d203942a3a7f211fe6bbcbde58a185605afc038002f538c9f');

$I->deleteFile('composer-a-patches.lock.json');
$I->runShellCommand('composer patches-relock');
$I->canSeeFileFound('./composer-a-patches.lock.json');
$I->openFile('composer-a-patches.lock.json');
$I->seeInThisFile('725f2631cb6a92c8c3ffc2e396e89f73b726869131d4c4d2a5903aae6854a260');
$I->seeInThisFile('4dc9f5061770f76d203942a3a7f211fe6bbcbde58a185605afc038002f538c9f');

// Clean up so other tests don't fail.
putenv('COMPOSER');
4 changes: 3 additions & 1 deletion tests/acceptance/DependencyPatchesCept.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@
$I->runComposerCommand('install', ['-vvv']);
$I->canSeeInComposerOutput('Resolving patches from dependencies');
$I->canSeeInComposerOutput('Patching cweagans/composer-patches-testrepo');
$I->seeFileFound('OneMoreTest.php', 'src');
$I->seeFileFound('OneMoreTest.php', 'vendor/cweagans/composer-patches-testrepo/src');
$I->openFile('patches.lock.json');
$I->seeInThisFile('5f539e947d097d79e97006f958916c362df0fd19ba7011b1b54b69f02d5f9958');
4 changes: 3 additions & 1 deletion tests/acceptance/DependencyPatchesDuplicatePatchCept.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@
$I->canSeeInComposerOutput('Resolving patches from root package');
$I->canSeeInComposerOutput('Resolving patches from dependencies');
$I->canSeeInComposerOutput('Patching cweagans/composer-patches-testrepo');
$I->seeFileFound('OneMoreTest.php', 'src');
$I->seeFileFound('OneMoreTest.php', 'vendor/cweagans/composer-patches-testrepo/src');
$I->openFile('patches.lock.json');
$I->seeInThisFile('4dc9f5061770f76d203942a3a7f211fe6bbcbde58a185605afc038002f538c9f');