adopted to latest composer changes