2.4 return early

My new sniff found a few "return early" occurances, that have an else block afterwards that is not necessary. ( https://github.com/cakephp/cakephp-codesniffer/issues/46 )