Issue #3378790: Fix phpcs issues

Neha Verma requested to merge issue/cookies-3378790:3378790-fix-phpcs-issues into 2.x Aug 05, 2023