Revert "Revert "PSR2""

This reverts commit 5c16d3aad8c279a56a323e26bcea771bf7640498.