Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: saeideng <bc75b0164ff947424856ea4996cf622f47f1ad06@users.noreply.github.com>
cakephp/cakephp,CakeDC/cakephp,CakeDC/cakephp,ndm2/cakephp,ndm2/cakephp,CakeDC/cakephp,ADmad/cakephp,cakephp/cakephp,CakeDC/cakephp,ADmad/cakephp,ADmad/cakephp,cakephp/cakephp,cakephp/cakephp,ndm2/cakephp,ndm2/cakephp,ADmad/cakephp