Fix PHPStan and PHPCS

Alex Pottrequested to merge
issue/redirect-3567073:3567073-fix-pipeline-on into 8.x-1.x

Closes #3567073

Merge request reports