Renaming reformatting function to better express its purpose, also
making it a real method instead of a closure as there was no need for it
to be one
Merge branch '3.0-model' of github.com:cakephp/cakephp into 3.0-model