fixed some line wrapping
replaced non-empty array definitions with PHP 5.4 ones in test cases