ZF-3257, ZF11385: CS cleanup of patch
ZF-3257, ZF11385: CS cleanup of patch

- CS cleanup
- Cleaned up logic structures; if returning from within an if{} block, no need
  for an else{}.

zendframework/zend-json,Maks3w/zend-json,MadCat34/zend-json