Moved the search of elements to an ElementFinder

This extracts the complex logic out of Element::findAll. The logic is
better encapsulated and this keeps the collaborators of the element to a
sane number.
The ElementFactory introduced previously in the refactoring (mostly to
allow mocking the elements properly after moving the instantiation out of
the driver) is now gone. the ElementFinder is responsible for
instantiating the NodeElement.

Author: stof

src/Element/Element.php

@@ -12,8 +12,6 @@
 
 use Behat\Mink\Driver\DriverInterface;
 use Behat\Mink\Exception\ElementNotFoundException;
-use Behat\Mink\Selector\SelectorsHandler;
-use Behat\Mink\Selector\Xpath\Manipulator;
 
 /**
  * Base element.
@@ -30,33 +28,20 @@ abstract class Element implements ElementInterface
     private $driver;
 
     /**
-     * @var SelectorsHandler
+     * @var ElementFinder
      */
-    private $selectorsHandler;
-
-    /**
-     * @var Manipulator
-     */
-    private $xpathManipulator;
-
-    /**
-     * @var ElementFactory
-     */
-    private $elementFactory;
+    private $elementFinder;
 
     /**
      * Initialize element.
      *
-     * @param DriverInterface  $driver
-     * @param SelectorsHandler $selectorsHandler
-     * @param ElementFactory   $elementFactory
+     * @param DriverInterface $driver
+     * @param ElementFinder   $elementFinder
      */
-    public function __construct(DriverInterface $driver, SelectorsHandler $selectorsHandler, ElementFactory $elementFactory)
+    public function __construct(DriverInterface $driver, ElementFinder $elementFinder)
     {
-        $this->xpathManipulator = new Manipulator();
         $this->driver = $driver;
-        $this->selectorsHandler = $selectorsHandler;
-        $this->elementFactory = $elementFactory;
+        $this->elementFinder = $elementFinder;
     }
 
     /**
@@ -125,25 +110,7 @@ public function find($selector, $locator)
      */
     public function findAll($selector, $locator)
     {
-        if ('named' === $selector) {
-            $items = $this->findAll('named_exact', $locator);
-            if (empty($items)) {
-                $items = $this->findAll('named_partial', $locator);
-            }
-
-            return $items;
-        }
-
-        $xpath = $this->selectorsHandler->selectorToXpath($selector, $locator);
-        $xpath = $this->xpathManipulator->prepend($xpath, $this->getXpath());
-
-        $elements = array();
-
-        foreach ($this->getDriver()->find($xpath) as $elementXpath) {
-            $elements[] = $this->elementFactory->createNodeElement($elementXpath, $this->driver, $this->selectorsHandler);
-        }
-
-        return $elements;
+        return $this->elementFinder->findAll($selector, $locator, $this->getXpath());
     }
 
     /**

src/Element/ElementFactory.php

@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Mink package.
+ * (c) Konstantin Kudryashov <ever.zet@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Behat\Mink\Element;
+
+use Behat\Mink\Driver\DriverInterface;
+use Behat\Mink\Selector\SelectorsHandler;
+use Behat\Mink\Selector\Xpath\Manipulator;
+
+class ElementFinder
+{
+    private $driver;
+    private $selectorsHandler;
+    private $xpathManipulator;
+
+    public function __construct(DriverInterface $driver, SelectorsHandler $selectorsHandler = null, Manipulator $xpathManipulator = null)
+    {
+        $this->driver = $driver;
+        $this->selectorsHandler = $selectorsHandler ?: new SelectorsHandler();
+        $this->xpathManipulator = $xpathManipulator ?: new Manipulator();
+    }
+
+    /**
+     * @param string       $selector
+     * @param string|array $locator
+     * @param string       $parentXpath
+     *
+     * @return NodeElement[]
+     */
+    public function findAll($selector, $locator, $parentXpath)
+    {
+        if ('named' === $selector) {
+            $items = $this->findAll('named_exact', $locator, $parentXpath);
+            if (empty($items)) {
+                $items = $this->findAll('named_partial', $locator, $parentXpath);
+            }
+
+            return $items;
+        }
+
+        $xpath = $this->selectorsHandler->selectorToXpath($selector, $locator);
+        $xpath = $this->xpathManipulator->prepend($xpath, $parentXpath);
+
+        $elements = array();
+
+        foreach ($this->driver->find($xpath) as $elementXpath) {
+            $elements[] = new NodeElement($elementXpath, $this->driver, $this);
+        }
+
+        return $elements;
+    }
+}

src/Element/ElementFinder.php

@@ -12,7 +12,6 @@
 
 use Behat\Mink\Driver\DriverInterface;
 use Behat\Mink\Exception\ElementNotFoundException;
-use Behat\Mink\Selector\SelectorsHandler;
 
 /**
  * Page element node.
@@ -26,16 +25,15 @@ class NodeElement extends TraversableElement
     /**
      * Initializes node element.
      *
-     * @param string           $xpath element xpath
-     * @param DriverInterface  $driver
-     * @param SelectorsHandler $selectorsHandler
-     * @param ElementFactory   $elementFactory
+     * @param string          $xpath         element xpath
+     * @param DriverInterface $driver
+     * @param ElementFinder   $elementFinder
      */
-    public function __construct($xpath, DriverInterface $driver, SelectorsHandler $selectorsHandler, ElementFactory $elementFactory)
+    public function __construct($xpath, DriverInterface $driver, ElementFinder $elementFinder)
     {
         $this->xpath = $xpath;
 
-        parent::__construct($driver, $selectorsHandler, $elementFactory);
+        parent::__construct($driver, $elementFinder);
     }
 
     /**

src/Element/NodeElement.php

@@ -11,7 +11,7 @@
 namespace Behat\Mink;
 
 use Behat\Mink\Driver\DriverInterface;
-use Behat\Mink\Element\ElementFactory;
+use Behat\Mink\Element\ElementFinder;
 use Behat\Mink\Selector\SelectorsHandler;
 use Behat\Mink\Element\DocumentElement;
 
@@ -27,31 +27,31 @@ class Session
     private $selectorsHandler;
 
     /**
-     * @var Element\ElementFactory
+     * @var Element\ElementFinder
      */
-    private $elementFactory;
+    private $elementFinder;
 
     /**
      * Initializes session.
      *
      * @param DriverInterface       $driver
      * @param SelectorsHandler|null $selectorsHandler
-     * @param ElementFactory|null   $elementFactory
+     * @param ElementFinder|null    $elementFinder
      */
-    public function __construct(DriverInterface $driver, SelectorsHandler $selectorsHandler = null, ElementFactory $elementFactory = null)
+    public function __construct(DriverInterface $driver, SelectorsHandler $selectorsHandler = null, ElementFinder $elementFinder = null)
     {
         if (null === $selectorsHandler) {
             $selectorsHandler = new SelectorsHandler();
         }
 
-        if (null === $elementFactory) {
-            $elementFactory = new ElementFactory();
+        if (null === $elementFinder) {
+            $elementFinder = new ElementFinder($driver, $selectorsHandler);
         }
 
         $this->driver           = $driver;
         $this->selectorsHandler = $selectorsHandler;
-        $this->elementFactory   = $elementFactory;
-        $this->page             = new DocumentElement($driver, $selectorsHandler, $elementFactory);
+        $this->elementFinder    = $elementFinder;
+        $this->page             = new DocumentElement($driver, $elementFinder);
     }
 
     /**