Consolidate asserts
Merge pull request #5395 from cakephp/3.0-asserts

Consolidate asserts