Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Mark Scherer <d2a71913a0aada54968a32b9b8801e7cf923f185@users.noreply.github.com>
ndm2/cakephp,ndm2/cakephp,CakeDC/cakephp,CakeDC/cakephp,ADmad/cakephp,CakeDC/cakephp,ADmad/cakephp,ndm2/cakephp,cakephp/cakephp,ADmad/cakephp,ndm2/cakephp,cakephp/cakephp,ADmad/cakephp,cakephp/cakephp,cakephp/cakephp,CakeDC/cakephp