Replacement for #3940
Fixed docblocks
Added in choice method.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Return the index instead of the choice.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Merge pull request #3964 from GrahamCampbell/4.1-docblocks

Fixed Docblocks
Merge pull request #3965 from jasonlewis/feature/command-choice

[feature] Command::choice method
Merge pull request #3963 from GrahamCampbell/4.1-fix

Replacement for #3940