Include return value when generating scope methods

It's handy to specify return values in phpDoc comments. This patch sets the return value to the containing class.