Issue #3554659: Fix phpdoc part 2

Michael Strelanrequested to merge
issue/drupal-3554659:3554659-phpdoc-part2 into 11.x

Closes #3554659

Merge request reports