int vs integer and bool vs boolean

[JN-Jones]

While we used int and bool everywhere, our sniff wants integer and boolean, however that's only checked for variables and not for parameter. IMHO we should try to limit that to only one (which may be hard with the existing sniffs).