From a93b8e10f5954be0853eec693c13e84c4bd9e6f2 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Fri, 15 Dec 2017 11:24:35 -0800
Subject: Kanboard requires at least PHP 5.6 now

---
 vendor/symfony/console/Question/ChoiceQuestion.php | 24 ++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'vendor/symfony/console/Question/ChoiceQuestion.php')

diff --git a/vendor/symfony/console/Question/ChoiceQuestion.php b/vendor/symfony/console/Question/ChoiceQuestion.php
index 2c40638d..46cc72a3 100644
--- a/vendor/symfony/console/Question/ChoiceQuestion.php
+++ b/vendor/symfony/console/Question/ChoiceQuestion.php
@@ -26,14 +26,16 @@ class ChoiceQuestion extends Question
     private $errorMessage = 'Value "%s" is invalid';
 
     /**
-     * Constructor.
-     *
      * @param string $question The question to ask to the user
      * @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;
@@ -58,7 +60,7 @@ class ChoiceQuestion extends Question
      *
      * @param bool $multiselect
      *
-     * @return ChoiceQuestion The current instance
+     * @return $this
      */
     public function setMultiselect($multiselect)
     {
@@ -68,6 +70,16 @@ class ChoiceQuestion extends Question
         return $this;
     }
 
+    /**
+     * Returns whether the choices are multiselect.
+     *
+     * @return bool
+     */
+    public function isMultiselect()
+    {
+        return $this->multiselect;
+    }
+
     /**
      * Gets the prompt for choices.
      *
@@ -83,7 +95,7 @@ class ChoiceQuestion extends Question
      *
      * @param string $prompt
      *
-     * @return ChoiceQuestion The current instance
+     * @return $this
      */
     public function setPrompt($prompt)
     {
@@ -99,7 +111,7 @@ class ChoiceQuestion extends Question
      *
      * @param string $errorMessage
      *
-     * @return ChoiceQuestion The current instance
+     * @return $this
      */
     public function setErrorMessage($errorMessage)
     {
@@ -127,7 +139,7 @@ class ChoiceQuestion extends Question
 
             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);
-- 
cgit v1.2.3