3550bdcb67
Composer was complaining about "composer.json" being outdated, and it didn't want to install PHPUnit, even though it was listed in compose.lock EDIT: While rebasing I mostly reverted most of my changes to instead use the upstream changes from main.