From 8c617298eb767035cbee0176247cd2835d3f2ea6 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Mon, 2 Jan 2023 21:32:15 +0100 Subject: [PATCH] Fix Lexer 2 compatibility --- .github/workflows/tests.yml | 11 +++++++++-- composer.json | 6 +++--- src/EmailLexer.php | 9 +-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dd9fa49..57439f6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,9 +16,14 @@ jobs: strategy: fail-fast: true matrix: - php: [7.2, 7.3, 7.4, '8.0', 8.1, 8.2] + php: ['8.1', '8.2'] + deps: [highest] - name: PHP ${{ matrix.php }} + include: + - php: '8.1' + deps: lowest + + name: PHP ${{ matrix.php }} / ${{ matrix.deps }} steps: - name: Checkout code @@ -34,6 +39,8 @@ jobs: - name: Install dependencies uses: ramsey/composer-install@v2 + with: + dependency-versions: ${{ matrix.deps }} - name: Setup logs directory run: mkdir -p build/logs diff --git a/composer.json b/composer.json index 72ac5d4..fa91524 100644 --- a/composer.json +++ b/composer.json @@ -18,8 +18,8 @@ "symfony/polyfill-intl-idn": "^1.26" }, "require-dev": { - "phpunit/phpunit": "^8.5.8|^9.3.3", - "vimeo/psalm": "^4" + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^4.30" }, "suggest": { "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" @@ -34,4 +34,4 @@ "Egulias\\EmailValidator\\Tests\\": "tests" } } -} \ No newline at end of file +} diff --git a/src/EmailLexer.php b/src/EmailLexer.php index 1eb480a..969c049 100644 --- a/src/EmailLexer.php +++ b/src/EmailLexer.php @@ -144,13 +144,6 @@ class EmailLexer extends AbstractLexer */ public Token $current; - /** - * The next token in the input. - * - * @var Token|null - */ - public Token|null $lookahead; - /** * @var Token */ @@ -334,4 +327,4 @@ public function clearRecorded(): void { $this->accumulator = ''; } -} \ No newline at end of file +}