simplify private

minkphp · Apr 18, 2022 · 2a6eff2 · 2a6eff2
1 parent 91314b2
commit 2a6eff2
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/Element/Element.php b/src/Element/Element.php
@@ -144,12 +144,12 @@ public function waitFor($timeout, $callback)
      *
      * @return NodeElement[]
      */
-    private function findAllWithLimit($selector, $locator, ?int $limit): array
+    private function findAllWithLimit($selector, $locator, bool $firstOnly): array
     {
         if ('named' === $selector) {
-            $items = $this->findAllWithLimit('named_exact', $locator, $limit);
+            $items = $this->findAllWithLimit('named_exact', $locator, $firstOnly);
             if (empty($items)) {
-                $items = $this->findAllWithLimit('named_partial', $locator, $limit);
+                $items = $this->findAllWithLimit('named_partial', $locator, $firstOnly);
             }
 
             return $items;
@@ -158,12 +158,8 @@ private function findAllWithLimit($selector, $locator, ?int $limit): array
         $xpath = $this->selectorsHandler->selectorToXpath($selector, $locator);
         $xpath = $this->xpathManipulator->prepend($xpath, $this->getXpath());
 
-        if ($limit !== null) {
-            if ($limit === 1) {
-                $xpath = '(' . $xpath . ')[1]';
-            } else {
-                $xpath = '(' . $xpath . ')[position() <= ' . $limit . ']';
-            }
+        if ($firstOnly) {
+            $xpath = '(' . $xpath . ')[1]';
         }
 
         return $this->getDriver()->find($xpath);
@@ -174,7 +170,7 @@ private function findAllWithLimit($selector, $locator, ?int $limit): array
      */
     public function find($selector, $locator)
     {
-        $items = $this->findAllWithLimit($selector, $locator, 1);
+        $items = $this->findAllWithLimit($selector, $locator, true);
 
         return count($items) > 0 ? current($items) : null;
     }
@@ -184,7 +180,7 @@ public function find($selector, $locator)
      */
     public function findAll($selector, $locator)
     {
-        return $this->findAllWithLimit($selector, $locator, null);
+        return $this->findAllWithLimit($selector, $locator, false);
     }
 
     /**