PHP CodeSniffer fixes

Based on https://github.com/croogo/croogo/pull/177
This patch contains the non-obvious chunks

Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
Minor style fixes
Merge branch '1.6-cs-fixes' into 1.6