Sync `composer.json` files content
Merge pull request #437 from stloyd/bugfix/composer

[RFC] Sync `composer.json` files content
Merge pull request #436 from stloyd/bugfix/cs

[WIP] Fix some random CS issues.
Reduce code duplication in DI to maximum.