PHPDoc @return fixes

Autocomplete does not work in PHPStorm without this.