CR fix

minkphp · Sep 28, 2023 · 5f52680 · 5f52680
1 parent 9a81918
commit 5f52680
Showing 1 changed file with 21 additions and 33 deletions.
diff --git a/src/WebdriverClassicDriver.php b/src/WebdriverClassicDriver.php
@@ -383,7 +383,9 @@ public function setValue(
                         }
                         return;
                     }
-                    $this->assertString($value, "Value for $widgetType must be a string");
+                    if (!is_string($value)) {
+                        throw new DriverException("Value for $widgetType must be a string");
+                    }
                     $this->selectOptionOnElement($element, $value);
                     return;
 
@@ -395,14 +397,18 @@ public function setValue(
                     throw new DriverException(sprintf($message, $xpath));
 
                 case 'color':
-                    $this->assertString($value, "Value for $widgetType must be a string");
+                    if (!is_string($value)) {
+                        throw new DriverException("Value for $widgetType must be a string");
+                    }
                     // one cannot simply type into a color field, nor clear it
                     $this->setElementDomProperty($element, 'value', $value);
                     break;
 
                 case 'date':
                 case 'time':
-                    $this->assertString($value, "Value for $widgetType must be a string");
+                    if (!is_string($value)) {
+                        throw new DriverException("Value for $widgetType must be a string");
+                    }
                     try {
                         $element->clear();
                         $element->sendKeys($value);
@@ -413,27 +419,35 @@ public function setValue(
                     break;
 
                 case 'checkbox':
-                    $this->assertBool($value, "Value for $widgetType must be a boolean");
+                    if (!is_bool($value)) {
+                        throw new DriverException("Value for $widgetType must be a boolean");
+                    }
                     if ($element->isSelected() xor $value) {
                         $this->clickOnElement($element);
                     }
                     return;
 
                 case 'radio':
-                    $this->assertString($value, "Value for $widgetType must be a string");
+                    if (!is_string($value)) {
+                        throw new DriverException("Value for $widgetType must be a string");
+                    }
                     $this->selectRadioValue($element, $value);
                     return;
 
                 case 'file':
-                    $this->assertString($value, "Value for $widgetType must be a string");
+                    if (!is_string($value)) {
+                        throw new DriverException("Value for $widgetType must be a string");
+                    }
                     $element->sendKeys($value);
                     break;
 
                 case 'text':
                 case 'password':
                 case 'textarea':
                 default:
-                    $this->assertString($value, "Value for $widgetType must be a string");
+                    if (!is_string($value)) {
+                        throw new DriverException("Value for $widgetType must be a string");
+                    }
                     $element->clear();
                     $element->sendKeys($value);
                     break;
@@ -1140,32 +1154,6 @@ private function jsonEncode($value, string $action, string $field): string
         }
     }
 
-    /**
-     * @param mixed $value
-     * @throws DriverException
-     * @phpstan-assert string $value
-     * @todo When switching to PHP 8, this can be replaced with `is_string(..) or throw new DriverException(..);`
-     */
-    private function assertString($value, string $message): void
-    {
-        if (!is_string($value)) {
-            throw new DriverException($message);
-        }
-    }
-
-    /**
-     * @param mixed $value
-     * @throws DriverException
-     * @phpstan-assert bool $value
-     * @todo When switching to PHP 8, this can be replaced with `is_bool(..) or throw new DriverException(..);`
-     */
-    private function assertBool($value, string $message): void
-    {
-        if (!is_bool($value)) {
-            throw new DriverException($message);
-        }
-    }
-
     /**
      * @param mixed $value
      * @throws DriverException