From f5e166d936d186f3c04845abd6b64a739d89534d Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Wed, 21 Feb 2024 10:44:07 -0500
Subject: [PATCH] feat: remove `behat/mink` requirement and add new selector
 API (#125)

---
 .github/workflows/ci.yml                      |  21 +-
 .gitignore                                    |   1 +
 README.md                                     | 132 +++-
 attachment.zip                                | Bin 182 -> 0 bytes
 composer.json                                 |  26 +-
 phpstan-baseline.neon                         | 142 ----
 phpstan.neon                                  |   3 -
 src/Browser.php                               | 336 ++++----
 src/Browser/Assertion/SameUrlAssertion.php    |  34 +-
 src/Browser/Dumper.php                        |  29 +
 src/Browser/HttpOptions.php                   |   2 +-
 src/Browser/Json.php                          |  19 +
 src/Browser/KernelBrowser.php                 | 178 ++++-
 src/Browser/PantherBrowser.php                |  96 ++-
 src/Browser/Session.php                       | 176 +----
 src/Browser/Session/Assert.php                |  51 --
 src/Browser/Session/Driver.php                |  72 --
 .../Session/Driver/BrowserKitDriver.php       | 729 ------------------
 src/Browser/Session/Driver/PantherDriver.php  | 389 ----------
 src/Browser/Session/KernelSession.php         | 258 +++++++
 src/Browser/Session/PantherSession.php        | 162 ++++
 tests/BrowserTests.php                        |  56 +-
 tests/Fixture/files/page1.html                |  39 +-
 tests/KernelBrowserTests.php                  |  27 +-
 24 files changed, 1168 insertions(+), 1810 deletions(-)
 delete mode 100644 attachment.zip
 delete mode 100644 phpstan-baseline.neon
 create mode 100644 src/Browser/Dumper.php
 delete mode 100644 src/Browser/Session/Assert.php
 delete mode 100644 src/Browser/Session/Driver.php
 delete mode 100644 src/Browser/Session/Driver/BrowserKitDriver.php
 delete mode 100644 src/Browser/Session/Driver/PantherDriver.php
 create mode 100644 src/Browser/Session/KernelSession.php
 create mode 100644 src/Browser/Session/PantherSession.php

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a4175fe..3cc234a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,26 @@ on:
 
 jobs:
   test:
-    uses: zenstruck/.github/.github/workflows/php-test-symfony.yml@main
+    name: PHP ${{ matrix.php }}, SF ${{ matrix.symfony }} - ${{ matrix.deps }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php: [8.1, 8.2, 8.3]
+        deps: [highest]
+        symfony: [6.4.*, 7.0.*]
+        include:
+          - php: 8.1
+            deps: lowest
+            symfony: '*'
+        exclude:
+          - php: 8.1
+            symfony: 7.0.*
+    steps:
+      - uses: zenstruck/.github/actions/php-test-symfony@main
+        with:
+          php: ${{ matrix.php }}
+          symfony: ${{ matrix.symfony }}
+          deps: ${{ matrix.deps }}
 
   code-coverage:
     uses: zenstruck/.github/.github/workflows/php-coverage-codecov.yml@main
diff --git a/.gitignore b/.gitignore
index aa58d4a..e942df1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,6 @@
 /build/
 /var/
 /drivers/
+/attachment.zip
 /.php-cs-fixer.cache
 /.phpunit.result.cache
diff --git a/README.md b/README.md
index 9bc9a0d..cdd1b7a 100644
--- a/README.md
+++ b/README.md
@@ -354,7 +354,6 @@ previous request didn't perform any security-related operations. Possible soluti
    for all requests removing the need to ever call `->withProfiling()` but can slow down
    your tests.
 
-
 #### HTTP Requests
 
 The _KernelBrowser_ can be used for testing API endpoints. The following http methods are available:
@@ -411,7 +410,7 @@ $browser
 Make assertions about json responses using [JMESPath expressions](https://jmespath.org/)
 See the [JMESPath Tutorials](https://jmespath.org/tutorial.html) to learn more.
 
-> **Note**
+> [!NOTE]
 > `mtdowling/jmespath.php` is required: `composer require --dev mtdowling/jmespath.php`.
 
 ```php
@@ -457,7 +456,7 @@ $json = $browser
 ;
 ```
 
-> **Note**
+> [!NOTE]
 > See the [full `zenstruck/assert` expectation API documentation](https://github.com/zenstruck/assert#expectation-api)
 > to see all the methods available on `Zenstruck\Browser\Json`.
 
@@ -543,6 +542,126 @@ class MyTest extends PantherTestCase
 }
 ```
 
+### Advanced DOM Selectors
+
+Any browser method that accepts a `$selector` argument can be one of the following types:
+
+1. `string` - [_auto selector_](#auto-string-selector)
+2. `Zenstruck\Dom\Selector` - [_selector object_](#selector-object)
+3. `callable` - [_callable selector_](#callable-selector)
+
+> [!NOTE]
+> Most [`PantherBrowser`](#pantherbrowser) specific methods that accept a `$selector`
+> argument only accept a string that's specific to the Panther client.
+
+#### Auto (`string`) Selector
+
+A `string` is considered an auto selector and tries to find the DOM node using the following
+strategies in order (first strategy to find a node wins):
+
+1. **CSS**: Try to find _any node_ using `$selector` as CSS selector string.
+2. **Button**: Try to find `<button>` tag with value (or image button `alt` value) matching `$selector`.
+3. **Link**: Try to find `<a>` tag with value (or `title`, or image link `alt` value) matching `$selector`.
+4. **Image**: Try to find `<img>` tag with `alt` attribute matching `$selector`.
+5. **ID**: Try to find _any node_ using `$selector` as node id.
+6. **Field by Name**: Try to find _form field_ using `$selector` as name.
+7. **Field by Label**: Try to find _form field_ using `$selector` as `<label>` name.
+8. _(fail)_
+
+The auto selector is the most flexible but can return a node you don't expect. In this case,
+you can use the [`Selector` object](#selector-object) or [`callable` selector](#callable-selector)
+to be more specific.
+
+#### `Selector` Object
+
+If you are having trouble finding a node using the above _auto_ strategy, you can use
+each of the strategies independently:
+
+```php
+use Zenstruck\Dom\Selector;
+
+/** @var \Zenstruck\Browser $browser */
+
+$browser
+    ->assertSeeElement(Selector::css('.foo')) // "CSS" strategy
+    ->assertSeeElement(Selector::link('foo')) // "Link" strategy
+    ->assertSeeElement(Selector::button('foo')) // "Button" strategy
+    ->assertSeeElement(Selector::image('foo')) // "Image" strategy
+    ->assertSeeElement(Selector::id('foo')) // "ID" strategy
+    ->assertSeeElement(Selector::fieldForName('foo')) // "Field for Name" strategy
+    ->assertSeeElement(Selector::fieldForLabel('foo')) // "Field for Label" strategy
+    ->assertSeeElement(Selector::xpath('descendant-or-self::body/foo')) // "XPath" strategy
+;
+```
+
+##### Compound Selectors
+
+The `Selector` object also allows you to combine multiple strategies into a single selector.
+These re-arrange the strategy priority of the auto selector:
+
+```php
+use Zenstruck\Dom\Selector;
+
+/** @var \Zenstruck\Browser $browser */
+
+$browser
+    ->assertSeeElement(Selector::clickable('foo')) // "Button", "Link", "ID", "CSS", "Image", "Field by Name", "Field by Label" strategy order
+    ->assertSeeElement(Selector::formField('foo')) // "Field by Name", "Field by Label", "ID", "CSS" strategy order
+;
+```
+
+#### `callable` Selector
+
+For a _hard-to-find_ node, you can use a `callable` selector to find the node:
+
+```php
+use Zenstruck\Dom;
+use Zenstruck\Dom\Selector;
+
+/** @var \Zenstruck\Browser $browser */
+
+$browser->assertSeeElement(function(Dom $dom) {
+    return $dom->find('.product-table td:contains("Product 1")')
+        ->ancestor('tr')
+        ->descendant(Selector::link('Edit')) // can nest selectors
+    ;
+});
+```
+
+The callable must accept a `Zenstruck\Dom` instance and return
+`Zenstruck\Dom\Node|\Zenstruck\Dom\Node|Symfony\Component\DomCrawler\Crawler|null`.
+
+##### Reusable `callable` Selectors
+
+If you find yourself using a similar [`callable` selector](#callable-selector) in multiple places,
+you can wrap it up into your own selector object:
+
+```php
+use Zenstruck\Dom;
+use Zenstruck\Dom\Node;
+
+class ProductLinkSelector
+{
+    public function __construct(private string $productName, private string $linkName)
+    {
+    }
+
+    public function __invoke(Dom $dom): ?Node
+    {
+        return $dom->find(\sprintf('.product-table td:contains("%s")', $this->productName))
+            ->ancestor('tr')
+            ?->descendant(Selector::link($this->linkName))
+        ;
+    }
+}
+
+// ...
+
+/** @var \Zenstruck\Browser $browser */
+
+$browser->assertSeeElement(ProductLinkSelector('Product 1', 'Edit'));
+```
+
 ## Configuration
 
 There are several environment variables available to configure:
@@ -822,9 +941,10 @@ Then, depending on the implementation you extended from, set the appropriate env
 
 For the example above, you would set `KERNEL_BROWSER_CLASS=App\Tests\AppBrowser`.
 
-**TIP**: Create a base functional test case so all your tests can use your
-custom browser and use the `@method` annotation to ensure your tests can
-autocomplete your custom methods:
+> [!TIP]
+> Create a base functional test case so all your tests can use your
+> custom browser and use the `@method` annotation to ensure your tests can
+> autocomplete your custom methods:
 
 ```php
 namespace App\Tests;
diff --git a/attachment.zip b/attachment.zip
deleted file mode 100644
index e6ebe532758411c348ef9485ecec1bb071e64f6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 182
zcmWIWW@h1HW&nYXkTC5jGkQgUOc3S+;>41Y#N>?J)VvbCl8O=pPa!!!uLLMs%oX6x
z$Yjrq%LEmm86cq0u%r=0BTN99$Hkxk5@cXxkN}b!lU!VHGBW5sN(R$Vet<VC8$=Bw
MLjsWD0OBwJ0J_^InE(I)

diff --git a/composer.json b/composer.json
index 1abf15f..a2ee520 100644
--- a/composer.json
+++ b/composer.json
@@ -12,25 +12,25 @@
         }
     ],
     "require": {
-        "php": ">=8.0",
-        "behat/mink": "^1.8",
-        "symfony/browser-kit": "^5.4|^6.0|^7.0",
-        "symfony/css-selector": "^5.4|^6.0|^7.0",
-        "symfony/dom-crawler": "^5.4|^6.0|^7.0",
-        "symfony/framework-bundle": "^5.4|^6.0|^7.0",
-        "zenstruck/assert": "^1.1",
-        "zenstruck/callback": "^1.4.2"
+        "php": ">=8.1",
+        "symfony/browser-kit": "^6.4|^7.0",
+        "symfony/css-selector": "^6.4|^7.0",
+        "symfony/dom-crawler": "^6.4|^7.0",
+        "symfony/framework-bundle": "^6.4|^7.0",
+        "zenstruck/assert": "^1.4",
+        "zenstruck/callback": "^1.4.2",
+        "zenstruck/dom": "^1.0"
     },
     "require-dev": {
         "dbrekelmans/bdi": "^1.0",
-        "justinrainbow/json-schema": "^5.2",
+        "justinrainbow/json-schema": "^5.2.13",
         "mtdowling/jmespath.php": "^2.6",
         "phpstan/phpstan": "^1.4",
-        "phpunit/phpunit": "^9.5|^10.4",
-        "symfony/mime": "^5.4|^6.0|^7.0",
-        "symfony/panther": "^1.1|^2.0.1",
+        "phpunit/phpunit": "^9.6|^10.4",
+        "symfony/mime": "^6.4|^7.0",
+        "symfony/panther": "^2.1.0",
         "symfony/phpunit-bridge": "^6.0|^7.0",
-        "symfony/security-bundle": "^5.4|^6.0|^7.0",
+        "symfony/security-bundle": "^6.4|^7.0",
         "zenstruck/foundry": "^1.30"
     },
     "suggest": {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
deleted file mode 100644
index 0add98c..0000000
--- a/phpstan-baseline.neon
+++ /dev/null
@@ -1,142 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Method Zenstruck\\\\Browser\\:\\:assertNotOn\\(\\) has parameter \\$parts with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\:\\:assertOn\\(\\) has parameter \\$parts with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\:\\:selectField\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\:\\:selectFieldOptions\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\Assertion\\\\SameUrlAssertion\\:\\:__construct\\(\\) has parameter \\$partsToMatch with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/Assertion/SameUrlAssertion.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\Assertion\\\\SameUrlAssertion\\:\\:context\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/Assertion/SameUrlAssertion.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\Assertion\\\\SameUrlAssertion\\:\\:parseUrl\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/Assertion/SameUrlAssertion.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\Assertion\\\\SameUrlAssertion\\:\\:parseUrl\\(\\) should return array but returns array\\<string, int\\|string\\>\\|false\\.$#"
-			count: 1
-			path: src/Browser/Assertion/SameUrlAssertion.php
-
-		-
-			message: "#^Parameter \\#1 \\$array of function array_keys expects array, array\\<string, int\\|string\\>\\|false given\\.$#"
-			count: 1
-			path: src/Browser/Assertion/SameUrlAssertion.php
-
-		-
-			message: "#^Property Zenstruck\\\\Browser\\\\Assertion\\\\SameUrlAssertion\\:\\:\\$partsToMatch type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/Assertion/SameUrlAssertion.php
-
-		-
-			message: "#^Call to an undefined method object\\:\\:getToken\\(\\)\\.$#"
-			count: 1
-			path: src/Browser/KernelBrowser.php
-
-		-
-			message: "#^Cannot call method getUserIdentifier\\(\\) on Symfony\\\\Component\\\\Security\\\\Core\\\\Authentication\\\\Token\\\\TokenInterface\\|null\\.$#"
-			count: 1
-			path: src/Browser/KernelBrowser.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\KernelBrowser\\:\\:delete\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/KernelBrowser.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\KernelBrowser\\:\\:get\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/KernelBrowser.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\KernelBrowser\\:\\:patch\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/KernelBrowser.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\KernelBrowser\\:\\:post\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/KernelBrowser.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\KernelBrowser\\:\\:put\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/KernelBrowser.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\KernelBrowser\\:\\:request\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/KernelBrowser.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\Session\\\\Driver\\\\BrowserKitDriver\\:\\:getFormField\\(\\) should return Symfony\\\\Component\\\\DomCrawler\\\\Field\\\\FormField but returns array\\<Symfony\\\\Component\\\\DomCrawler\\\\Field\\\\FormField\\>\\|Symfony\\\\Component\\\\DomCrawler\\\\Field\\\\FormField\\.$#"
-			count: 1
-			path: src/Browser/Session/Driver/BrowserKitDriver.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\Session\\\\Driver\\\\BrowserKitDriver\\:\\:getFormNode\\(\\) should return DOMElement but returns DOMNode\\.$#"
-			count: 1
-			path: src/Browser/Session/Driver/BrowserKitDriver.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\Session\\\\Driver\\\\BrowserKitDriver\\:\\:getValue\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/Session/Driver/BrowserKitDriver.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\Session\\\\Driver\\\\BrowserKitDriver\\:\\:setValue\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/Session/Driver/BrowserKitDriver.php
-
-		-
-			message: "#^Parameter \\#1 \\$path of function dirname expects string, string\\|false\\|null given\\.$#"
-			count: 1
-			path: src/Browser/Session/Driver/BrowserKitDriver.php
-
-		-
-			message: "#^Parameter \\#1 \\$value of method Symfony\\\\Component\\\\DomCrawler\\\\Field\\\\FormField\\:\\:setValue\\(\\) expects string\\|null, array\\|bool\\|string given\\.$#"
-			count: 1
-			path: src/Browser/Session/Driver/BrowserKitDriver.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\Session\\\\Driver\\\\PantherDriver\\:\\:getValue\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/Session/Driver/PantherDriver.php
-
-		-
-			message: "#^Method Zenstruck\\\\Browser\\\\Session\\\\Driver\\\\PantherDriver\\:\\:setValue\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Browser/Session/Driver/PantherDriver.php
-
-		-
-			message: "#^Parameter \\#1 \\$value of method Symfony\\\\Component\\\\DomCrawler\\\\Field\\\\FormField\\:\\:setValue\\(\\) expects string\\|null, array\\|bool\\|string given\\.$#"
-			count: 1
-			path: src/Browser/Session/Driver/PantherDriver.php
-
-		-
-			message: "#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, array\\|bool\\|string given\\.$#"
-			count: 1
-			path: src/Browser/Session/Driver/PantherDriver.php
-
diff --git a/phpstan.neon b/phpstan.neon
index 3c1c6f7..1be4020 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,6 +1,3 @@
-includes:
-    - phpstan-baseline.neon
-
 parameters:
     level: 8
     paths:
diff --git a/src/Browser.php b/src/Browser.php
index bb83e75..2b7ea3f 100644
--- a/src/Browser.php
+++ b/src/Browser.php
@@ -11,7 +11,6 @@
 
 namespace Zenstruck;
 
-use Behat\Mink\Element\NodeElement;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\BrowserKit\CookieJar;
@@ -20,17 +19,29 @@
 use Zenstruck\Browser\Assertion\SameUrlAssertion;
 use Zenstruck\Browser\Component;
 use Zenstruck\Browser\Session;
-use Zenstruck\Browser\Session\Driver;
 use Zenstruck\Callback\Parameter;
+use Zenstruck\Dom\Exception\RuntimeException;
+use Zenstruck\Dom\Node\Form\Field;
+use Zenstruck\Dom\Node\Form\Field\Checkbox;
+use Zenstruck\Dom\Node\Form\Field\File;
+use Zenstruck\Dom\Node\Form\Field\Input;
+use Zenstruck\Dom\Node\Form\Field\Radio;
+use Zenstruck\Dom\Node\Form\Field\Select\Combobox;
+use Zenstruck\Dom\Node\Form\Field\Select\Multiselect;
+use Zenstruck\Dom\Node\Form\Field\Textarea;
+use Zenstruck\Dom\Selector;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
+ *
+ * @phpstan-import-type SelectorType from Selector
+ * @phpstan-import-type PartsToMatch from SameUrlAssertion
  */
 abstract class Browser
 {
-    private Session $session;
     private ?string $sourceDir;
     private bool $sourceDebug;
+    private Dom $dom;
 
     /** @var string[] */
     private array $savedSources = [];
@@ -40,9 +51,8 @@ abstract class Browser
      *
      * @param array<string,mixed> $options
      */
-    public function __construct(Driver $driver, array $options = [])
+    public function __construct(private Session $session, array $options = [])
     {
-        $this->session = new Session($driver);
         $this->sourceDir = $options['source_dir'] ?? null;
         $this->sourceDebug = $options['source_debug'] ?? false;
     }
@@ -52,36 +62,54 @@ final public function client(): AbstractBrowser
         return $this->session->client();
     }
 
+    final public function dom(): Dom
+    {
+        if (isset($this->dom)) {
+            return $this->dom;
+        }
+
+        $dom = $this->session->dom();
+
+        if (!$exceptionClassNode = $dom->find('.trace-details .trace-class')) {
+            return $this->dom = $dom;
+        }
+
+        $messageNode = $dom->find('.exception-message-wrapper .exception-message');
+
+        Assert::fail('The last request threw an exception: %s - %s', [
+            \preg_replace('/\s+/', '', $exceptionClassNode->text()),
+            $messageNode?->text() ?? 'unknown message',
+        ]);
+    }
+
     /**
      * @return static
      */
     final public function visit(string $uri): self
     {
-        $this->session()->request('GET', $uri);
-
-        return $this;
+        return $this->wrapRequest(fn() => $this->client()->request('GET', $uri));
     }
 
     /**
-     * @param array $parts The url parts to check {@see parse_url} (use empty array for "all")
+     * @param PartsToMatch $parts The url parts to check {@see parse_url} (use empty array for "all")
      *
      * @return static
      */
     final public function assertOn(string $expected, array $parts = ['path', 'query', 'fragment']): self
     {
-        Assert::run(new SameUrlAssertion($this->session()->getCurrentUrl(), $expected, $parts));
+        Assert::run(new SameUrlAssertion($this->session->currentUrl(), $expected, $parts));
 
         return $this;
     }
 
     /**
-     * @param array $parts The url parts to check (@see parse_url)
+     * @param PartsToMatch $parts The url parts to check {@see parse_url} (use empty array for "all")
      *
      * @return static
      */
     final public function assertNotOn(string $expected, array $parts = ['path', 'query', 'fragment']): self
     {
-        Assert::not(new SameUrlAssertion($this->session()->getCurrentUrl(), $expected, $parts));
+        Assert::not(new SameUrlAssertion($this->session->currentUrl(), $expected, $parts));
 
         return $this;
     }
@@ -91,7 +119,7 @@ final public function assertNotOn(string $expected, array $parts = ['path', 'que
      */
     final public function assertContains(string $expected): self
     {
-        $this->session()->assert()->responseContains($expected);
+        Assert::that($this->content())->contains($expected, strict: false);
 
         return $this;
     }
@@ -101,7 +129,7 @@ final public function assertContains(string $expected): self
      */
     final public function assertNotContains(string $expected): self
     {
-        $this->session()->assert()->responseNotContains($expected);
+        Assert::that($this->content())->doesNotContain($expected, strict: false);
 
         return $this;
     }
@@ -113,7 +141,7 @@ final public function crawler(): Crawler
 
     final public function content(): string
     {
-        return $this->session()->page()->getContent();
+        return $this->session->content();
     }
 
     /**
@@ -121,7 +149,7 @@ final public function content(): string
      */
     final public function assertSee(string $expected): self
     {
-        $this->session()->assert()->pageTextContains($expected);
+        $this->dom()->assert()->contains($expected);
 
         return $this;
     }
@@ -131,115 +159,139 @@ final public function assertSee(string $expected): self
      */
     final public function assertNotSee(string $expected): self
     {
-        $this->session()->assert()->pageTextNotContains($expected);
+        $this->dom()->assert()->doesNotContain($expected);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertSeeIn(string $selector, string $expected): self
+    final public function assertSeeIn(Selector|string|callable $selector, string $expected): self
     {
-        $this->session()->assert()->elementTextContains('css', $selector, $expected);
+        $this->dom()->assert()->containsIn($selector, $expected);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertNotSeeIn(string $selector, string $expected): self
+    final public function assertNotSeeIn(Selector|string|callable $selector, string $expected): self
     {
-        $this->session()->assert()->elementTextNotContains('css', $selector, $expected);
+        $this->dom()->assert()->doesNotContainIn($selector, $expected);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertSeeElement(string $selector): self
+    final public function assertSeeElement(Selector|string|callable $selector): self
     {
-        $this->session()->assert()->elementExists('css', $selector);
+        $this->dom()->assert()->hasElement($selector);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertNotSeeElement(string $selector): self
+    final public function assertNotSeeElement(Selector|string|callable $selector): self
     {
-        $this->session()->assert()->elementNotExists('css', $selector);
+        $this->dom()->assert()->doesNotHaveElement($selector);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertElementCount(string $selector, int $count): self
+    final public function assertElementCount(Selector|string|callable $selector, int $count): self
     {
-        $this->session()->assert()->elementsCount('css', $selector, $count);
+        $this->dom()->assert()->hasElementCount($selector, $count);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertElementAttributeContains(string $selector, string $attribute, string $expected): self
+    final public function assertElementAttributeContains(Selector|string|callable $selector, string $attribute, string $expected): self
     {
-        $this->session()->assert()->elementAttributeContains('css', $selector, $attribute, $expected);
+        $this->dom()->assert()->attributeContains($selector, $attribute, $expected);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertElementAttributeNotContains(string $selector, string $attribute, string $expected): self
+    final public function assertElementAttributeNotContains(Selector|string|callable $selector, string $attribute, string $expected): self
     {
-        $this->session()->assert()->elementAttributeNotContains('css', $selector, $attribute, $expected);
+        $this->dom()->assert()->attributeDoesNotContain($selector, $attribute, $expected);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function fillField(string $selector, string $value): self
+    final public function fillField(Selector|string|callable $selector, string $value): self
     {
-        $this->session()->page()->fillField($selector, $value);
+        $field = $this->field($selector);
+
+        if (!$field instanceof Input && !$field instanceof Textarea) {
+            throw new RuntimeException(\sprintf('Node with selector "%s" is not a fillable form field.', Selector::wrap($selector)));
+        }
+
+        $field->fill($value);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function checkField(string $selector): self
+    final public function checkField(Selector|string|callable $selector): self
     {
-        $field = $this->session()->page()->findField($selector);
+        $field = $this->field($selector);
 
-        if ($field && 'radio' === \mb_strtolower((string) $field->getAttribute('type'))) {
-            $this->session()->page()->selectFieldOption($selector, (string) $field->getAttribute('value'));
-
-            return $this;
-        }
-
-        $this->session()->page()->checkField($selector);
+        match ($field::class) {
+            Radio::class => $field->select(),
+            Checkbox::class => $field->check(),
+            default => throw new RuntimeException(\sprintf('Node with selector "%s" is not a checkable form field.', Selector::wrap($selector))),
+        };
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function uncheckField(string $selector): self
+    final public function uncheckField(Selector|string|callable $selector): self
     {
-        $this->session()->page()->uncheckField($selector);
+        $this->field($selector)->ensure(Checkbox::class)->uncheck();
 
         return $this;
     }
@@ -247,68 +299,78 @@ final public function uncheckField(string $selector): self
     /**
      * Select Radio, check checkbox, select single/multiple values.
      *
-     * @param string|array|null $value null: check radio/checkbox
-     *                                 string: single value
-     *                                 array: multiple values
+     * @param SelectorType         $selector
+     * @param string|string[]|null $value    null: check radio/checkbox
+     *                                       string: single value
+     *                                       array: multiple values
      *
      * @return static
      */
-    final public function selectField(string $selector, $value = null): self
+    final public function selectField(Selector|string|callable $selector, string|array|null $value = null): self
     {
-        if (\is_array($value)) {
-            return $this->selectFieldOptions($selector, $value);
+        $field = $this->field($selector);
+
+        if ($field instanceof Checkbox) {
+            $field->check();
+
+            return $this;
+        }
+
+        if ($field instanceof Radio && !\is_array($value)) {
+            $field->select($value);
+
+            return $this;
         }
 
-        if (\is_string($value)) {
-            return $this->selectFieldOption($selector, $value);
+        if ($field instanceof Combobox && \is_array($value)) {
+            throw new RuntimeException('Combobox does not support multiple values.');
         }
 
-        return $this->checkField($selector);
+        if ($field instanceof Combobox) {
+            $field->select((string) $value);
+
+            return $this;
+        }
+
+        $value = (array) $value;
+        $field = $field->ensure(Multiselect::class);
+
+        $value ? $field->select($value) : $field->deselectAll();
+
+        return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function selectFieldOption(string $selector, string $value): self
+    final public function selectFieldOption(Selector|string|callable $selector, string $value): self
     {
-        $this->session()->page()->selectFieldOption($selector, $value);
-
-        return $this;
+        return $this->selectField($selector, $value);
     }
 
     /**
+     * @param SelectorType $selector
+     * @param string[]     $values
+     *
      * @return static
      */
-    final public function selectFieldOptions(string $selector, array $values): self
+    final public function selectFieldOptions(Selector|string|callable $selector, array $values): self
     {
-        if (!$values) {
-            $this->session->page()->fillField($selector, $values);
-
-            return $this;
-        }
-
-        foreach ($values as $value) {
-            $this->session()->page()->selectFieldOption($selector, $value, true);
-        }
-
-        return $this;
+        return $this->selectField($selector, $values);
     }
 
     /**
+     * @param SelectorType    $selector
      * @param string|string[] $filename string: single file
      *                                  array: multiple files
      *
      * @return static
      */
-    final public function attachFile(string $selector, array|string $filename): self
+    final public function attachFile(Selector|string|callable $selector, array|string $filename): self
     {
-        foreach ((array) $filename as $file) {
-            if (!\file_exists($file)) {
-                throw new \InvalidArgumentException(\sprintf('File "%s" does not exist.', $file));
-            }
-
-            $this->session()->page()->attachFileToField($selector, $file);
-        }
+        $this->field($selector)->ensure(File::class)->attach(...(array) $filename);
 
         return $this;
     }
@@ -316,77 +378,87 @@ final public function attachFile(string $selector, array|string $filename): self
     /**
      * Click on a button, link or any DOM element.
      *
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function click(string $selector): self
+    final public function click(Selector|string|callable $selector): self
     {
-        $element = $this->getClickableElement($selector);
+        $node = $this->dom()->findOrFail(Selector::clickable($selector));
 
-        $element->click();
+        Assert::true($node->isVisible(), 'Clickable element "%s" is not visible.', [$selector]);
 
-        return $this;
+        return $this->wrapRequest(fn() => $node->click());
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertFieldEquals(string $selector, string $expected): self
+    final public function assertFieldEquals(Selector|string|callable $selector, string $expected): self
     {
-        $this->session()->assert()->fieldValueEquals($selector, $expected);
+        $this->dom()->assert()->fieldEquals($selector, $expected);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertFieldNotEquals(string $selector, string $expected): self
+    final public function assertFieldNotEquals(Selector|string|callable $selector, string $expected): self
     {
-        $this->session()->assert()->fieldValueNotEquals($selector, $expected);
+        $this->dom()->assert()->fieldDoesNotEqual($selector, $expected);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertSelected(string $selector, string $expected): self
+    final public function assertSelected(Selector|string|callable $selector, string $expected): self
     {
-        $field = $this->session()->assert()->fieldExists($selector);
-
-        Assert::that((array) $field->getValue())->contains($expected);
+        $this->dom()->assert()->fieldSelected($selector, $expected);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertNotSelected(string $selector, string $expected): self
+    final public function assertNotSelected(Selector|string|callable $selector, string $expected): self
     {
-        $field = $this->session()->assert()->fieldExists($selector);
-
-        Assert::that((array) $field->getValue())->doesNotContain($expected);
+        $this->dom()->assert()->fieldNotSelected($selector, $expected);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertChecked(string $selector): self
+    final public function assertChecked(Selector|string|callable $selector): self
     {
-        $this->session()->assert()->checkboxChecked($selector);
+        $this->dom()->assert()->fieldChecked($selector);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertNotChecked(string $selector): self
+    final public function assertNotChecked(Selector|string|callable $selector): self
     {
-        $this->session()->assert()->checkboxNotChecked($selector);
+        $this->dom()->assert()->fieldNotChecked($selector);
 
         return $this;
     }
@@ -412,24 +484,24 @@ final public function saveSource(string $filename): self
             $filename = \sprintf('%s/%s', \rtrim($this->sourceDir, '/'), \ltrim($filename, '/'));
         }
 
-        (new Filesystem())->dumpFile($this->savedSources[] = $filename, $this->session()->source($this->sourceDebug));
+        (new Filesystem())->dumpFile($this->savedSources[] = $filename, $this->source($this->sourceDebug));
 
         return $this;
     }
 
     /**
+     * @param SelectorType|null $selector
+     *
      * @return static
      */
-    final public function dump(?string $selector = null): self
-    {
-        $this->session()->dump($selector);
-
-        return $this;
-    }
+    abstract public function dump(Selector|string|callable|null $selector = null): self;
 
-    final public function dd(?string $selector = null): void
+    /**
+     * @param SelectorType|null $selector
+     */
+    final public function dd(Selector|string|callable|null $selector = null): void
     {
-        $this->dump($selector)->session()->exit();
+        $this->dump($selector)->exit();
     }
 
     public function saveCurrentState(string $filename): void
@@ -447,44 +519,25 @@ public function savedArtifacts(): array
         return ['Saved Source Files' => $this->savedSources];
     }
 
-    final protected function getClickableElement(string $selector): NodeElement
+    /**
+     * @internal
+     *
+     * @return static
+     */
+    protected function wrapRequest(callable $callback): self
     {
-        // try button
-        $element = $this->session()->page()->findButton($selector);
-
-        if (!$element) {
-            // try link
-            $element = $this->session()->page()->findLink($selector);
-        }
-
-        if (!$element) {
-            // try by css
-            $element = $this->session()->page()->find('css', $selector);
-        }
-
-        if (!$element) {
-            Assert::fail('Clickable element "%s" not found.', [$selector]);
-        }
+        $callback();
+        unset($this->dom);
 
-        if (!$element->isVisible()) {
-            Assert::fail('Clickable element "%s" is not visible.', [$selector]);
-        }
-
-        if ($button = $this->session()->page()->findButton($selector)) {
-            if (!$button->isVisible()) {
-                Assert::fail('Button "%s" is not visible.', [$selector]);
-            }
-        }
-
-        return $element;
+        return $this;
     }
 
     /**
      * @internal
      */
-    final protected function session(): Session
+    protected function exit(): void
     {
-        return $this->session;
+        exit(1);
     }
 
     /**
@@ -499,9 +552,20 @@ protected function useParameters(): array
             Parameter::typed(self::class, $this),
             Parameter::typed(Component::class, Parameter::factory(fn(string $class) => new $class($this))),
             Parameter::typed(Crawler::class, Parameter::factory(fn() => $this->client()->getCrawler())),
+            Parameter::typed(Dom::class, Parameter::factory(fn() => $this->dom())),
             Parameter::typed(CookieJar::class, Parameter::factory(fn() => $this->client()->getCookieJar())),
             Parameter::typed(AbstractBrowser::class, Parameter::factory(fn() => $this->client())),
             Parameter::typed(ContainerInterface::class, Parameter::factory(fn() => \method_exists($this->client(), 'getContainer') ? $this->client()->getContainer() : null))->optional(),
         ];
     }
+
+    /**
+     * @internal
+     */
+    abstract protected function source(bool $debug): string;
+
+    private function field(Selector|string|callable $selector): Field
+    {
+        return $this->dom()->findOrFail(Selector::field($selector))->ensure(Field::class);
+    }
 }
diff --git a/src/Browser/Assertion/SameUrlAssertion.php b/src/Browser/Assertion/SameUrlAssertion.php
index 3fe7a63..63d06f8 100644
--- a/src/Browser/Assertion/SameUrlAssertion.php
+++ b/src/Browser/Assertion/SameUrlAssertion.php
@@ -18,18 +18,16 @@
  * @author Kevin Bond <kevinbond@gmail.com>
  *
  * @internal
+ *
+ * @phpstan-type PartsToMatch list<"scheme"|"host"|"port"|"user"|"pass"|"path"|"query"|"fragment">
  */
 final class SameUrlAssertion implements Negatable
 {
-    private string $current;
-    private string $expected;
-    private array $partsToMatch;
-
-    public function __construct(string $current, string $expected, array $partsToMatch = [])
+    /**
+     * @param PartsToMatch $partsToMatch
+     */
+    public function __construct(private string $current, private string $expected, private array $partsToMatch = [])
     {
-        $this->current = $current;
-        $this->expected = $expected;
-        $this->partsToMatch = $partsToMatch;
     }
 
     public function __invoke(): void
@@ -58,6 +56,9 @@ public function notFailure(): AssertionFailed
         );
     }
 
+    /**
+     * @return array<string,string>
+     */
     private function context(): array
     {
         return [
@@ -67,11 +68,22 @@ private function context(): array
         ];
     }
 
+    /**
+     * @return array{
+     *      scheme?: string,
+     *      host?: string,
+     *      port?: int<0,65535>,
+     *      user?: string,
+     *      pass?: string,
+     *      path?: string,
+     *      query?: string,
+     *      fragment?: string,
+     *  }
+     */
     private function parseUrl(string $url): array
     {
-        $parts = \parse_url(\urldecode($url));
-
-        if (empty($this->partsToMatch)) {
+        $parts = \parse_url(\urldecode($url)) ?: throw new \RuntimeException(\sprintf('Failed to parse URL: "%s".', $url));
+        if (!$this->partsToMatch) {
             return $parts;
         }
 
diff --git a/src/Browser/Dumper.php b/src/Browser/Dumper.php
new file mode 100644
index 0000000..91c44e4
--- /dev/null
+++ b/src/Browser/Dumper.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the zenstruck/browser package.
+ *
+ * (c) Kevin Bond <kevinbond@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Zenstruck\Browser;
+
+/**
+ * @author Kevin Bond <kevinbond@gmail.com>
+ *
+ * @internal
+ */
+final class Dumper
+{
+    private function __construct()
+    {
+    }
+
+    public static function dump(mixed $what): void
+    {
+        \function_exists('dump') ? dump($what) : \var_dump($what);
+    }
+}
diff --git a/src/Browser/HttpOptions.php b/src/Browser/HttpOptions.php
index 72646c8..ddc29ac 100644
--- a/src/Browser/HttpOptions.php
+++ b/src/Browser/HttpOptions.php
@@ -78,7 +78,7 @@ final public function __construct(array $options = [])
      *
      * @return static
      */
-    final public static function create($options = []): self
+    final public static function create(self|array $options = []): self
     {
         if ($options instanceof static) {
             return $options;
diff --git a/src/Browser/Json.php b/src/Browser/Json.php
index a002d0f..4ecf41f 100644
--- a/src/Browser/Json.php
+++ b/src/Browser/Json.php
@@ -174,6 +174,25 @@ public function decoded()
         return $this->decoded = \json_decode($this->source, true, 512, \JSON_THROW_ON_ERROR);
     }
 
+    public function dump(?string $selector = null): self
+    {
+        if (!$selector) {
+            Dumper::dump((string) $this);
+
+            return $this;
+        }
+
+        Dumper::dump($this->search($selector));
+
+        return $this;
+    }
+
+    public function dd(?string $selector = null): void
+    {
+        $this->dump($selector);
+        exit(1);
+    }
+
     /**
      * @param mixed $data
      */
diff --git a/src/Browser/KernelBrowser.php b/src/Browser/KernelBrowser.php
index e3bf49e..babbca4 100644
--- a/src/Browser/KernelBrowser.php
+++ b/src/Browser/KernelBrowser.php
@@ -14,18 +14,21 @@
 use Symfony\Bundle\FrameworkBundle\KernelBrowser as SymfonyKernelBrowser;
 use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
 use Symfony\Component\HttpKernel\Profiler\Profile;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Zenstruck\Assert;
 use Zenstruck\Browser;
-use Zenstruck\Browser\Session\Driver\BrowserKitDriver;
+use Zenstruck\Browser\Session\KernelSession;
 use Zenstruck\Callback\Parameter;
+use Zenstruck\Dom\Selector;
 use Zenstruck\Foundry\Factory;
 use Zenstruck\Foundry\Proxy;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
  *
+ * @phpstan-import-type SelectorType from Selector
  * @phpstan-import-type Options from HttpOptions
  *
  * @method SymfonyKernelBrowser client()
@@ -34,6 +37,11 @@ class KernelBrowser extends Browser
 {
     protected ?HttpOptions $defaultHttpOptions = null;
 
+    private KernelSession $session;
+
+    /** @var array{0:class-string|callable,1:string|null}|null */
+    private ?array $expectedException = null;
+
     /**
      * @internal
      */
@@ -42,7 +50,7 @@ final public function __construct(SymfonyKernelBrowser $client, array $options =
         $client->followRedirects((bool) ($options['follow_redirects'] ?? true));
         $client->catchExceptions((bool) ($options['catch_exceptions'] ?? true));
 
-        parent::__construct(new BrowserKitDriver($client), $options);
+        parent::__construct($this->session = new KernelSession($client), $options);
     }
 
     /**
@@ -108,9 +116,9 @@ final public function catchExceptions(): self
      */
     public function expectException($expectedException, ?string $expectedMessage = null): self
     {
-        $this->session()->expectException($expectedException, $expectedMessage);
+        $this->expectedException = [$expectedException, $expectedMessage];
 
-        return $this;
+        return $this->throwExceptions();
     }
 
     /**
@@ -159,7 +167,7 @@ public function assertAuthenticated($as = null): self
     {
         $token = $this->securityToken();
 
-        if (!$token && $this->session()->isStarted() && !($this->session()->getStatusCode() >= 200 && $this->session()->getStatusCode() < 300)) {
+        if (!$token && $this->session->isStarted() && !$this->session->isSuccess()) {
             Assert::fail('The last response was not successful so cannot check authentication.');
         }
 
@@ -187,7 +195,7 @@ public function assertAuthenticated($as = null): self
             throw new \LogicException(\sprintf('%s() requires the "as" user be a string or %s.', __METHOD__, UserInterface::class));
         }
 
-        Assert::that($token->getUserIdentifier())
+        Assert::that($token?->getUserIdentifier())
             ->is($as, 'Expected to be authenticated as "{expected}" but authenticated as "{actual}".')
         ;
 
@@ -234,7 +242,7 @@ final public function followRedirects(): self
     {
         $this->client()->followRedirects(true);
 
-        if ($this->session()->isStarted() && $this->session()->isRedirect()) {
+        if ($this->session->isStarted() && $this->session->isRedirect()) {
             $this->followRedirect();
         }
 
@@ -249,7 +257,7 @@ final public function followRedirects(): self
     final public function followRedirect(int $max = \PHP_INT_MAX): self
     {
         for ($i = 0; $i < $max; ++$i) {
-            if (!$this->session()->isRedirect()) {
+            if (!$this->session->isRedirect()) {
                 break;
             }
 
@@ -278,7 +286,7 @@ final public function assertRedirectedTo(string $expected, int $max = \PHP_INT_M
      *
      * @return static
      */
-    final public function setDefaultHttpOptions($options): self
+    final public function setDefaultHttpOptions(array|HttpOptions $options): self
     {
         $this->defaultHttpOptions = HttpOptions::create($options);
 
@@ -286,11 +294,11 @@ final public function setDefaultHttpOptions($options): self
     }
 
     /**
-     * @param HttpOptions|array $options HttpOptions::DEFAULT_OPTIONS
+     * @param HttpOptions|Options $options
      *
      * @return static
      */
-    final public function request(string $method, string $url, $options = []): self
+    final public function request(string $method, string $url, array|HttpOptions $options = []): self
     {
         if ($this->defaultHttpOptions) {
             $options = $this->defaultHttpOptions->merge($options);
@@ -298,7 +306,14 @@ final public function request(string $method, string $url, $options = []): self
 
         $options = HttpOptions::create($options);
 
-        $this->session()->request($method, $options->addQueryToUrl($url), $options);
+        $this->wrapRequest(fn() => $this->client()->request(
+            $method,
+            $options->addQueryToUrl($url),
+            $options->parameters(),
+            $options->files(),
+            $options->server(),
+            $options->body(),
+        ));
 
         return $this;
     }
@@ -306,11 +321,11 @@ final public function request(string $method, string $url, $options = []): self
     /**
      * @see request()
      *
-     * @param HttpOptions|array $options
+     * @param HttpOptions|Options $options
      *
      * @return static
      */
-    public function get(string $url, $options = []): self
+    final public function get(string $url, array|HttpOptions $options = []): self
     {
         return $this->request('GET', $url, $options);
     }
@@ -318,11 +333,11 @@ public function get(string $url, $options = []): self
     /**
      * @see request()
      *
-     * @param HttpOptions|array $options
+     * @param HttpOptions|Options $options
      *
      * @return static
      */
-    public function post(string $url, $options = []): self
+    final public function post(string $url, array|HttpOptions $options = []): self
     {
         return $this->request('POST', $url, $options);
     }
@@ -330,11 +345,11 @@ public function post(string $url, $options = []): self
     /**
      * @see request()
      *
-     * @param HttpOptions|array $options
+     * @param HttpOptions|Options $options
      *
      * @return static
      */
-    public function put(string $url, $options = []): self
+    final public function put(string $url, array|HttpOptions $options = []): self
     {
         return $this->request('PUT', $url, $options);
     }
@@ -342,11 +357,11 @@ public function put(string $url, $options = []): self
     /**
      * @see request()
      *
-     * @param HttpOptions|array $options
+     * @param HttpOptions|Options $options
      *
      * @return static
      */
-    public function delete(string $url, $options = []): self
+    final public function delete(string $url, array|HttpOptions $options = []): self
     {
         return $this->request('DELETE', $url, $options);
     }
@@ -354,11 +369,11 @@ public function delete(string $url, $options = []): self
     /**
      * @see request()
      *
-     * @param HttpOptions|array $options
+     * @param HttpOptions|Options $options
      *
      * @return static
      */
-    public function patch(string $url, $options = []): self
+    final public function patch(string $url, array|HttpOptions $options = []): self
     {
         return $this->request('PATCH', $url, $options);
     }
@@ -369,9 +384,11 @@ public function patch(string $url, $options = []): self
      * Useful for submitting a form and making assertions on the
      * redirect response.
      *
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function clickAndIntercept(string $selector): self
+    final public function clickAndIntercept(Selector|string|callable $selector): self
     {
         return $this
             ->interceptRedirects()
@@ -385,7 +402,7 @@ final public function clickAndIntercept(string $selector): self
      */
     final public function assertStatus(int $expected): self
     {
-        Assert::that($this->session()->getStatusCode())
+        Assert::that($this->session->statusCode())
             ->is($expected, 'Current response status code is {actual}, but {expected} expected.')
         ;
 
@@ -398,9 +415,9 @@ final public function assertStatus(int $expected): self
     final public function assertSuccessful(): self
     {
         Assert::true(
-            $this->session()->getStatusCode() >= 200 && $this->session()->getStatusCode() < 300,
+            $this->session->isSuccess(),
             'Expected successful status code (2xx) but got {actual}.',
-            ['actual' => $this->session()->getStatusCode()],
+            ['actual' => $this->session->statusCode()],
         );
 
         return $this;
@@ -415,8 +432,8 @@ final public function assertRedirected(): self
             throw new \RuntimeException('Cannot assert redirected if not intercepting redirects. Call ->interceptRedirects() before making the request.');
         }
 
-        Assert::true($this->session()->isRedirect(), 'Expected redirect status code (3xx) but got {actual}.', [
-            'actual' => $this->session()->getStatusCode(),
+        Assert::true($this->session->isRedirect(), 'Expected redirect status code (3xx) but got {actual}.', [
+            'actual' => $this->session->statusCode(),
         ]);
 
         return $this;
@@ -427,17 +444,9 @@ final public function assertRedirected(): self
      */
     final public function assertHeaderEquals(string $header, ?string $expected): self
     {
-        if (null === $expected) {
-            Assert::that($this->session()->getResponseHeader($header))
-                ->isNull('Current response header "{header}" is "{actual}", but was not expected.', [
-                    'header' => $header,
-                ])
-            ;
-
-            return $this;
-        }
-
-        $this->session()->assert()->responseHeaderEquals($header, $expected);
+        Assert::that($this->client()->getResponse()->headers->get($header))
+            ->equals($expected, 'Header "{header}" is "{actual}", but "{expected}" expected.', ['header' => $header])
+        ;
 
         return $this;
     }
@@ -447,7 +456,10 @@ final public function assertHeaderEquals(string $header, ?string $expected): sel
      */
     final public function assertHeaderContains(string $header, string $expected): self
     {
-        $this->session()->assert()->responseHeaderContains($header, $expected);
+        Assert::that($this->client()->getResponse()->headers->get($header))
+            ->isNotNull('Header "{header}" is not present in the response.', ['header' => $header])
+            ->contains($expected, 'Header "{header}" is "{actual}", but "{expected}" expected.', ['header' => $header])
+        ;
 
         return $this;
     }
@@ -499,7 +511,69 @@ final public function assertJsonMatches(string $expression, $expected): self
 
     final public function json(): Json
     {
-        return $this->assertJson()->session()->json();
+        return new Json($this->assertJson()->content());
+    }
+
+    final public function dump(Selector|string|callable|null $selector = null): self
+    {
+        if (!$selector) {
+            Dumper::dump($this->source(true));
+
+            return $this;
+        }
+
+        $contentType = $this->normalizedContentType();
+
+        match (true) {
+            'json' === $contentType && \is_string($selector) => $this->json()->dump($selector),
+            'dom' === $contentType => $this->dom()->dump($selector),
+            default => $this->dump(),
+        };
+
+        return $this;
+    }
+
+    /**
+     * @internal
+     *
+     * @return static
+     */
+    final protected function wrapRequest(callable $callback): self
+    {
+        if (!$this->expectedException) {
+            return parent::wrapRequest($callback);
+        }
+
+        Assert::that($callback)->throws(...$this->expectedException);
+
+        $this->expectedException = null;
+
+        return $this;
+    }
+
+    /**
+     * @internal
+     */
+    final protected function source(bool $debug): string
+    {
+        $ret = '';
+        $contentType = $this->normalizedContentType();
+
+        // We never want to prepend non-text files with metadata.
+        if ($debug && $contentType) {
+            $ret .= "<!--\n";
+            $ret .= "URL: {$this->session->currentUrl()} ({$this->session->statusCode()})\n\n";
+
+            foreach ($this->client()->getInternalResponse()->getHeaders() as $header => $values) {
+                foreach ((array) $values as $value) {
+                    $ret .= "{$header}: {$value}\n";
+                }
+            }
+
+            $ret .= "-->\n";
+        }
+
+        return $ret.('json' === $contentType ? $this->json() : $this->content());
     }
 
     protected function useParameters(): array
@@ -527,6 +601,26 @@ private function securityToken(): ?TokenInterface
             throw new \LogicException('Security not available/enabled.');
         }
 
-        return $container->get('security.token_storage')->getToken();
+        $storage = $container->get('security.token_storage');
+
+        \assert($storage instanceof TokenStorageInterface);
+
+        return $storage->getToken();
+    }
+
+    /**
+     * @return "dom"|"json"|"text"|null
+     */
+    private function normalizedContentType(): ?string
+    {
+        $contentType = (string) $this->client()->getInternalResponse()->getHeader('Content-Type'); // @phpstan-ignore-line
+
+        return match (true) {
+            \str_contains($contentType, 'json') => 'json',
+            \str_contains($contentType, 'html') => 'dom',
+            \str_contains($contentType, 'xml') => 'dom',
+            \str_contains($contentType, 'text') => 'text',
+            default => null,
+        };
     }
 }
diff --git a/src/Browser/PantherBrowser.php b/src/Browser/PantherBrowser.php
index 3b9919a..56310d1 100644
--- a/src/Browser/PantherBrowser.php
+++ b/src/Browser/PantherBrowser.php
@@ -14,20 +14,23 @@
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\DomCrawler\Crawler;
-use Zenstruck\Assert;
 use Zenstruck\Browser;
-use Zenstruck\Browser\Session\Driver\PantherDriver;
+use Zenstruck\Browser\Session\PantherSession;
+use Zenstruck\Dom\Selector;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
  *
  * @experimental in 1.0
  *
+ * @phpstan-import-type SelectorType from Selector
+ *
  * @method Client  client()
  * @method Crawler crawler()
  */
 class PantherBrowser extends Browser
 {
+    private PantherSession $session;
     private ?string $screenshotDir;
     private ?string $consoleLogDir;
 
@@ -42,38 +45,32 @@ class PantherBrowser extends Browser
      */
     final public function __construct(Client $client, array $options = [])
     {
-        parent::__construct(new PantherDriver($client), $options);
+        parent::__construct($this->session = new PantherSession($client), $options);
 
         $this->screenshotDir = $options['screenshot_dir'] ?? null;
         $this->consoleLogDir = $options['console_log_dir'] ?? null;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertVisible(string $selector): self
+    final public function assertVisible(Selector|string|callable $selector): self
     {
-        $element = $this->session()->assert()->elementExists('css', $selector);
-
-        Assert::true($element->isVisible(), 'Expected element "%s" to be visible but it isn\'t.', [$selector]);
+        $this->dom()->assert()->elementIsVisible($selector);
 
         return $this;
     }
 
     /**
+     * @param SelectorType $selector
+     *
      * @return static
      */
-    final public function assertNotVisible(string $selector): self
+    final public function assertNotVisible(Selector|string|callable $selector): self
     {
-        $element = $this->session()->page()->find('css', $selector);
-
-        if (!$element) {
-            Assert::pass();
-
-            return $this;
-        }
-
-        Assert::false($element->isVisible(), 'Expected element "%s" to not be visible but it is.', [$selector]);
+        $this->dom()->assert()->elementIsNotVisible($selector);
 
         return $this;
     }
@@ -173,7 +170,7 @@ final public function saveConsoleLog(string $filename): self
 
     final public function dumpConsoleLog(): self
     {
-        Session::varDump($this->client()->manage()->getLog('browser'));
+        Dumper::dump($this->client()->manage()->getLog('browser'));
 
         return $this;
     }
@@ -181,7 +178,7 @@ final public function dumpConsoleLog(): self
     final public function ddConsoleLog(): void
     {
         $this->dumpConsoleLog();
-        $this->session()->exit();
+        $this->exit();
     }
 
     final public function ddScreenshot(string $filename = 'screenshot.png'): void
@@ -190,7 +187,7 @@ final public function ddScreenshot(string $filename = 'screenshot.png'): void
 
         echo \sprintf("\n\nScreenshot saved as \"%s\".\n\n", \end($this->savedScreenshots));
 
-        $this->session()->exit();
+        $this->exit();
     }
 
     final public function saveCurrentState(string $filename): void
@@ -212,19 +209,66 @@ final public function savedArtifacts(): array
         );
     }
 
-    final public function doubleClick(string $selector): self
+    /**
+     * @param SelectorType $selector
+     *
+     * @return static
+     */
+    final public function doubleClick(Selector|string|callable $selector): self
     {
-        $element = $this->getClickableElement($selector);
-        $element->doubleClick();
+        $this->session->doubleClick($this->dom()->findOrFail($selector));
 
         return $this;
     }
 
-    final public function rightClick(string $selector): self
+    /**
+     * @param SelectorType $selector
+     *
+     * @return static
+     */
+    final public function rightClick(Selector|string|callable $selector): self
     {
-        $element = $this->getClickableElement($selector);
-        $element->rightClick();
+        $this->session->rightClick($this->dom()->findOrFail($selector));
+
+        return $this;
+    }
+
+    final public function dump(Selector|string|callable|null $selector = null): self
+    {
+        if (!$selector) {
+            Dumper::dump($this->source(true));
+
+            return $this;
+        }
+
+        $this->dom()->dump($selector);
 
         return $this;
     }
+
+    /**
+     * @internal
+     */
+    final protected function source(bool $debug): string
+    {
+        $ret = '';
+
+        if ($debug) {
+            $ret .= "<!--\n";
+            $ret .= "URL: {$this->client()->getCurrentURL()}\n";
+            $ret .= "-->\n";
+        }
+
+        return $ret.$this->client()->getPageSource();
+    }
+
+    /**
+     * @internal
+     */
+    final protected function exit(): void
+    {
+        $this->client()->quit();
+
+        parent::exit();
+    }
 }
diff --git a/src/Browser/Session.php b/src/Browser/Session.php
index 0077f4b..613b7cf 100644
--- a/src/Browser/Session.php
+++ b/src/Browser/Session.php
@@ -11,187 +11,29 @@
 
 namespace Zenstruck\Browser;
 
-use Behat\Mink\Element\DocumentElement;
-use Behat\Mink\Exception\DriverException;
-use Behat\Mink\Exception\UnsupportedDriverActionException;
-use Behat\Mink\Session as MinkSession;
-use Behat\Mink\WebAssert;
 use Symfony\Component\BrowserKit\AbstractBrowser;
-use Symfony\Component\DomCrawler\Crawler;
-use Zenstruck\Assert as ZenstruckAssert;
-use Zenstruck\Browser\Session\Assert;
-use Zenstruck\Browser\Session\Driver;
+use Zenstruck\Dom;
+use Zenstruck\Dom\Session as DomSession;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
  *
  * @internal
- *
- * @method Driver getDriver()
  */
-final class Session extends MinkSession
+abstract class Session implements DomSession
 {
-    public function __construct(Driver $driver)
-    {
-        parent::__construct($driver);
-    }
-
-    /**
-     * @param mixed $what
-     */
-    public static function varDump($what): void
-    {
-        \function_exists('dump') ? dump($what) : \var_dump($what);
-    }
-
-    public function client(): AbstractBrowser
-    {
-        return $this->getDriver()->client();
-    }
-
-    public function assert(): Assert
-    {
-        $this->ensureNoException();
-
-        return new Assert(new WebAssert($this));
-    }
-
-    public function page(): DocumentElement
-    {
-        $this->ensureNoException();
-
-        return $this->getPage();
-    }
-
-    public function isRedirect(): bool
-    {
-        return $this->getStatusCode() >= 300 && $this->getStatusCode() < 400;
-    }
-
-    public function json(): Json
-    {
-        if (\str_contains((string) $this->getResponseHeader('content-type'), 'json')) {
-            return new Json($this->page()->getContent());
-        }
-
-        throw new DriverException('This is not a JSON response.');
-    }
-
-    public function request(string $method, string $url, ?HttpOptions $options = null): void
-    {
-        if (!$this->isStarted()) {
-            $this->start();
-        }
-
-        $this->getDriver()->request(\mb_strtoupper($method), $url, $options ?? new HttpOptions());
-    }
-
-    /**
-     * @param class-string|callable $expectedException
-     */
-    public function expectException($expectedException, ?string $expectedMessage = null): void
+    public function __construct(private AbstractBrowser $client)
     {
-        $this->getDriver()->expectException($expectedException, $expectedMessage);
     }
 
-    public function source(bool $sourceDebug = false): string
+    final public function client(): AbstractBrowser
     {
-        $ret = '';
-
-        // We never want to prepend non-text files with metadata.
-        if ($sourceDebug && $this->isTextContent()) {
-            $ret .= "<!--\n";
-
-            try {
-                $ret .= "URL: {$this->getCurrentUrl()} ({$this->getStatusCode()})\n\n";
-
-                foreach ($this->getResponseHeaders() as $header => $values) {
-                    foreach ((array) $values as $value) {
-                        $ret .= "{$header}: {$value}\n";
-                    }
-                }
-            } catch (DriverException $e) {
-                $ret = "URL: {$this->getCurrentUrl()}\n";
-            }
-
-            $ret .= "-->\n";
-        }
-
-        try {
-            $ret .= $this->json();
-        } catch (DriverException $e) {
-            $ret .= $this->getDriver()->getContent();
-        }
-
-        return $ret;
+        return $this->client;
     }
 
-    public function dump(?string $selector = null): void
-    {
-        if (!$selector) {
-            self::varDump($this->source(true));
-
-            return;
-        }
-
-        try {
-            self::varDump($this->json()->search($selector));
+    abstract public function dom(): Dom;
 
-            return;
-        } catch (DriverException $e) {
-        }
+    abstract public function content(): string;
 
-        $elements = (new Crawler($this->page()->getContent()))->filter($selector);
-
-        if (0 === $elements->count()) {
-            throw new \RuntimeException("Element \"{$selector}\" not found.");
-        }
-
-        $elements->each(function(Crawler $node) {
-            self::varDump($node->outerHtml());
-        });
-    }
-
-    public function exit(): void
-    {
-        $this->getDriver()->quit();
-        exit(1);
-    }
-
-    private function ensureNoException(): void
-    {
-        if (!$this->isStarted()) {
-            ZenstruckAssert::fail('A request has not yet been made.');
-        }
-
-        $crawler = $this->client()->getCrawler();
-
-        if (!\count($exceptionClassNode = $crawler->filter('.trace-details .trace-class')->first())) {
-            return;
-        }
-
-        $messageNode = $crawler->filter('.exception-message-wrapper .exception-message')->first();
-
-        ZenstruckAssert::fail('The last request threw an exception: %s - %s', [
-            \preg_replace('/\s+/', '', $exceptionClassNode->text()),
-            \count($messageNode) ? $messageNode->text() : 'unknown message',
-        ]);
-    }
-
-    private function isTextContent(): bool
-    {
-        try {
-            return match (true) {
-                \str_contains((string) $this->getResponseHeader('Content-Type'), 'text/plain'),
-                \str_contains((string) $this->getResponseHeader('Content-Type'), 'xml'), // to cover all possible XML content-types: "application/xml (is recommended as of RFC 7303 (section 4.1)), text/xml "
-                \str_contains((string) $this->getResponseHeader('Content-Type'), 'html'), // to cover all possible (x)HTML content-types: "text/html, application/xhtml+xml"
-                \str_contains((string) $this->getResponseHeader('Content-Type'), 'json'), // to cover all possible JSON content-types: "application/json, application/ld+json"
-                => true,
-                default => false,
-            };
-        } catch (UnsupportedDriverActionException) {
-            // We never want to add metadata to source content if Panther is used.
-            return false;
-        }
-    }
+    abstract public function currentUrl(): string;
 }
diff --git a/src/Browser/Session/Assert.php b/src/Browser/Session/Assert.php
deleted file mode 100644
index 2b3790f..0000000
--- a/src/Browser/Session/Assert.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/*
- * This file is part of the zenstruck/browser package.
- *
- * (c) Kevin Bond <kevinbond@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Zenstruck\Browser\Session;
-
-use Behat\Mink\Exception\ExpectationException;
-use Behat\Mink\WebAssert;
-use Zenstruck\Assert as ZenstruckAssert;
-
-/**
- * @author Kevin Bond <kevinbond@gmail.com>
- *
- * @internal
- *
- * @mixin WebAssert
- */
-final class Assert
-{
-    private WebAssert $webAssert;
-
-    public function __construct(WebAssert $webAssert)
-    {
-        $this->webAssert = $webAssert;
-    }
-
-    /**
-     * @param mixed[] $arguments
-     *
-     * @return mixed
-     */
-    public function __call(string $name, array $arguments)
-    {
-        try {
-            $ret = $this->webAssert->{$name}(...$arguments);
-        } catch (ExpectationException $e) {
-            ZenstruckAssert::fail($e->getMessage());
-        }
-
-        ZenstruckAssert::pass();
-
-        return $ret;
-    }
-}
diff --git a/src/Browser/Session/Driver.php b/src/Browser/Session/Driver.php
deleted file mode 100644
index 9676b26..0000000
--- a/src/Browser/Session/Driver.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/*
- * This file is part of the zenstruck/browser package.
- *
- * (c) Kevin Bond <kevinbond@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Zenstruck\Browser\Session;
-
-use Behat\Mink\Driver\CoreDriver;
-use Behat\Mink\Exception\UnsupportedDriverActionException;
-use Symfony\Component\BrowserKit\AbstractBrowser;
-use Zenstruck\Browser\HttpOptions;
-
-/**
- * @author Kevin Bond <kevinbond@gmail.com>
- *
- * @internal
- */
-abstract class Driver extends CoreDriver
-{
-    private AbstractBrowser $client;
-    private bool $started = false;
-
-    public function __construct(AbstractBrowser $client)
-    {
-        $this->client = $client;
-    }
-
-    public function client(): AbstractBrowser
-    {
-        return $this->client;
-    }
-
-    public function start(): void
-    {
-        $this->started = true;
-    }
-
-    public function isStarted(): bool
-    {
-        return $this->started;
-    }
-
-    public function stop(): void
-    {
-        $this->started = false;
-    }
-
-    public function reset(): void
-    {
-        $this->client()->restart();
-    }
-
-    public function quit(): void
-    {
-    }
-
-    /**
-     * @param class-string|callable $expectedException
-     */
-    public function expectException($expectedException, ?string $expectedMessage = null): void
-    {
-        throw new UnsupportedDriverActionException('%s does not support expecting exceptions.', $this);
-    }
-
-    abstract public function request(string $method, string $url, HttpOptions $options): void;
-}
diff --git a/src/Browser/Session/Driver/BrowserKitDriver.php b/src/Browser/Session/Driver/BrowserKitDriver.php
deleted file mode 100644
index dd86ddd..0000000
--- a/src/Browser/Session/Driver/BrowserKitDriver.php
+++ /dev/null
@@ -1,729 +0,0 @@
-<?php
-
-/*
- * This file is part of the zenstruck/browser package.
- *
- * (c) Kevin Bond <kevinbond@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Zenstruck\Browser\Session\Driver;
-
-use Behat\Mink\Exception\DriverException;
-use Behat\Mink\Exception\UnsupportedDriverActionException;
-use Symfony\Bundle\FrameworkBundle\KernelBrowser;
-use Symfony\Component\BrowserKit\Cookie;
-use Symfony\Component\BrowserKit\Exception\BadMethodCallException;
-use Symfony\Component\BrowserKit\Response;
-use Symfony\Component\DomCrawler\Crawler;
-use Symfony\Component\DomCrawler\Field\ChoiceFormField;
-use Symfony\Component\DomCrawler\Field\FileFormField;
-use Symfony\Component\DomCrawler\Field\FormField;
-use Symfony\Component\DomCrawler\Field\InputFormField;
-use Symfony\Component\DomCrawler\Field\TextareaFormField;
-use Symfony\Component\DomCrawler\Form;
-use Zenstruck\Assert;
-use Zenstruck\Browser\HttpOptions;
-use Zenstruck\Browser\Session\Driver;
-
-/**
- * Copied from https://github.com/minkphp/MinkBrowserKitDriver for use
- * until it supports Symfony 5/PHP 8.
- *
- * @ref https://github.com/minkphp/MinkBrowserKitDriver
- * @ref https://github.com/minkphp/MinkBrowserKitDriver/pull/151
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * @internal
- */
-final class BrowserKitDriver extends Driver
-{
-    private const EMPTY_FILE_VALUE = [
-        'name' => '',
-        'type' => '',
-        'tmp_name' => '',
-        'error' => 4,
-        'size' => 0,
-    ];
-
-    /** @var Form[] */
-    private array $forms = [];
-
-    /** @var array<string,string> */
-    private array $serverParameters = [];
-
-    /** @var mixed */
-    private $expectedException;
-    private ?string $expectedExceptionMessage = null;
-
-    public function expectException($expectedException, ?string $expectedMessage = null): void
-    {
-        $this->expectedException = $expectedException;
-        $this->expectedExceptionMessage = $expectedMessage;
-    }
-
-    public function stop(): void
-    {
-        $this->reset();
-
-        parent::stop();
-    }
-
-    public function reset(): void
-    {
-        parent::reset();
-
-        $this->forms = [];
-        $this->serverParameters = [];
-    }
-
-    public function request(string $method, string $url, HttpOptions $options): void
-    {
-        $options = $options->merge(['server' => $this->serverParameters]);
-
-        $this->wrapRequest(function() use ($method, $url, $options) {
-            $this->client()->request(
-                $method,
-                $options->addQueryToUrl($url),
-                $options->parameters(),
-                $options->files(),
-                $options->server(),
-                $options->body(),
-            );
-        });
-    }
-
-    public function getCurrentUrl(): string
-    {
-        // This should be encapsulated in `getRequest` method if any other method needs the request
-        try {
-            $request = $this->client()->getInternalRequest();
-        } catch (BadMethodCallException $e) {
-            // Handling Symfony 5+ behaviour
-            $request = null;
-        }
-
-        if (null === $request) {
-            throw new DriverException('Unable to access the request before visiting a page');
-        }
-
-        return $request->getUri();
-    }
-
-    public function reload(): void
-    {
-        $this->client()->reload();
-        $this->forms = [];
-    }
-
-    public function forward(): void
-    {
-        $this->client()->forward();
-        $this->forms = [];
-    }
-
-    public function back(): void
-    {
-        $this->client()->back();
-        $this->forms = [];
-    }
-
-    /**
-     * @param false|string $user
-     */
-    public function setBasicAuth($user, $password): void
-    {
-        if (false === $user) {
-            unset($this->serverParameters['PHP_AUTH_USER'], $this->serverParameters['PHP_AUTH_PW']);
-
-            return;
-        }
-
-        $this->serverParameters['PHP_AUTH_USER'] = $user;
-        $this->serverParameters['PHP_AUTH_PW'] = $password;
-    }
-
-    public function setRequestHeader($name, $value): void
-    {
-        $contentHeaders = ['CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true];
-        $name = \str_replace('-', '_', \mb_strtoupper($name));
-
-        // CONTENT_* are not prefixed with HTTP_ in PHP when building $_SERVER
-        if (!isset($contentHeaders[$name])) {
-            $name = 'HTTP_'.$name;
-        }
-
-        $this->serverParameters[$name] = $value;
-    }
-
-    public function getResponseHeaders(): array
-    {
-        return $this->getResponse()->getHeaders();
-    }
-
-    public function setCookie($name, $value = null): void
-    {
-        if (null === $value) {
-            $this->deleteCookie($name);
-
-            return;
-        }
-
-        $jar = $this->client()->getCookieJar();
-        $jar->set(new Cookie($name, $value));
-    }
-
-    public function getCookie($name): ?string
-    {
-        // Note that the following doesn't work well because
-        // Symfony\Component\BrowserKit\CookieJar stores cookies by name,
-        // path, AND domain and if you don't fill them all in correctly then
-        // you won't get the value that you're expecting.
-        //
-        // $jar = $this->client->getCookieJar();
-        //
-        // if (null !== $cookie = $jar->get($name)) {
-        //     return $cookie->getValue();
-        // }
-
-        $allValues = $this->client()->getCookieJar()->allValues($this->getCurrentUrl());
-
-        if (isset($allValues[$name])) {
-            return $allValues[$name];
-        }
-
-        return null;
-    }
-
-    public function getStatusCode(): int
-    {
-        return $this->getResponse()->getStatusCode();
-    }
-
-    public function getContent(): string
-    {
-        return $this->getResponse()->getContent();
-    }
-
-    public function getTagName($xpath): string
-    {
-        return $this->getCrawlerNode($this->getFilteredCrawler($xpath))->nodeName;
-    }
-
-    public function getText($xpath): string
-    {
-        return \trim($this->getFilteredCrawler($xpath)->text(null, true));
-    }
-
-    public function getHtml($xpath): string
-    {
-        return $this->getFilteredCrawler($xpath)->html();
-    }
-
-    public function getOuterHtml($xpath): string
-    {
-        return $this->getFilteredCrawler($xpath)->outerHtml();
-    }
-
-    public function getAttribute($xpath, $name): ?string
-    {
-        $node = $this->getFilteredCrawler($xpath);
-
-        if ($this->getCrawlerNode($node)->hasAttribute($name)) {
-            return $node->attr($name);
-        }
-
-        return null;
-    }
-
-    /**
-     * @return array|bool|string|null
-     */
-    public function getValue($xpath)
-    {
-        if (\in_array($this->getAttribute($xpath, 'type'), ['submit', 'image', 'button'], true)) {
-            return $this->getAttribute($xpath, 'value');
-        }
-
-        $node = $this->getCrawlerNode($this->getFilteredCrawler($xpath));
-
-        if ('option' === $node->tagName) {
-            return $this->getOptionValue($node);
-        }
-
-        try {
-            $field = $this->getFormField($xpath);
-        } catch (\InvalidArgumentException $e) {
-            return $this->getAttribute($xpath, 'value');
-        }
-
-        $value = $field->getValue();
-
-        if ('select' === $node->tagName && null === $value) {
-            // symfony/dom-crawler returns null as value for a non-multiple select without
-            // options but we want an empty string to match browsers.
-            $value = '';
-        }
-
-        return $value;
-    }
-
-    public function setValue($xpath, $value): void
-    {
-        $this->getFormField($xpath)->setValue($value);
-    }
-
-    public function check($xpath): void
-    {
-        $this->getCheckboxField($xpath)->tick();
-    }
-
-    public function uncheck($xpath): void
-    {
-        $this->getCheckboxField($xpath)->untick();
-    }
-
-    public function selectOption($xpath, $value, $multiple = false): void
-    {
-        $field = $this->getFormField($xpath);
-
-        if (!$field instanceof ChoiceFormField) {
-            throw new DriverException(\sprintf('Impossible to select an option on the element with XPath "%s" as it is not a select or radio input', $xpath));
-        }
-
-        if ($multiple) {
-            $oldValue = (array) $field->getValue();
-            $oldValue[] = $value;
-            $value = $oldValue;
-        }
-
-        $field->select($value);
-    }
-
-    public function isSelected($xpath): bool
-    {
-        $optionValue = $this->getOptionValue($this->getCrawlerNode($this->getFilteredCrawler($xpath)));
-        $selectField = $this->getFormField('('.$xpath.')/ancestor-or-self::*[local-name()="select"]');
-        $selectValue = $selectField->getValue();
-
-        return \is_array($selectValue) ? \in_array($optionValue, $selectValue, true) : $optionValue === $selectValue;
-    }
-
-    public function isVisible($xpath): bool
-    {
-        $this->getFilteredCrawler($xpath); // just check that the element exists
-
-        return true;
-    }
-
-    public function click($xpath): void
-    {
-        $crawler = $this->getFilteredCrawler($xpath);
-        $node = $this->getCrawlerNode($crawler);
-        $tagName = $node->nodeName;
-
-        if ('a' === $tagName) {
-            $this->wrapRequest(fn() => $this->client()->click($crawler->link()));
-            $this->forms = [];
-        } elseif ($this->canSubmitForm($node)) {
-            $this->submit($crawler->form());
-        } elseif ($this->canResetForm($node)) {
-            $this->resetForm($node);
-        } else {
-            $message = \sprintf('%%s supports clicking on links and submit or reset buttons only. But "%s" provided', $tagName);
-
-            throw new UnsupportedDriverActionException($message, $this);
-        }
-    }
-
-    public function isChecked($xpath): bool
-    {
-        $field = $this->getFormField($xpath);
-
-        if (!$field instanceof ChoiceFormField || 'select' === $field->getType()) {
-            throw new DriverException(\sprintf('Impossible to get the checked state of the element with XPath "%s" as it is not a checkbox or radio input', $xpath));
-        }
-
-        if ('checkbox' === $field->getType()) {
-            return $field->hasValue();
-        }
-
-        $radio = $this->getCrawlerNode($this->getFilteredCrawler($xpath));
-
-        return $radio->getAttribute('value') === $field->getValue();
-    }
-
-    /**
-     * @param string $path
-     */
-    public function attachFile($xpath, $path): void
-    {
-        $field = $this->getFormField($xpath);
-
-        if (!$field instanceof FileFormField) {
-            throw new DriverException(\sprintf('Impossible to attach a file on the element with XPath "%s" as it is not a file input', $xpath));
-        }
-
-        if (self::EMPTY_FILE_VALUE === $field->getValue()) {
-            // first file
-            $field->upload($path);
-
-            return;
-        }
-
-        if (null === $this->getFilteredCrawler($xpath)->attr('multiple')) {
-            throw new \InvalidArgumentException('Cannot attach multiple files to a non-multiple file field.');
-        }
-
-        // field has values, so append
-        $fieldNode = $this->getCrawlerNode($this->getFilteredCrawler($xpath));
-        $form = $this->getFormForFieldNode($fieldNode);
-        $field = new FileFormField($fieldNode);
-        $field->upload($path);
-        $form->set($field);
-    }
-
-    public function submitForm($xpath): void
-    {
-        $crawler = $this->getFilteredCrawler($xpath);
-
-        $this->submit($crawler->form());
-    }
-
-    protected function findElementXpaths($xpath): array
-    {
-        $nodes = $this->getCrawler()->filterXPath($xpath);
-
-        $elements = [];
-        foreach ($nodes as $i => $node) {
-            $elements[] = \sprintf('(%s)[%d]', $xpath, $i + 1);
-        }
-
-        return $elements;
-    }
-
-    private function getResponse(): Response
-    {
-        try {
-            $response = $this->client()->getInternalResponse();
-        } catch (BadMethodCallException $e) {
-            // Handling Symfony 5+ behaviour
-            $response = null;
-        }
-
-        if (null === $response) {
-            throw new DriverException('Unable to access the response before visiting a page');
-        }
-
-        return $response;
-    }
-
-    private function getFormField(string $xpath): FormField
-    {
-        $fieldNode = $this->getCrawlerNode($this->getFilteredCrawler($xpath));
-        $fieldName = \str_replace('[]', '', $fieldNode->getAttribute('name'));
-
-        $form = $this->getFormForFieldNode($fieldNode);
-
-        if (\is_array($form[$fieldName])) {
-            return $form[$fieldName][$this->getFieldPosition($fieldNode)];
-        }
-
-        return $form[$fieldName];
-    }
-
-    private function getFormForFieldNode(\DOMElement $fieldNode): Form
-    {
-        $formNode = $this->getFormNode($fieldNode);
-        $formId = $this->getFormNodeId($formNode);
-
-        if (!isset($this->forms[$formId])) {
-            $this->forms[$formId] = new Form($formNode, $this->getCurrentUrl());
-        }
-
-        return $this->forms[$formId];
-    }
-
-    /**
-     * Deletes a cookie by name.
-     */
-    private function deleteCookie(string $name): void
-    {
-        $path = $this->getCookiePath();
-        $jar = $this->client()->getCookieJar();
-
-        do {
-            if (null !== $jar->get($name, $path)) {
-                $jar->expire($name, $path);
-            }
-
-            $path = \preg_replace('/.$/', '', $path);
-        } while ($path);
-    }
-
-    /**
-     * Returns current cookie path.
-     */
-    private function getCookiePath(): string
-    {
-        $path = \dirname(\parse_url($this->getCurrentUrl(), \PHP_URL_PATH));
-
-        if ('\\' === \DIRECTORY_SEPARATOR) {
-            $path = \str_replace('\\', '/', $path);
-        }
-
-        return $path;
-    }
-
-    /**
-     * Returns the checkbox field from xpath query, ensuring it is valid.
-     *
-     * @throws DriverException when the field is not a checkbox
-     */
-    private function getCheckboxField(string $xpath): ChoiceFormField
-    {
-        $field = $this->getFormField($xpath);
-
-        if (!$field instanceof ChoiceFormField) {
-            throw new DriverException(\sprintf('Impossible to check the element with XPath "%s" as it is not a checkbox', $xpath));
-        }
-
-        return $field;
-    }
-
-    /**
-     * @throws DriverException if the form node cannot be found
-     */
-    private function getFormNode(\DOMElement $element): \DOMElement
-    {
-        if ($element->hasAttribute('form')) {
-            $formId = $element->getAttribute('form');
-
-            if (!$element->ownerDocument) {
-                throw new DriverException(\sprintf('The selected node has an invalid form attribute (%s).', $formId));
-            }
-
-            $formNode = $element->ownerDocument->getElementById($formId);
-
-            if (null === $formNode || 'form' !== $formNode->nodeName) {
-                throw new DriverException(\sprintf('The selected node has an invalid form attribute (%s).', $formId));
-            }
-
-            return $formNode;
-        }
-
-        $formNode = $element;
-
-        do {
-            // use the ancestor form element
-            if (null === $formNode = $formNode->parentNode) {
-                throw new DriverException('The selected node does not have a form ancestor.');
-            }
-        } while ('form' !== $formNode->nodeName);
-
-        return $formNode;
-    }
-
-    /**
-     * Gets the position of the field node among elements with the same name.
-     *
-     * BrowserKit uses the field name as index to find the field in its Form object.
-     * When multiple fields have the same name (checkboxes for instance), it will return
-     * an array of elements in the order they appear in the DOM.
-     */
-    private function getFieldPosition(\DOMElement $fieldNode): int
-    {
-        $elements = $this->getCrawler()->filterXPath('//*[@name=\''.$fieldNode->getAttribute('name').'\']');
-
-        if (\count($elements) > 1) {
-            // more than one element contains this name !
-            // so we need to find the position of $fieldNode
-            foreach ($elements as $key => $element) {
-                /** @var \DOMElement $element */
-                if ($element->getNodePath() === $fieldNode->getNodePath()) {
-                    return $key;
-                }
-            }
-        }
-
-        return 0;
-    }
-
-    private function submit(Form $form): void
-    {
-        $formId = $this->getFormNodeId($form->getFormNode());
-
-        if (isset($this->forms[$formId])) {
-            $form = $this->addButtons($form, $this->forms[$formId]);
-        }
-
-        // remove empty file fields from request
-        foreach ($form->getFiles() as $name => $field) {
-            if (empty($field['name']) && empty($field['tmp_name'])) {
-                $form->remove($name);
-            }
-        }
-
-        foreach ($form->all() as $field) {
-            // Add a fix for https://github.com/symfony/symfony/pull/10733 to support Symfony versions which are not fixed
-            if ($field instanceof TextareaFormField && null === $field->getValue()) {
-                $field->setValue('');
-            }
-        }
-
-        $this->wrapRequest(fn() => $this->client()->submit($form, [], $this->serverParameters));
-
-        $this->forms = [];
-    }
-
-    private function resetForm(\DOMElement $fieldNode): void
-    {
-        $formNode = $this->getFormNode($fieldNode);
-        $formId = $this->getFormNodeId($formNode);
-        unset($this->forms[$formId]);
-    }
-
-    /**
-     * Determines if a node can submit a form.
-     */
-    private function canSubmitForm(\DOMElement $node): bool
-    {
-        $type = $node->hasAttribute('type') ? $node->getAttribute('type') : null;
-
-        if ('input' === $node->nodeName && \in_array($type, ['submit', 'image'], true)) {
-            return true;
-        }
-
-        return 'button' === $node->nodeName && (null === $type || 'submit' === $type);
-    }
-
-    /**
-     * Determines if a node can reset a form.
-     */
-    private function canResetForm(\DOMElement $node): bool
-    {
-        $type = $node->hasAttribute('type') ? $node->getAttribute('type') : null;
-
-        return \in_array($node->nodeName, ['input', 'button'], true) && 'reset' === $type;
-    }
-
-    /**
-     * Returns form node unique identifier.
-     */
-    private function getFormNodeId(\DOMElement $form): string
-    {
-        return \md5($form->getLineNo().$form->getNodePath().$form->nodeValue);
-    }
-
-    /**
-     * Gets the value of an option element.
-     *
-     * @see ChoiceFormField::buildOptionValue()
-     */
-    private function getOptionValue(\DOMElement $option): string
-    {
-        if ($option->hasAttribute('value')) {
-            return $option->getAttribute('value');
-        }
-
-        if (!empty($option->nodeValue)) {
-            return $option->nodeValue;
-        }
-
-        return '1'; // DomCrawler uses 1 by default if there is no text in the option
-    }
-
-    /**
-     * Returns DOMElement from crawler instance.
-     *
-     * @throws DriverException when the node does not exist
-     */
-    private function getCrawlerNode(Crawler $crawler): \DOMElement
-    {
-        if ($crawler instanceof \Iterator) {
-            // for symfony 2.3 compatibility as getNode is not public before symfony 2.4
-            $crawler->rewind();
-            $node = $crawler->current();
-        } else {
-            $node = $crawler->getNode(0);
-        }
-
-        if (null !== $node) {
-            return $node;
-        }
-
-        throw new DriverException('The element does not exist');
-    }
-
-    /**
-     * Returns a crawler filtered for the given XPath, requiring at least 1 result.
-     *
-     * @throws DriverException when no matching elements are found
-     */
-    private function getFilteredCrawler(string $xpath): Crawler
-    {
-        if (!\count($crawler = $this->getCrawler()->filterXPath($xpath))) {
-            throw new DriverException(\sprintf('There is no element matching XPath "%s"', $xpath));
-        }
-
-        return $crawler;
-    }
-
-    /**
-     * Returns crawler instance (got from client).
-     */
-    private function getCrawler(): Crawler
-    {
-        try {
-            return $this->client()->getCrawler();
-        } catch (BadMethodCallException $e) {
-            throw new DriverException('Unable to access the response content before visiting a page', 0, $e);
-        }
-    }
-
-    /**
-     * Adds button fields from submitted form to cached version.
-     */
-    private function addButtons(Form $submitted, Form $cached): Form
-    {
-        foreach ($submitted->all() as $field) {
-            if (!$field instanceof InputFormField) {
-                continue;
-            }
-
-            $nodeReflection = (new \ReflectionObject($field))->getProperty('node');
-            $nodeReflection->setAccessible(true);
-
-            $node = $nodeReflection->getValue($field);
-
-            if ('button' === $node->nodeName || \in_array($node->getAttribute('type'), ['submit', 'button', 'image'])) {
-                $cached->set($field);
-            }
-        }
-
-        return $cached;
-    }
-
-    private function wrapRequest(callable $callback): void
-    {
-        if (!$this->expectedException) {
-            $callback();
-
-            return;
-        }
-
-        $client = $this->client();
-
-        \assert($client instanceof KernelBrowser);
-
-        // todo reset to original value after request
-        $client->catchExceptions(false);
-
-        Assert::that($callback)->throws($this->expectedException, $this->expectedExceptionMessage);
-
-        $this->expectedException = $this->expectedExceptionMessage = null;
-    }
-}
diff --git a/src/Browser/Session/Driver/PantherDriver.php b/src/Browser/Session/Driver/PantherDriver.php
deleted file mode 100644
index 1c15927..0000000
--- a/src/Browser/Session/Driver/PantherDriver.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-
-/*
- * This file is part of the zenstruck/browser package.
- *
- * (c) Kevin Bond <kevinbond@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Zenstruck\Browser\Session\Driver;
-
-use Behat\Mink\Exception\DriverException;
-use Behat\Mink\Exception\UnsupportedDriverActionException;
-use Facebook\WebDriver\Exception\NoSuchElementException;
-use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
-use Facebook\WebDriver\Internal\WebDriverLocatable;
-use Facebook\WebDriver\WebDriverElement;
-use Facebook\WebDriver\WebDriverSelect;
-use Symfony\Component\BrowserKit\Exception\BadMethodCallException;
-use Symfony\Component\DomCrawler\Field\FormField;
-use Symfony\Component\Panther\Client;
-use Symfony\Component\Panther\DomCrawler\Crawler;
-use Symfony\Component\Panther\DomCrawler\Field\ChoiceFormField;
-use Symfony\Component\Panther\DomCrawler\Field\FileFormField;
-use Symfony\Component\Panther\DomCrawler\Field\InputFormField;
-use Symfony\Component\Panther\DomCrawler\Field\TextareaFormField;
-use Zenstruck\Browser\HttpOptions;
-use Zenstruck\Browser\Session\Driver;
-
-/**
- * @ref https://github.com/robertfausk/mink-panther-driver
- *
- * @author Robert Freigang <robertfreigang@gmx.de>
- * @author Kevin Bond <kevinbond@gmail.com>
- *
- * @internal
- *
- * @method Client client()
- */
-final class PantherDriver extends Driver
-{
-    private const EMPTY_FILE_VALUE = [
-        'name' => '',
-        'type' => '',
-        'tmp_name' => '',
-        'error' => 4,
-        'size' => 0,
-    ];
-
-    public function __construct(Client $client)
-    {
-        parent::__construct($client);
-    }
-
-    public function request(string $method, string $url, HttpOptions $options): void
-    {
-        if ('GET' !== $method) {
-            throw new UnsupportedDriverActionException('%s only supports "GET" requests.', $this);
-        }
-
-        $this->client()->request('GET', $this->prepareUrl($url));
-    }
-
-    public function quit(): void
-    {
-        $this->client()->quit();
-    }
-
-    public function getCurrentUrl(): string
-    {
-        return $this->client()->getCurrentURL();
-    }
-
-    public function getContent(): string
-    {
-        return $this->client()->getWebDriver()->getPageSource();
-    }
-
-    public function getText($xpath): string
-    {
-        $crawler = $this->filteredCrawler($xpath);
-
-        if (($element = $crawler->getElement(0)) && 'title' === $element->getTagName()) {
-            // hack to get the text of the title html element
-            // for this element, WebDriverElement::getText() returns an empty string
-            // the only way to get the value is to get title from the client
-            return $this->client()->getTitle();
-        }
-
-        return \trim($crawler->text(null, true));
-    }
-
-    /**
-     * @return array|bool|string|null
-     */
-    public function getValue($xpath)
-    {
-        try {
-            $formField = $this->formField($xpath);
-            $value = $formField->getValue();
-
-            if ('' === $value && $formField instanceof ChoiceFormField) {
-                $value = null;
-            }
-        } catch (DriverException $e) {
-            // e.g. element is an option
-            $element = $this->crawlerElement($this->filteredCrawler($xpath));
-            $value = $element->getAttribute('value');
-        }
-
-        return $value;
-    }
-
-    public function setValue($xpath, $value): void
-    {
-        $element = $this->crawlerElement($this->filteredCrawler($xpath));
-        $jsNode = $this->jsNode($xpath);
-
-        if (!$value && 'select' === $element->getTagName() && $element->getAttribute('multiple')) {
-            $this->executeScript(\sprintf('%s.selectedIndex = -1', $jsNode));
-        }
-
-        if ('input' === $element->getTagName() && \in_array($element->getAttribute('type'), ['date', 'time', 'color'])) {
-            $this->executeScript(\sprintf('%s.value = \'%s\'', $jsNode, $value));
-        } else {
-            try {
-                $formField = $this->formField($xpath);
-                $formField->setValue($value);
-            } catch (DriverException $e) {
-                // e.g. element is on option
-                $element->sendKeys($value);
-            }
-        }
-
-        // Remove the focus from the element if the field still has focus in
-        // order to trigger the change event. By doing this instead of simply
-        // triggering the change event for the given xpath we ensure that the
-        // change event will not be triggered twice for the same element if it
-        // has lost focus in the meanwhile. If the element has lost focus
-        // already then there is nothing to do as this will already have caused
-        // the triggering of the change event for that element.
-        if ($this->evaluateScript(\sprintf('document.activeElement === %s', $jsNode))) {
-            $this->executeScript('document.activeElement.blur();');
-        }
-    }
-
-    public function getTagName($xpath): string
-    {
-        return $this->crawlerElement($this->filteredCrawler($xpath))->getTagName();
-    }
-
-    public function check($xpath): void
-    {
-        $this->choiceFormField($xpath)->tick();
-    }
-
-    public function uncheck($xpath): void
-    {
-        $this->choiceFormField($xpath)->untick();
-    }
-
-    public function selectOption($xpath, $value, $multiple = false): void
-    {
-        try {
-            $this->choiceFormField($xpath)->select($value);
-
-            return;
-        } catch (NoSuchElementException $e) {
-        }
-
-        // try selecting by visible text
-        $select = new WebDriverSelect($this->crawlerElement($this->filteredCrawler($xpath)));
-        $select->selectByVisibleText($value);
-    }
-
-    /**
-     * @param string $path
-     */
-    public function attachFile($xpath, $path): void
-    {
-        $field = $this->fileFormField($xpath);
-
-        if (self::EMPTY_FILE_VALUE === $field->getValue()) {
-            // first file
-            $field->upload($path);
-
-            return;
-        }
-
-        if (!$this->filteredCrawler($xpath)->attr('multiple')) {
-            throw new \InvalidArgumentException('Cannot attach multiple files to a non-multiple file field.');
-        }
-
-        $field->upload($path);
-    }
-
-    public function isChecked($xpath): bool
-    {
-        $element = $this->crawlerElement($this->filteredCrawler($xpath));
-
-        if ('radio' === \mb_strtolower((string) $element->getAttribute('type'))) {
-            return null !== $element->getAttribute('checked');
-        }
-
-        return $this->choiceFormField($xpath)->hasValue();
-    }
-
-    public function click($xpath): void
-    {
-        $this->client()->getMouse()->click($this->toCoordinates($xpath));
-        $this->client()->refreshCrawler();
-    }
-
-    public function doubleClick($xpath): void
-    {
-        $this->client()->getMouse()->doubleClick($this->toCoordinates($xpath));
-        $this->client()->refreshCrawler();
-    }
-
-    public function rightClick($xpath): void
-    {
-        $this->client()->getMouse()->contextClick($this->toCoordinates($xpath));
-        $this->client()->refreshCrawler();
-    }
-
-    public function executeScript($script): void
-    {
-        if (\preg_match('/^function[\s(]/', $script)) {
-            $script = \preg_replace('/;$/', '', $script);
-            $script = '('.$script.')';
-        }
-
-        $this->client()->executeScript($script);
-    }
-
-    public function evaluateScript($script)
-    {
-        if (0 !== \mb_strpos(\trim($script), 'return ')) {
-            $script = 'return '.$script;
-        }
-
-        return $this->client()->executeScript($script);
-    }
-
-    public function getHtml($xpath): string
-    {
-        // cut the tag itself (making innerHTML out of outerHTML)
-        return (string) \preg_replace('/^<[^>]+>|<[^>]+>$/', '', $this->getOuterHtml($xpath));
-    }
-
-    public function isVisible($xpath): bool
-    {
-        return $this->crawlerElement($this->filteredCrawler($xpath))->isDisplayed();
-    }
-
-    public function getOuterHtml($xpath): string
-    {
-        return $this->filteredCrawler($xpath)->html();
-    }
-
-    public function getAttribute($xpath, $name): ?string
-    {
-        return $this->crawlerElement($this->filteredCrawler($xpath))->getAttribute($name);
-    }
-
-    protected function findElementXpaths($xpath): array
-    {
-        $nodes = $this->crawler()->filterXPath($xpath);
-
-        $elements = [];
-
-        foreach ($nodes as $i => $node) {
-            $elements[] = \sprintf('(%s)[%d]', $xpath, $i + 1);
-        }
-
-        return $elements;
-    }
-
-    private function crawlerElement(Crawler $crawler): WebDriverElement
-    {
-        if (null !== $node = $crawler->getElement(0)) {
-            return $node;
-        }
-
-        throw new DriverException('The element does not exist');
-    }
-
-    private function prepareUrl(string $url): string
-    {
-        return (string) \preg_replace('#(https?://[^/]+)(/[^/.]+\.php)?#', '$1$2', $url);
-    }
-
-    private function filteredCrawler(string $xpath): Crawler
-    {
-        if (!\count($crawler = $this->crawler()->filterXPath($xpath))) {
-            throw new DriverException(\sprintf('There is no element matching XPath "%s"', $xpath));
-        }
-
-        return $crawler;
-    }
-
-    private function crawler(): Crawler
-    {
-        try {
-            return $this->client()->getCrawler();
-        } catch (BadMethodCallException $e) {
-            throw new DriverException('Unable to access the response content before visiting a page', 0, $e);
-        }
-    }
-
-    private function formField(string $xpath): FormField
-    {
-        try {
-            return $this->choiceFormField($xpath);
-        } catch (DriverException $e) {
-            try {
-                return $this->inputFormField($xpath);
-            } catch (DriverException $e) {
-                try {
-                    return $this->fileFormField($xpath);
-                } catch (DriverException $e) {
-                    return $this->textareaFormField($xpath);
-                }
-            }
-        }
-    }
-
-    private function choiceFormField(string $xpath): ChoiceFormField
-    {
-        $element = $this->crawlerElement($this->filteredCrawler($xpath));
-
-        try {
-            return new ChoiceFormField($element);
-        } catch (\LogicException $e) {
-            throw new DriverException(\sprintf('Impossible to get the element with XPath "%s" as it is not a choice form field. %s', $xpath, $e->getMessage()));
-        }
-    }
-
-    private function inputFormField(string $xpath): InputFormField
-    {
-        $element = $this->crawlerElement($this->filteredCrawler($xpath));
-
-        try {
-            return new InputFormField($element);
-        } catch (\LogicException $e) {
-            throw new DriverException(\sprintf('Impossible to check the element with XPath "%s" as it is not an input form field.', $xpath));
-        }
-    }
-
-    private function fileFormField(string $xpath): FileFormField
-    {
-        $element = $this->crawlerElement($this->filteredCrawler($xpath));
-
-        try {
-            return new FileFormField($element);
-        } catch (\LogicException $e) {
-            throw new DriverException(\sprintf('Impossible to check the element with XPath "%s" as it is not a file form field.', $xpath));
-        }
-    }
-
-    private function textareaFormField(string $xpath): TextareaFormField
-    {
-        $element = $this->crawlerElement($this->filteredCrawler($xpath));
-
-        try {
-            return new TextareaFormField($element);
-        } catch (\LogicException $e) {
-            throw new DriverException(\sprintf('Impossible to check the element with XPath "%s" as it is not a textarea.', $xpath));
-        }
-    }
-
-    private function toCoordinates(string $xpath): WebDriverCoordinates
-    {
-        $element = $this->crawlerElement($this->filteredCrawler($xpath));
-
-        if (!$element instanceof WebDriverLocatable) {
-            throw new \RuntimeException(\sprintf('The element of "%s" xpath selector does not implement "%s".', $xpath, WebDriverLocatable::class));
-        }
-
-        return $element->getCoordinates();
-    }
-
-    private function jsNode(string $xpath): string
-    {
-        return "document.evaluate(`{$xpath}`, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue";
-    }
-}
diff --git a/src/Browser/Session/KernelSession.php b/src/Browser/Session/KernelSession.php
new file mode 100644
index 0000000..aade822
--- /dev/null
+++ b/src/Browser/Session/KernelSession.php
@@ -0,0 +1,258 @@
+<?php
+
+/*
+ * This file is part of the zenstruck/browser package.
+ *
+ * (c) Kevin Bond <kevinbond@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Zenstruck\Browser\Session;
+
+use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use Symfony\Component\BrowserKit\Exception\BadMethodCallException;
+use Symfony\Component\BrowserKit\Response;
+use Symfony\Component\DomCrawler\Field\ChoiceFormField;
+use Symfony\Component\DomCrawler\Field\FileFormField;
+use Symfony\Component\DomCrawler\Field\FormField;
+use Symfony\Component\DomCrawler\Field\InputFormField;
+use Symfony\Component\DomCrawler\Form;
+use Zenstruck\Browser\Session;
+use Zenstruck\Dom;
+use Zenstruck\Dom\Exception\RuntimeException;
+use Zenstruck\Dom\Node;
+use Zenstruck\Dom\Node\Form\Button;
+use Zenstruck\Dom\Node\Form\Element;
+use Zenstruck\Dom\Node\Form\Field;
+use Zenstruck\Dom\Node\Form\Field\Checkbox;
+use Zenstruck\Dom\Node\Form\Field\File;
+use Zenstruck\Dom\Node\Form\Field\Input;
+use Zenstruck\Dom\Node\Form\Field\Radio;
+use Zenstruck\Dom\Node\Form\Field\Select\Combobox;
+use Zenstruck\Dom\Node\Form\Field\Select\Multiselect;
+use Zenstruck\Dom\Node\Form\Field\Select\Option;
+use Zenstruck\Dom\Node\Form\Field\Textarea;
+
+/**
+ * @author Kevin Bond <kevinbond@gmail.com>
+ * @author Konstantin Kudryashov <ever.zet@gmail.com>
+ *
+ * @internal
+ *
+ * @method KernelBrowser client()
+ */
+final class KernelSession extends Session
+{
+    private Dom $dom;
+    private ?Response $response = null;
+
+    /** @var array<string,Form> */
+    private array $forms = [];
+
+    public function __construct(KernelBrowser $client)
+    {
+        parent::__construct($client);
+    }
+
+    public function dom(): Dom
+    {
+        try {
+            return $this->resetIfRequired()->dom ??= new Dom($this->client()->getCrawler(), $this);
+        } catch (BadMethodCallException) {
+            throw new RuntimeException('The session has not yet been started.');
+        }
+    }
+
+    public function content(): string
+    {
+        return $this->client()->getInternalResponse()->getContent();
+    }
+
+    public function currentUrl(): string
+    {
+        return $this->client()->getInternalRequest()->getUri();
+    }
+
+    public function isSuccess(): bool
+    {
+        return $this->statusCode() >= 200 && $this->statusCode() < 300;
+    }
+
+    public function isRedirect(): bool
+    {
+        return $this->statusCode() >= 300 && $this->statusCode() < 400;
+    }
+
+    public function statusCode(): int
+    {
+        return $this->client()->getInternalResponse()->getStatusCode();
+    }
+
+    public function isStarted(): bool
+    {
+        try {
+            $this->client()->getInternalResponse();
+
+            return true;
+        } catch (BadMethodCallException) {
+            return false;
+        }
+    }
+
+    public function click(Node $node): void
+    {
+        $this->ensureSameSession();
+
+        if ('a' === \mb_strtolower($node->tag())) {
+            $this->client()->click($node->crawler()->link());
+
+            return;
+        }
+
+        if (!$node instanceof Button) {
+            throw new RuntimeException(\sprintf('"%s" only supports clicking on "a" tags or buttons.', __CLASS__));
+        }
+
+        $form = $this->formFor($node);
+
+        if ($node->name()) {
+            // add button to form
+            $field = new InputFormField($node->element());
+            $field->setValue($node->value());
+            $form->set($field);
+        }
+
+        $this->client()->submit($form);
+    }
+
+    public function select(Option|Radio|Checkbox $node): void
+    {
+        if ($node instanceof Checkbox || $node instanceof Radio) {
+            $field = $this->formFieldFor($node);
+
+            \assert($field instanceof ChoiceFormField);
+
+            $node instanceof Checkbox ? $field->tick() : $field->select($node->value());
+
+            return;
+        }
+
+        $select = $node->selector() ?? throw new RuntimeException('Could not find "select" for "option".');
+        $field = $this->formFieldFor($select);
+
+        \assert($field instanceof ChoiceFormField);
+
+        if ($select instanceof Combobox) {
+            $field->select($node->value());
+
+            return;
+        }
+
+        $values = (array) $field->getValue();
+        $values[] = $node->value();
+
+        $field->select(\array_unique($values));
+    }
+
+    public function unselect(Checkbox|Multiselect $node): void
+    {
+        $field = $this->formFieldFor($node);
+
+        \assert($field instanceof ChoiceFormField);
+
+        if ($field->isMultiple()) {
+            $field->select([]);
+
+            return;
+        }
+
+        $field->untick();
+    }
+
+    public function attach(File $node, array $filenames): void
+    {
+        $form = $this->formFor($node);
+        $field = $this->formFieldFor($node);
+
+        $field->setValue(\array_shift($filenames));
+
+        foreach ($filenames as $file) {
+            $field = new FileFormField($node->element());
+            $field->upload($file);
+            $form->set($field);
+        }
+    }
+
+    public function fill(Textarea|Input $node, string $value): void
+    {
+        $this->formFieldFor($node)->setValue($value);
+    }
+
+    private function ensureSameSession(): void
+    {
+        if (!$this->isSameSession()) {
+            throw new RuntimeException('The current session has expired.');
+        }
+    }
+
+    private function resetIfRequired(): self
+    {
+        if ($this->isSameSession()) {
+            return $this;
+        }
+
+        $this->response = $this->client()->getInternalResponse();
+        unset($this->dom);
+        $this->forms = [];
+
+        return $this;
+    }
+
+    private function isSameSession(): bool
+    {
+        try {
+            return $this->response === $this->client()->getInternalResponse();
+        } catch (BadMethodCallException) {
+            throw new RuntimeException('The session has not yet been started.');
+        }
+    }
+
+    private function formFieldFor(Field $node): FormField
+    {
+        $form = $this->formFor($node);
+        $name = \str_replace('[]', '', (string) $node->name());
+        $field = $form->get($name);
+
+        if (\is_array($field)) {
+            return $field[$this->fieldPositionFor($node)]; // @phpstan-ignore-line
+        }
+
+        return $field;
+    }
+
+    private function fieldPositionFor(Field $node): int
+    {
+        $element = $node->element();
+
+        foreach ($node->collection() as $position => $field) {
+            if ($field->element()->getNodePath() === $element->getNodePath()) {
+                return $position;
+            }
+        }
+
+        return 0;
+    }
+
+    private function formFor(Element $node): Form
+    {
+        $this->ensureSameSession();
+
+        $form = $node->form() ?? throw new RuntimeException(\sprintf('Unable to find form for "%s".', $node::class));
+        $element = $form->element();
+        $id = \md5($element->getLineNo().$element->getNodePath().$element->nodeValue);
+
+        return $this->forms[$id] ??= $form->crawler()->form();
+    }
+}
diff --git a/src/Browser/Session/PantherSession.php b/src/Browser/Session/PantherSession.php
new file mode 100644
index 0000000..10840c7
--- /dev/null
+++ b/src/Browser/Session/PantherSession.php
@@ -0,0 +1,162 @@
+<?php
+
+/*
+ * This file is part of the zenstruck/browser package.
+ *
+ * (c) Kevin Bond <kevinbond@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Zenstruck\Browser\Session;
+
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverSelect;
+use Symfony\Component\Panther\Client;
+use Symfony\Component\Panther\DomCrawler\Crawler;
+use Symfony\Component\Panther\DomCrawler\Field\ChoiceFormField;
+use Symfony\Component\Panther\DomCrawler\Field\FileFormField;
+use Symfony\Component\Panther\DomCrawler\Field\InputFormField;
+use Symfony\Component\Panther\DomCrawler\Field\TextareaFormField;
+use Zenstruck\Browser\Session;
+use Zenstruck\Dom;
+use Zenstruck\Dom\Exception\RuntimeException;
+use Zenstruck\Dom\Node;
+use Zenstruck\Dom\Node\Form\Field\Checkbox;
+use Zenstruck\Dom\Node\Form\Field\File;
+use Zenstruck\Dom\Node\Form\Field\Input;
+use Zenstruck\Dom\Node\Form\Field\Radio;
+use Zenstruck\Dom\Node\Form\Field\Select\Multiselect;
+use Zenstruck\Dom\Node\Form\Field\Select\Option;
+use Zenstruck\Dom\Node\Form\Field\Textarea;
+
+/**
+ * @author Kevin Bond <kevinbond@gmail.com>
+ * @author Robert Freigang <robertfreigang@gmx.de>
+ *
+ * @internal
+ *
+ * @method Client client()
+ */
+final class PantherSession extends Session
+{
+    public function __construct(Client $client)
+    {
+        parent::__construct($client);
+    }
+
+    public function dom(): Dom
+    {
+        return new Dom($this->client()->getCrawler(), $this);
+    }
+
+    public function content(): string
+    {
+        return $this->client()->getPageSource();
+    }
+
+    public function currentUrl(): string
+    {
+        return $this->client()->getCurrentURL();
+    }
+
+    public function click(Node $node): void
+    {
+        $this->client()->getMouse()->click($this->coordinatesFor($node));
+        $this->client()->refreshCrawler();
+    }
+
+    public function select(Option|Radio|Checkbox $node): void
+    {
+        if ($node instanceof Checkbox) {
+            (new ChoiceFormField($this->elementFor($node)))->tick();
+
+            return;
+        }
+
+        if ($node instanceof Radio) {
+            (new ChoiceFormField($this->elementFor($node)))->select($node->value());
+
+            return;
+        }
+
+        $element = $this->elementFor($node->selector() ?? throw new RuntimeException('Unable to find "select" for "option".'));
+        $field = new ChoiceFormField($element);
+
+        try {
+            $field->select($node->value());
+        } catch (NoSuchElementException $e) {
+            // try selecting by visible text
+            (new WebDriverSelect($element))->selectByVisibleText($node->value());
+        }
+    }
+
+    public function unselect(Checkbox|Multiselect $node): void
+    {
+        $element = $this->elementFor($node);
+
+        if ($node instanceof Multiselect) {
+            (new WebDriverSelect($element))->deselectAll();
+
+            return;
+        }
+
+        (new ChoiceFormField($element))->untick();
+    }
+
+    public function attach(File $node, array $filenames): void
+    {
+        $field = new FileFormField($this->elementFor($node));
+
+        foreach ($filenames as $filename) {
+            $field->upload($filename);
+        }
+    }
+
+    public function fill(Textarea|Input $node, string $value): void
+    {
+        if ($node instanceof Textarea) {
+            (new TextareaFormField($this->elementFor($node)))->setValue($value);
+
+            return;
+        }
+
+        (new InputFormField($this->elementFor($node)))->setValue($value);
+    }
+
+    public function doubleClick(Node $node): void
+    {
+        $this->client()->getMouse()->doubleClick($this->coordinatesFor($node));
+        $this->client()->refreshCrawler();
+    }
+
+    public function rightClick(Node $node): void
+    {
+        $this->client()->getMouse()->contextClick($this->coordinatesFor($node));
+        $this->client()->refreshCrawler();
+    }
+
+    private function coordinatesFor(Node $node): WebDriverCoordinates
+    {
+        $element = $this->elementFor($node);
+
+        if (!$element instanceof WebDriverLocatable) {
+            throw new RuntimeException('The web driver element is not locatable.');
+        }
+
+        return $element->getCoordinates();
+    }
+
+    private function elementFor(Node $node): WebDriverElement
+    {
+        $crawler = $node->crawler();
+
+        \assert($crawler instanceof Crawler);
+
+        return $crawler->getElement(0) ?? throw new RuntimeException('Unable to find the web driver element.');
+    }
+}
diff --git a/tests/BrowserTests.php b/tests/BrowserTests.php
index 8738fee..99763f0 100644
--- a/tests/BrowserTests.php
+++ b/tests/BrowserTests.php
@@ -24,6 +24,7 @@
 use Zenstruck\Browser\Tests\Fixture\TestComponent1;
 use Zenstruck\Browser\Tests\Fixture\TestComponent2;
 use Zenstruck\Callback\Exception\UnresolveableArgument;
+use Zenstruck\Dom;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
@@ -217,6 +218,7 @@ public function content_assertions(): void
         $this->browser()
             ->visit('/page1')
             ->assertContains('h1 title')
+            ->assertContains('h1 TITle')
             ->assertNotContains('invalid text')
         ;
     }
@@ -284,8 +286,10 @@ public function html_assertions(): void
         $this->browser()
             ->visit('/page1')
             ->assertSee('h1 title')
+            ->assertSee('h1 Title')
             ->assertNotSee('invalid text')
             ->assertSeeIn('h1', 'title')
+            ->assertSeeIn('h1', 'Title')
             ->assertNotSeeIn('h1', 'invalid text')
             ->assertSeeElement('h1')
             ->assertNotSeeElement('h2')
@@ -302,6 +306,7 @@ public function html_head_assertions(): void
             ->visit('/page1')
             ->assertSeeIn('title', 'meta title')
             ->assertElementAttributeContains('meta[name="description"]', 'content', 'meta')
+            ->assertElementAttributeContains('meta[name="description"]', 'content', 'Meta')
             ->assertElementAttributeNotContains('meta[name="description"]', 'content', 'invalid')
             ->assertElementAttributeContains('html', 'lang', 'en')
         ;
@@ -315,6 +320,7 @@ public function form_assertions(): void
         $this->browser()
             ->visit('/page1')
             ->assertFieldEquals('Input 1', 'input 1')
+            ->assertFieldEquals('inpUt 1', 'input 1')
             ->assertFieldEquals('input1', 'input 1')
             ->assertFieldEquals('input_1', 'input 1')
             ->assertFieldNotEquals('Input 1', 'invalid')
@@ -329,6 +335,8 @@ public function form_assertions(): void
             ->assertSelected('Input 4', 'option 1')
             ->assertSelected('input4', 'option 1')
             ->assertSelected('input_4', 'option 1')
+            ->assertFieldEquals('input_4', 'option 1')
+            ->assertFieldNotEquals('input_4', 'option 2')
             ->assertSelected('Input 7', 'option 1')
             ->assertSelected('input7', 'option 1')
             ->assertSelected('input_7[]', 'option 1')
@@ -349,6 +357,11 @@ public function form_assertions(): void
             ->assertNotChecked('radio3')
             ->assertChecked('Radio 2')
             ->assertChecked('radio2')
+            ->assertFieldEquals('Title', 'initial title')
+            ->assertFieldEquals('Input 10', 'option 3')
+            ->assertFieldEquals('Input 10', 'Some value')
+            ->assertFieldEquals('Input 11', 'option 1')
+            ->assertFieldEquals('Input 11', 'Some value')
         ;
     }
 
@@ -361,6 +374,12 @@ public function link_action(): void
             ->visit('/page1')
             ->click('a link')
             ->assertOn('/page2')
+            ->visit('/page1')
+            ->click('click here')
+            ->assertOn('/page2')
+            ->visit('/page1')
+            ->click('Click Here')
+            ->assertOn('/page2')
         ;
     }
 
@@ -376,6 +395,22 @@ public function click_on_element(): void
         ;
     }
 
+    /**
+     * @test
+     */
+    public function click_with_callback_filter(): void
+    {
+        $this->browser()
+            ->visit('/page1')
+            ->click(function(Dom $dom) {
+                return $dom
+                    ->find('a link')
+                ;
+            })
+            ->assertOn('/page2')
+        ;
+    }
+
     /**
      * @test
      */
@@ -386,11 +421,12 @@ public function form_actions_by_field_label(): void
             ->fillField('Input 1', 'Kevin')
             ->checkField('Input 2')
             ->uncheckField('Input 3')
-            ->selectFieldOption('Input 4', 'option 2')
+            ->selectFieldOption('Input 4', 'OPTION 2')
             ->attachFile('Input 5', new \SplFileInfo(__FILE__))
-            ->selectFieldOptions('Input 6', ['option 1', 'option 3'])
+            ->selectFieldOptions('Input 6', ['n 1', 'option 3'])
             ->selectFieldOptions('Input 7', [])
             ->checkField('Radio 3')
+            ->fillField('Title', 'new title')
             ->click('Submit')
             ->assertOn('/submit-form')
             ->assertContains('"input_1":"Kevin"')
@@ -401,6 +437,7 @@ public function form_actions_by_field_label(): void
             ->assertContains('"input_6":["option 1","option 3"]')
             ->assertNotContains('"input_7')
             ->assertContains('"input_8":"option 3"')
+            ->assertContains('"title":"new title"')
         ;
     }
 
@@ -414,9 +451,9 @@ public function form_actions_by_field_id(): void
             ->fillField('input1', 'Kevin')
             ->checkField('input2')
             ->uncheckField('input3')
-            ->selectFieldOption('input4', 'option 2')
+            ->selectFieldOption('input4', 'Another Option')
             ->attachFile('input5', __FILE__)
-            ->selectFieldOptions('input6', ['option 1', 'option 3'])
+            ->selectFieldOptions('input6', ['option 1', 'Another Option'])
             ->selectFieldOptions('input7', [])
             ->checkField('radio3')
             ->click('Submit')
@@ -490,7 +527,7 @@ public function can_submit_form_with_different_submit_buttons(): void
             ->visit('/page1')
             ->click('Submit')
             ->assertOn('/submit-form')
-            ->assertContains('"submit_1":"a"')
+            ->assertContains('"submit_1":"Submit"')
             ->assertNotContains('submit_2')
             ->visit('/page1')
             ->click('Submit B')
@@ -526,7 +563,7 @@ public function can_submit_filled_form_with_different_submit_buttons(): void
             ->click('Submit')
             ->assertOn('/submit-form')
             ->assertContains('"input_1":"Kevin"')
-            ->assertContains('"submit_1":"a"')
+            ->assertContains('"submit_1":"Submit"')
             ->assertNotContains('submit_2')
             ->visit('/page1')
             ->fillField('input_1', 'Kevin')
@@ -548,7 +585,10 @@ public function can_submit_filled_form_with_different_submit_buttons(): void
             ->assertOn('/submit-form')
             ->assertContains('"input_1":"Kevin"')
             ->assertContains('"submit_2":"d"')
-            ->assertNotContains('submit_1')
+            ->assertNotContains('"Submit"')
+            ->visit('/page1')
+            ->click('Submit Image')
+            ->assertOn('/submit-form')
         ;
     }
 
@@ -604,7 +644,7 @@ public function can_dump_html_element(): void
         });
 
         $this->assertCount(1, $output);
-        $this->assertSame('<p id="link"><a href="/page2">a link</a> not a link</p>', $output[0]);
+        $this->assertSame('<p id="link"><a href="/page2" title="click here">a link.</a> not a link</p>', $output[0]);
     }
 
     /**
diff --git a/tests/Fixture/files/page1.html b/tests/Fixture/files/page1.html
index c64ab29..03fd27d 100644
--- a/tests/Fixture/files/page1.html
+++ b/tests/Fixture/files/page1.html
@@ -7,7 +7,7 @@
 </head>
 <body>
     <h1>h1 title</h1>
-    <p id="link"><a href="/page2">a link</a> not a link</p>
+    <p id="link"><a href="/page2" title="click here">a link.</a> not a link</p>
     <p><a href="/exception">exception link</a></p>
     <p id="double-click-link"><a onclick="return false" ondblclick="location=this.href" href="/page2">Double Click</a></p>
     <p id="context-menu-link"><a onclick="return false" oncontextmenu="location=this.href" href="/page2">Right Click</a></p>
@@ -16,19 +16,19 @@ <h1>h1 title</h1>
         <li>list 2</li>
     </ul>
     <form action="/submit-form" method="post" enctype="multipart/form-data">
-        <label for="input1">Input 1</label>
+        <label for="input1">Input  1</label>
         <input id="input1" name="input_1" type="text" value="input 1" />
 
-        <label for="input2">Input 2</label>
+        <label for="input2"><span>Input 2</span></label>
         <input id="input2" name="input_2" type="checkbox">
 
-        <label for="input3">Input 3</label>
+        <label for="input3">Input 3 Input 4</label>
         <input id="input3" name="input_3" type="checkbox" checked>
 
         <label for="input4">Input 4</label>
         <select id="input4" name="input_4">
             <option selected>option 1</option>
-            <option>option 2</option>
+            <option value="option 2">Another Option</option>
         </select>
 
         <label for="input5">Input 5</label>
@@ -38,10 +38,10 @@ <h1>h1 title</h1>
         <select id="input6" name="input_6[]" multiple>
             <option>option 1</option>
             <option>option 2</option>
-            <option>option 3</option>
+            <option value="option 3">Another Option</option>
         </select>
 
-        <label for="input7">Input 7</label>
+        <label for="input7">Input 7 <span class="required">*</span></label>
         <select id="input7" name="input_7[]" multiple>
             <option selected>option 1</option>
             <option>option 2</option>
@@ -55,15 +55,34 @@ <h1>h1 title</h1>
         <label for="radio3">Radio 3</label>
         <input type="radio" id="radio3" name="input_8" value="option 3">
 
-        <label for="input9">Input 9</label>
-        <input id="input9" name="input_9[]" type="file" multiple>
+        <label>
+            Input 9
+            <input id="input9" name="input_9[]" type="file" multiple>
+        </label>
+
+        <label for="title">Title</label>
+        <input type="text" id="title" name="title" value="initial title">
+
+        <label for="input10">Input 10</label>
+        <select id="input10" name="input_10">
+            <option>option 1</option>
+            <option>option 2</option>
+            <option selected value="option 3">Some value</option>
+        </select>
+
+        <label for="input11">Input 11</label>
+        <select id="input11" name="input_11">
+            <option value="option 1">Some value</option>
+            <option>option 2</option>
+        </select>
 
-        <button type="submit" name="submit_1" value="a">Submit</button>
+        <input type="submit" name="submit_1" value="Submit" />
         <button type="submit" name="submit_1" value="b">Submit B</button>
         <button type="submit" name="submit_2" value="c">Submit C</button>
         <button name="submit_2" value="d">Submit D</button>
         <button name="submit_1" value="e">Submit Exception</button>
         <button name="submit_1" value="r">Submit Redirect</button>
+        <input type="image" alt="Submit Image" src="https://placehold.co/10x10" />
     </form>
 </body>
 </html>
diff --git a/tests/KernelBrowserTests.php b/tests/KernelBrowserTests.php
index 7a6bd4f..1a1bbef 100644
--- a/tests/KernelBrowserTests.php
+++ b/tests/KernelBrowserTests.php
@@ -19,6 +19,7 @@
 use Zenstruck\Browser\Json;
 use Zenstruck\Browser\KernelBrowser;
 use Zenstruck\Browser\Tests\Fixture\CustomHttpOptions;
+use Zenstruck\Dom;
 
 /**
  * @author Kevin Bond <kevinbond@gmail.com>
@@ -27,6 +28,26 @@ trait KernelBrowserTests
 {
     use BrowserTests;
 
+    /**
+     * @test
+     */
+    public function click_with_complex_callback_filter(): void
+    {
+        $this->browser()
+            ->visit('/page1')
+            ->click(function(Dom $dom) {
+                return $dom
+                    ->find('input7')
+                    ?->ensure(Dom\Node\Form\Field::class)
+                    ->form()
+                    ?->siblings('#link')
+                    ->first('a link')
+                ;
+            })
+            ->assertOn('/page2')
+        ;
+    }
+
     /**
      * @test
      */
@@ -322,10 +343,10 @@ public function can_set_default_http_options(): void
         $this->browser()
             ->setDefaultHttpOptions(['headers' => ['x-foo' => 'bar']])
             ->post('/http-method')
-            ->assertContains('"x-foo":["Bar"]')
+            ->assertContains('"x-foo":["bar"]')
             ->post('/http-method', ['headers' => ['x-bar' => 'foo']])
-            ->assertContains('"x-bar":["Foo"]')
-            ->assertContains('"x-foo":["Bar"]')
+            ->assertContains('"x-bar":["foo"]')
+            ->assertContains('"x-foo":["bar"]')
         ;
     }