Resolve #3425412 "Phpstan level 3"

Dave Longrequested to merge
issue/drupal-3425412:3425412-phpstan-level-3 into main

Closes #3425412

Merge request reports