Issue #3368001 by emacoti, zarpele: PHPCS fixes

Guido Robertonerequested to merge
issue/pdb-3368001:3368001-phpcs-fixes into 2.x

Closes #3368001

Merge request reports