Merge branch '4.2'

* 4.2:
  refactored code

Author: fabpot

Helper/QuestionHelper.php

@@ -333,19 +333,17 @@ function ($match) use ($ret) {
 
     private function mostRecentlyEnteredValue($entered)
     {
-        $tempEntered = $entered;
-
         // Determine the most recent value that the user entered
-        if (false !== strpos($entered, ',')) {
-            $choices = explode(',', $entered);
-            $lastChoice = trim($choices[\count($choices) - 1]);
+        if (false === strpos($entered, ',')) {
+            return $entered;
+        }
 
-            if (\strlen($lastChoice) > 0) {
-                $tempEntered = $lastChoice;
-            }
+        $choices = explode(',', $entered);
+        if (\strlen($lastChoice = trim($choices[\count($choices) - 1])) > 0) {
+            return $lastChoice;
         }
 
-        return $tempEntered;
+        return $entered;
     }
 
     /**