Fix PHPStan issues

Eelke Blokrequested to merge
issue/fragments-3447537:3447537-fix-phpstan into 2.x

We are replacing some code with stuff that was deprecated in 10.3.

Closes #3447537

Merge request reports