Consolidate with conditions sniff.

Follow up on https://github.com/cakephp/cakephp-codesniffer/pull/114 ,
running the autofixer branch of it.