Issue #3600879: Fix PHPCS and PHPStan errors

Closes #3600879

Merge request reports

Loading