fix broken composer.json.
Merge branch '7.x-pimple' into 7.x-symfony