Use dependency injection when possible

I believe this have all been cleaned up with the efforts of the other ticket about PHPCS.
I will review and comment further.

@aastrong, yes, you can fix these issue under the phpcs. But, when ever we create dependency injection issue. That you need to fix only dependency injection only. Not all thing which is relate to coding standard.

Okay understood.
I'll review where things are at.

And in the future, I'll ensure fixes for dependency injection are fixed on their own and not lumped into other issues.