| 
                                                        @@ -86,9 +86,9 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    86
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    86
                                                                                                                                                                                                 | 
                                                                     $choices = $this->choices;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    87
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    87
                                                                                                                                                                                                 | 
                                                                     $errorMessage = 'Value "%s" is invalid';  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    88
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    88
                                                                                                                                                                                                 | 
                                                                     $multiselect = $this->multiselect;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    89
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -        $isAssoc = (bool)count(array_filter(array_keys($this->choices), '\is_string'));  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    89
                                                                                                                                                                                                 | 
                                                            +        $isAssoc = (bool) count(array_filter(array_keys($this->choices), '\is_string'));  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    90
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    90
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    91
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -        return function ($selected) use ($choices, $errorMessage, $multiselect, $isAssoc) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    91
                                                                                                                                                                                                 | 
                                                            +        return function($selected) use ($choices, $errorMessage, $multiselect, $isAssoc) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    92
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    92
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    93
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    93
                                                                                                                                                                                                 | 
                                                                         // Collapse all spaces.  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    94
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    94
                                                                                                                                                                                                 | 
                                                                         $selectedChoices = str_replace(' ', '', $selected); | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -136,7 +136,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    136
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    136
                                                                                                                                                                                                 | 
                                                                             if (false === $result) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    137
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    137
                                                                                                                                                                                                 | 
                                                                                 throw new InvalidArgumentException(sprintf($errorMessage, $value));  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    138
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    138
                                                                                                                                                                                                 | 
                                                                             }  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    139
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -                $multiselectChoices[] = (string)$result;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    139
                                                                                                                                                                                                 | 
                                                            +                $multiselectChoices[] = (string) $result;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    140
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    140
                                                                                                                                                                                                 | 
                                                                         }  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    141
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    141
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    142
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    142
                                                                                                                                                                                                 | 
                                                                         if ($multiselect) { | 
                                                        
                                                                                                                                                
                                         
                                        
                                            
                                                                                                    Please login to merge, or discard this patch.