comparison vendor/symfony/console/Question/ChoiceQuestion.php @ 12:7a779792577d

Update Drupal core to v8.4.5 (via Composer)

      * @param array  $choices  The list of available choices
      * @param mixed  $default  The default answer to return
      */
     public function __construct($question, array $choices, $default = null)
     {
+        if (!$choices) {
+            throw new \LogicException('Choice question must have at least 1 choice available.');
+        }
+
         parent::__construct($question, $default);
 
         $this->choices = $choices;
         $this->setValidator($this->getDefaultValidator());
         $this->setAutocompleterValues($choices);

             // Collapse all spaces.
             $selectedChoices = str_replace(' ', '', $selected);
 
             if ($multiselect) {
                 // Check for a separated comma values
-                if (!preg_match('/^[a-zA-Z0-9_-]+(?:,[a-zA-Z0-9_-]+)*$/', $selectedChoices, $matches)) {
+                if (!preg_match('/^[^,]+(?:,[^,]+)*$/', $selectedChoices, $matches)) {
                     throw new InvalidArgumentException(sprintf($errorMessage, $selected));
                 }
                 $selectedChoices = explode(',', $selectedChoices);
             } else {
                 $selectedChoices = array($selected);