-
Notifications
You must be signed in to change notification settings - Fork 9.4k
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
Fix: Keep packages sorted #10769
Fix: Keep packages sorted #10769
Conversation
composer.json
Outdated
@@ -7,80 +7,83 @@ | |||
"OSL-3.0", | |||
"AFL-3.0" | |||
], | |||
"config": { | |||
"sort-packages": true |
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.
Here's what I ran after adding this section to trigger sorting packages (without updating any dependencies):
$ composer require composer/composer:1.4.1
$ composer require --dev squizlabs/php_codesniffer:3.0.1
composer.json
Outdated
}, | ||
"replace": { | ||
"magento/module-marketplace": "100.3.0-dev", |
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.
Here's what I did after sorting packages in this section using https://plugins.jetbrains.com/plugin/5919-lines-sorter:
- ran
composer validate
- fixed the trailing comma issue
- ran
composer update --lock
For reference, see:
There's quite a bunch of |
76f11e5
to
f91c8ee
Compare
@localheinz if you feel up for it then you could update all the composer.json files that are checked in. |
Thanks for the update @localheinz could you take a moment to look into the conflict on the file |
19c863b
to
e59ef01
Compare
Done! |
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.
A couple of syntax errors, but other than that it looks good.
"magento/magento2-functional-testing-framework": "dev-develop" | ||
"vlucas/phpdotenv": "~2.4", |
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.
Seems to be a miss ,
the line above.
"magento/magento2-functional-testing-framework": "dev-develop" | ||
"vlucas/phpdotenv": "~2.4", |
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.
Seems to be a miss ,
the line above.
app/code/Magento/Vault/composer.json
Outdated
"magento/module-quote": "100.3.*" | ||
"magento/module-sales": "100.3.*", |
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.
Seems to be a miss ,
the line above.
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.
Thank you for catching these, @dmanners!
e59ef01
to
0dd118c
Compare
0dd118c
to
f24b03f
Compare
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.
Changes look good. Will see what the builds say and let you know.
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.
Looks good. I am going to run this through our internal systems.
Thank you, @dmanners and @okorshenko! |
Description
By configuring the
sort-packages
option incomposer.json
a dependency will automatically trigger sorting of the packages in the corresponding
require
require-dev
sections.
Of course, as an alternative to configuring this in
composer.json
, the--sort-packages
flag can be used manually.Keeping these packages sorted has the following advantages:
Since there is no command for adding or removing items to or from the
replace
section, I sorted those manually using the Lines Sorter plugin for PhpStorm.💁♂️ For reference, see
Fixed Issues (if relevant)
n/a
Manual testing scenarios
n/a
Contribution checklist