No need to check for multiple values when selecting/deselecting by index, as the index is unique

Author: OndraM

lib/WebDriverSelect.php

@@ -97,23 +97,17 @@ public function getFirstSelectedOption()
      */
     public function selectByIndex($index)
     {
-        $matched = false;
         foreach ($this->getOptions() as $option) {
             if ($option->getAttribute('index') === (string) $index) {
                 if (!$option->isSelected()) {
                     $option->click();
-                    if (!$this->isMultiple()) {
-                        return;
-                    }
                 }
-                $matched = true;
+
+                return;
             }
         }
-        if (!$matched) {
-            throw new NoSuchElementException(
-                sprintf('Cannot locate option with index: %d', $index)
-            );
-        }
+
+        throw new NoSuchElementException(sprintf('Cannot locate option with index: %d', $index));
     }
 
     /**
@@ -262,8 +256,12 @@ public function deselectByIndex($index)
         }
 
         foreach ($this->getOptions() as $option) {
-            if ($option->getAttribute('index') === (string) $index && $option->isSelected()) {
-                $option->click();
+            if ($option->getAttribute('index') === (string) $index) {
+                if ($option->isSelected()) {
+                    $option->click();
+                }
+
+                return;
             }
         }
     }