Fix cs error introduced after resolving merge conflict with master to 2.6
Fix cs error introduced after resolving merge conflict with master to 2.6

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