Issue #3322763 by Spokje: Fix PHPStan L2 error "PHPDoc tag @return with type Foo is incompatible with native type void."

(cherry picked from commit 81b8c869)