Stop prepending the Cancel option to choice lists

[DieterHolvoet]

Problem

A Cancel option is prepended to every choice list, why is this necessary if you can just Ctrl+C to exit like with every other command?

@weitzman had this to say in #4853 (comment):

That cancel choice has been there so long I don't recall its justification. I think you are the first person to actually call it out. I bet others have silently grumbled. Lets discuss in a different PR.

Solution

Stop adding the extra option in DrushStyle::choice.

drush/src/Style/DrushStyle.php

Lines 34 to 44 in b90445c

	public function choice($question, array $choices, $default = null)
	{
	$choices = array_merge(['cancel' => 'Cancel'], $choices) ;
	$choices_values = array_values($choices);
	$return = parent::choice($question, $choices_values, $default);
	if ($return == 'Cancel') {
	throw new UserAbortException();
	} else {
	return array_search($return, $choices);
	}
	}

We cannot completely remove the method since the Cancel option isn't the only change that override does: it also displays the choices as an indexed list instead of a keyed list:

This might be a BC break: if you pass an indexed array as options and you hardcoded the default value to a certain index, you will now have to subtract 1 from that index.