Decoupled the DriverInterface from the NodeElement

This avoids a circular dependency. The driver interface now returns an
array of XPath for found elements, and Element::find() instantiates the
NodeElement for them.
The driver is now the low level API which does not depend on any other
part of Mink (but used by other parts).

Author: stof

src/Behat/Mink/Driver/CoreDriver.php

@@ -11,7 +11,6 @@
 namespace Behat\Mink\Driver;
 
 use Behat\Mink\Exception\UnsupportedDriverActionException;
-use Behat\Mink\Session;
 
 /**
  * Core driver.
@@ -21,14 +20,6 @@
  */
 abstract class CoreDriver implements DriverInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function setSession(Session $session)
-    {
-        throw new UnsupportedDriverActionException('Setting the session is not supported by %s', $this);
-    }
-
     /**
      * {@inheritdoc}
      */

src/Behat/Mink/Driver/DriverInterface.php

@@ -10,10 +10,8 @@
 
 namespace Behat\Mink\Driver;
 
-use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Exception\DriverException;
 use Behat\Mink\Exception\UnsupportedDriverActionException;
-use Behat\Mink\Session;
 
 /**
  * Driver interface.
@@ -22,13 +20,6 @@
  */
 interface DriverInterface
 {
-    /**
-     * Sets driver's current session.
-     *
-     * @param Session $session
-     */
-    public function setSession(Session $session);
-
     /**
      * Starts driver.
      *
@@ -270,7 +261,7 @@ public function getWindowName();
      *
      * @param string $xpath
      *
-     * @return NodeElement[]
+     * @return string[] An array of XPath queries for the found elements
      *
      * @throws UnsupportedDriverActionException When operation not supported by the driver
      * @throws DriverException                  When the operation cannot be done

src/Behat/Mink/Element/Element.php

@@ -39,17 +39,24 @@ abstract class Element implements ElementInterface
      */
     private $xpathManipulator;
 
+    /**
+     * @var ElementFactory
+     */
+    private $elementFactory;
+
     /**
      * Initialize element.
      *
      * @param DriverInterface  $driver
      * @param SelectorsHandler $selectorsHandler
+     * @param ElementFactory   $elementFactory
      */
-    public function __construct(DriverInterface $driver, SelectorsHandler $selectorsHandler)
+    public function __construct(DriverInterface $driver, SelectorsHandler $selectorsHandler, ElementFactory $elementFactory)
     {
         $this->xpathManipulator = new Manipulator();
         $this->driver = $driver;
         $this->selectorsHandler = $selectorsHandler;
+        $this->elementFactory = $elementFactory;
     }
 
     /**
@@ -110,7 +117,7 @@ public function find($selector, $locator)
     {
         $items = $this->findAll($selector, $locator);
 
-        return count($items) ? current($items) : null;
+        return count($items) ? $items[0] : null;
     }
 
     /**
@@ -130,7 +137,13 @@ public function findAll($selector, $locator)
         $xpath = $this->selectorsHandler->selectorToXpath($selector, $locator);
         $xpath = $this->xpathManipulator->prepend($xpath, $this->getXpath());
 
-        return $this->getDriver()->find($xpath);
+        $elements = array();
+
+        foreach ($this->getDriver()->find($xpath) as $elementXpath) {
+            $elements[] = $this->elementFactory->createNodeElement($elementXpath, $this->driver, $this->selectorsHandler);
+        }
+
+        return $elements;
     }
 
     /**

src/Behat/Mink/Element/ElementFactory.php

@@ -0,0 +1,27 @@
+<?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;
+
+/**
+ * Factory for element node.
+ *
+ * @author Christophe Coevoet <stof@notk.org>
+ */
+class ElementFactory
+{
+    public function createNodeElement($xpath, DriverInterface $driver, SelectorsHandler $selectorsHandler)
+    {
+        return new NodeElement($xpath, $driver, $selectorsHandler, $this);
+    }
+}

src/Behat/Mink/Element/NodeElement.php

@@ -26,15 +26,16 @@ class NodeElement extends TraversableElement
     /**
      * Initializes node element.
      *
-     * @param string           $xpath   element xpath
+     * @param string           $xpath element xpath
      * @param DriverInterface  $driver
      * @param SelectorsHandler $selectorsHandler
+     * @param ElementFactory   $elementFactory
      */
-    public function __construct($xpath, DriverInterface $driver, SelectorsHandler $selectorsHandler)
+    public function __construct($xpath, DriverInterface $driver, SelectorsHandler $selectorsHandler, ElementFactory $elementFactory)
     {
         $this->xpath = $xpath;
 
-        parent::__construct($driver, $selectorsHandler);
+        parent::__construct($driver, $selectorsHandler, $elementFactory);
     }
 
     /**

src/Behat/Mink/Session.php

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