[Common 2.4+] DCOM-96 compliance as of doctrine/common#168

Followup for #445 (branch was messed up) (needs `"doctrine/common": "2.4"` to work, so the build won't pass for now)