Fix composer.json, fix trait