fix PHP 5.5 build
Some cosmetic CS changes to keep it all the same.
Merged pull request #51
Merge branch 'xdebug_2_2'