Implement PSR-2 code standard.

Signed-off-by: crynobone <crynobone@gmail.com>
Fixed test case due to PSR-0 changes, and add additional test.

Signed-off-by: crynobone <crynobone@gmail.com>