Fix PHPStan issues

I'll suggest we should add minimum drupal version constraint to D10.3 or add @phpstan-ignore-next-line above phpstan smell lines

@ankitv18 sorry I was already working on this and raised the minimum already - which imo is fine as 10.3 is not supported. I force pushed because your changes are now unnecessary and other changes are.