Changed the constructor arguments of the elements to their dependencies

The constructor now receives the driver and the selectors handler instead
of the session.

Author: stof

src/Driver/CoreDriver.php

@@ -108,7 +108,7 @@ public function find($xpath)
         $elements = array();
 
         foreach ($this->findElementXpaths($xpath) as $xpath) {
-            $elements[] = new NodeElement($xpath, $this->session);
+            $elements[] = new NodeElement($xpath, $this, $this->session->getSelectorsHandler());
         }
 
         return $elements;

src/Element/Element.php

@@ -13,7 +13,6 @@
 use Behat\Mink\Driver\DriverInterface;
 use Behat\Mink\Selector\SelectorsHandler;
 use Behat\Mink\Selector\Xpath\Manipulator;
-use Behat\Mink\Session;
 
 /**
  * Base element.
@@ -42,14 +41,14 @@ abstract class Element implements ElementInterface
     /**
      * Initialize element.
      *
-     * @param Session $session
+     * @param DriverInterface  $driver
+     * @param SelectorsHandler $selectorsHandler
      */
-    public function __construct(Session $session)
+    public function __construct(DriverInterface $driver, SelectorsHandler $selectorsHandler)
     {
         $this->xpathManipulator = new Manipulator();
-
-        $this->driver = $session->getDriver();
-        $this->selectorsHandler = $session->getSelectorsHandler();
+        $this->driver = $driver;
+        $this->selectorsHandler = $selectorsHandler;
     }
 
     /**

src/Element/NodeElement.php

@@ -12,8 +12,9 @@
 
 use Behat\Mink\Exception\DriverException;
 use Behat\Mink\KeyModifier;
-use Behat\Mink\Session;
+use Behat\Mink\Driver\DriverInterface;
 use Behat\Mink\Exception\ElementNotFoundException;
+use Behat\Mink\Selector\SelectorsHandler;
 
 /**
  * Page element node.
@@ -30,14 +31,15 @@ class NodeElement extends TraversableElement
     /**
      * Initializes node element.
      *
-     * @param string  $xpath   element xpath
-     * @param Session $session session instance
+     * @param string           $xpath   element xpath
+     * @param DriverInterface  $driver
+     * @param SelectorsHandler $selectorsHandler
      */
-    public function __construct($xpath, Session $session)
+    public function __construct($xpath, DriverInterface $driver, SelectorsHandler $selectorsHandler)
     {
         $this->xpath = $xpath;
 
-        parent::__construct($session);
+        parent::__construct($driver, $selectorsHandler);
     }
 
     /**

src/Session.php

@@ -50,7 +50,7 @@ public function __construct(DriverInterface $driver, SelectorsHandler $selectors
 
         $this->driver = $driver;
         $this->selectorsHandler = $selectorsHandler;
-        $this->page = new DocumentElement($this);
+        $this->page = new DocumentElement($driver, $selectorsHandler);
     }
 
     /**

tests/Driver/CoreDriverTest.php

@@ -3,6 +3,7 @@
 namespace Behat\Mink\Tests\Driver;
 
 use Behat\Mink\Element\NodeElement;
+use Behat\Mink\Selector\SelectorsHandler;
 use PHPUnit\Framework\TestCase;
 
 class CoreDriverTest extends TestCase
@@ -30,6 +31,8 @@ public function testCreateNodeElements()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $session->method('getSelectorsHandler')->willReturn($this->createMock(SelectorsHandler::class));
+
         $driver->setSession($session);
 
         $driver->expects($this->once())

tests/Element/DocumentElementTest.php

@@ -19,7 +19,7 @@ class DocumentElementTest extends ElementTest
     protected function prepareSession(): void
     {
         parent::prepareSession();
-        $this->document = new DocumentElement($this->session);
+        $this->document = new DocumentElement($this->driver, $this->selectors);
     }
 
     public function testFindAll()

tests/Element/ElementTest.php

@@ -3,20 +3,12 @@
 namespace Behat\Mink\Tests\Element;
 
 use Behat\Mink\Driver\DriverInterface;
-use Behat\Mink\Session;
 use Behat\Mink\Selector\SelectorsHandler;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 abstract class ElementTest extends TestCase
 {
-    /**
-     * Session.
-     *
-     * @var Session
-     */
-    protected $session;
-
     /**
      * @var DriverInterface&MockObject
      */
@@ -35,12 +27,7 @@ abstract class ElementTest extends TestCase
     protected function prepareSession(): void
     {
         $this->driver = $this->getMockBuilder('Behat\Mink\Driver\DriverInterface')->getMock();
-        $this->driver
-            ->expects($this->once())
-            ->method('setSession');
-
         $this->selectors = $this->getMockBuilder('Behat\Mink\Selector\SelectorsHandler')->getMock();
-        $this->session = new Session($this->driver, $this->selectors);
     }
 
     protected function mockNamedFinder(string $xpath, array $results, array $locator, int $times = 2): void