diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cc234a..8820a5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,16 +12,13 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: [8.1, 8.2, 8.3] + php: [8.3, 8.4] deps: [highest] - symfony: [6.4.*, 7.0.*] + symfony: [6.4.*, 7.4.*] include: - - php: 8.1 - deps: lowest - symfony: '*' - exclude: - - php: 8.1 - symfony: 7.0.* + - php: 8.5 + symfony: '8.0.*' + steps: - uses: zenstruck/.github/actions/php-test-symfony@main with: diff --git a/composer.json b/composer.json index 2c9605a..e34919d 100644 --- a/composer.json +++ b/composer.json @@ -12,11 +12,11 @@ } ], "require": { - "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", + "php": ">=8.3", + "symfony/browser-kit": "^6.4|^7.0|^8.0", + "symfony/css-selector": "^6.4|^7.0|^8.0", + "symfony/dom-crawler": "^6.4|^7.0|^8.0", + "symfony/framework-bundle": "^6.4|^7.0|^8.0", "zenstruck/assert": "^1.4", "zenstruck/callback": "^1.4.2", "zenstruck/dom": "^1.0" @@ -29,8 +29,8 @@ "phpunit/phpunit": "^9.6.21|^10.4", "symfony/mime": "^6.4|^7.0", "symfony/panther": "^2.1.0", - "symfony/phpunit-bridge": "^6.0|^7.0", - "symfony/security-bundle": "^6.4|^7.0" + "symfony/phpunit-bridge": "^6.0|^7.0|^8.0", + "symfony/security-bundle": "^6.4|^7.0|^8.0" }, "suggest": { "justinrainbow/json-schema": "Json schema validator. Needed to use Json::assertMatchesSchema().", diff --git a/src/Browser.php b/src/Browser.php index 2b7ea3f..b92af00 100644 --- a/src/Browser.php +++ b/src/Browser.php @@ -14,6 +14,8 @@ use Psr\Container\ContainerInterface; use Symfony\Component\BrowserKit\AbstractBrowser; use Symfony\Component\BrowserKit\CookieJar; +use Symfony\Component\BrowserKit\Request; +use Symfony\Component\BrowserKit\Response; use Symfony\Component\DomCrawler\Crawler; use Symfony\Component\Filesystem\Filesystem; use Zenstruck\Browser\Assertion\SameUrlAssertion; @@ -57,6 +59,9 @@ public function __construct(private Session $session, array $options = []) $this->sourceDebug = $options['source_debug'] ?? false; } + /** + * @return AbstractBrowser + */ final public function client(): AbstractBrowser { return $this->session->client(); diff --git a/src/Browser/Session.php b/src/Browser/Session.php index 613b7cf..b06e945 100644 --- a/src/Browser/Session.php +++ b/src/Browser/Session.php @@ -12,6 +12,8 @@ namespace Zenstruck\Browser; use Symfony\Component\BrowserKit\AbstractBrowser; +use Symfony\Component\BrowserKit\Request; +use Symfony\Component\BrowserKit\Response; use Zenstruck\Dom; use Zenstruck\Dom\Session as DomSession; @@ -22,10 +24,16 @@ */ abstract class Session implements DomSession { + /** + * @param AbstractBrowser $client + */ public function __construct(private AbstractBrowser $client) { } + /** + * @return AbstractBrowser + */ final public function client(): AbstractBrowser { return $this->client;