Change the constructor arguments of the elements to their dependencies

The constructor now receives the driver and the element finder 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->getElementFinder());
         }
 
         return $elements;

src/Element/Element.php

@@ -11,7 +11,6 @@
 namespace Behat\Mink\Element;
 
 use Behat\Mink\Driver\DriverInterface;
-use Behat\Mink\Session;
 
 /**
  * Base element.
@@ -32,15 +31,10 @@ abstract class Element implements ElementInterface
      */
     private $elementFinder;
 
-    /**
-     * Initialize element.
-     *
-     * @param Session $session
-     */
-    public function __construct(Session $session)
+    public function __construct(DriverInterface $driver, ElementFinder $elementFinder)
     {
-        $this->driver = $session->getDriver();
-        $this->elementFinder = $session->getElementFinder();
+        $this->driver = $driver;
+        $this->elementFinder = $elementFinder;
     }
 
     /**

src/Element/NodeElement.php

@@ -12,7 +12,7 @@
 
 use Behat\Mink\Exception\DriverException;
 use Behat\Mink\KeyModifier;
-use Behat\Mink\Session;
+use Behat\Mink\Driver\DriverInterface;
 use Behat\Mink\Exception\ElementNotFoundException;
 
 /**
@@ -30,14 +30,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 ElementFinder   $elementFinder
      */
-    public function __construct($xpath, Session $session)
+    public function __construct($xpath, DriverInterface $driver, ElementFinder $elementFinder)
     {
         $this->xpath = $xpath;
 
-        parent::__construct($session);
+        parent::__construct($driver, $elementFinder);
     }
 
     /**

src/Session.php

@@ -39,7 +39,7 @@ public function __construct(DriverInterface $driver, SelectorsHandler $selectors
     {
         $this->driver = $driver;
         $this->elementFinder = new ElementFinder($driver, $selectorsHandler ?? new SelectorsHandler());
-        $this->page = new DocumentElement($this);
+        $this->page = new DocumentElement($driver, $this->elementFinder);
 
         $driver->setSession($this);
     }

tests/Driver/CoreDriverTest.php

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

tests/Element/DocumentElementTest.php

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

tests/Element/ElementTest.php

@@ -4,19 +4,11 @@
 
 use Behat\Mink\Driver\DriverInterface;
 use Behat\Mink\Element\ElementFinder;
-use Behat\Mink\Session;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 abstract class ElementTest extends TestCase
 {
-    /**
-     * Session.
-     *
-     * @var Session
-     */
-    protected $session;
-
     /**
      * @var DriverInterface&MockObject
      */
@@ -33,10 +25,6 @@ abstract class ElementTest extends TestCase
     protected function prepareSession(): void
     {
         $this->driver = $this->getMockBuilder('Behat\Mink\Driver\DriverInterface')->getMock();
-
         $this->elementFinder = $this->createMock(ElementFinder::class);
-        $this->session = $this->createStub(Session::class);
-        $this->session->method('getDriver')->willReturn($this->driver);
-        $this->session->method('getElementFinder')->willReturn($this->elementFinder);
     }
 }