Fix failing tests.
Fix failing tests.

Refs GH-1307

kumamidori/cakephp,jerems02/cakephp,tenkoma/cakephp,mvdriel/cakephp,kumamidori/cakephp,cakephp/cakephp,HavokInspiration/cakephp,timhoeppner/cakephp,ADmad/cakephp,pbaire/cakephp,jeffblack360/cakephp,tisu2tisu/cakephp,justinyost/cakephp,ndm2/cakephp,dkarvounaris/cakephp,tenkoma/cakephp,davidyell/cakephp,dakota/cakephp,jerems02/cakephp,garethellis36/cakephp,michaelze/cakephp,timhoeppner/cakephp,ADmad/cakephp,yinhe007/cakephp,berrygoudswaard/cakephp,thinkingmedia/cakephp,et304383/passbolt_api,adopico/cakephp,tgr0ss/cakephp,Phillaf/cakephp,web-player/cakephp,berrygoudswaard/cakephp,cakephp-fr/cakephp,HavokInspiration/cakephp,CakeDC/cakephp,mvdriel/cakephp,CakeDC/cakephp,nrother/cakephp,ndm2/cakephp,dkarvounaris/cakephp,akintoey/cakephp,eboominathan/cakephp,jeffblack360/cakephp,dkarvounaris/cakephp,tisu2tisu/cakephp,gmponos/cakephp,michaelze/cakephp,cakephp-fr/cakephp,kumamidori/cakephp,davidyell/cakephp,justinyost/cakephp,ADmad/cakephp,CVO-Technologies/cakephp,elboletaire/cakephp,davidyell/cakephp,ADmad/cakephp,burriko/cakephp,et304383/passbolt_api,mvdriel/cakephp,eboominathan/cakephp,bravo-kernel/cakephp,jjj117/cakephp,Balachan27/cakephp,nrother/cakephp,ndm2/cakephp,bravo-kernel/cakephp,khoimt/cakephp-study,ionas/cakephp,michaelze/cakephp,dakota/cakephp,HavokInspiration/cakephp,web-player/cakephp,khoimt/cakephp-study,erikfig/cakephp,tenkoma/cakephp,eboominathan/cakephp,CVO-Technologies/cakephp,Balachan27/cakephp,adopico/cakephp,yinhe007/cakephp,thinkingmedia/cakephp,garethellis36/cakephp,garethellis36/cakephp,petteyg/cakephp,pbaire/cakephp,bravo-kernel/cakephp,khoimt/cakephp-study,et304383/passbolt_api,thinkingmedia/cakephp,erikfig/cakephp,eryw/cakephp,CakeDC/cakephp,Phillaf/cakephp,et304383/passbolt_api,mvdriel/cakephp,erikfig/cakephp,timhoeppner/cakephp,burriko/cakephp,CakeDC/cakephp,cakephp/cakephp,nrother/cakephp,dakota/cakephp,gmponos/cakephp,petteyg/cakephp,petteyg/cakephp,elboletaire/cakephp,berrygoudswaard/cakephp,ndm2/cakephp,jjj117/cakephp,garethellis36/cakephp,Phillaf/cakephp,cakephp/cakephp,tgr0ss/cakephp,adopico/cakephp,Balachan27/cakephp,petteyg/cakephp,ionas/cakephp,cakephp-fr/cakephp,jjj117/cakephp,web-player/cakephp,jerems02/cakephp,akintoey/cakephp,tgr0ss/cakephp,akintoey/cakephp,gmponos/cakephp,dakota/cakephp,cakephp/cakephp,jeffblack360/cakephp,pbaire/cakephp,burriko/cakephp,justinyost/cakephp,yinhe007/cakephp,eryw/cakephp,eryw/cakephp,ionas/cakephp,CVO-Technologies/cakephp,et304383/passbolt_api,tisu2tisu/cakephp,tenkoma/cakephp,elboletaire/cakephp