feat: #3562332 PHPCS and PHPStan fixes

Closes #3562332

Merge request reports

Loading