Add composer-dependency-analyser to CI (fix shadow & misplaced dependencies)#2875
Conversation
|
@ondrejmirtes Any comments on this one? I believe it found real issues and thus make sense to keep it in CI to guard that. Also, the package is stable now. |
|
I agree, we could remove composer-require-checker if this one does a better job. But my priority now is to finish and release 1.11 (and I'm travelling to PHP UK this werk) so I'll most likely start processing the backlog of emails (currently 130) after that. |
be668dd to
cb94bd1
Compare
|
@ondrejmirtes Ok, I removed composer-require-checker, updated the tool and fixed one more issue. It is also rebased so it could be merged now if you feel so. |
e15bc23 to
69eda8e
Compare
| "This file is @generated automatically" | ||
| ], | ||
| "content-hash": "bd93faf2a75150f9ba8e41fb86b8c632", | ||
| "content-hash": "2723c5a59596e6ccf2430f75a1fcf36b", |
There was a problem hiding this comment.
What command did you please use to update composer.lock here? I need it so I can replay the changes on 1.11.x
There was a problem hiding this comment.
Just realized this advice is wrong.
Example:
- 1.10.x updates
phpstan/phpdoc-parserfrom 1.25.0 to 1.26.0. - I merge 1.10.x into 1.11.x and get conflict in composer.lock
- I run
git checkout --ours composer.lockto get it look like on top of 1.11.x.
Now I need to rerun the commands that make the lock file being changed in 1.10.x. Running composer update --lock is not sufficient, it's going to keep phpdoc-parser on version 1.25.0 in composer.lock. But I want it to be 1.26.0.
The correct solution is to run composer update phpdoc-parser.
There was a problem hiding this comment.
My working flow:
- I merge all non-conflicting stuff of
composer.lockin PHPStorm merge tool. - The only conflict is the hash, I pick any.
- If not, some package got update on both sides.
- I fix that hash by
composer update --lock
|
Thank you very much! |
Uh oh!
There was an error while loading. Please reload this page.