#1146 - Improve phing and composer relationship