More composer fixes
Updated for upstream changes in whoops 1.0.10
Merging. Fix conflicts.