Skip to content

Commit 17865e0

Browse files
authored
Fix Lexer 2 compatibility (#349)
1 parent 2a096c7 commit 17865e0

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.github/workflows/tests.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,14 @@ jobs:
1616
strategy:
1717
fail-fast: true
1818
matrix:
19-
php: [7.2, 7.3, 7.4, '8.0', 8.1, 8.2]
19+
php: ['8.1', '8.2']
20+
deps: [highest]
2021

21-
name: PHP ${{ matrix.php }}
22+
include:
23+
- php: '8.1'
24+
deps: lowest
25+
26+
name: PHP ${{ matrix.php }} / ${{ matrix.deps }}
2227

2328
steps:
2429
- name: Checkout code
@@ -34,6 +39,8 @@ jobs:
3439

3540
- name: Install dependencies
3641
uses: ramsey/composer-install@v2
42+
with:
43+
dependency-versions: ${{ matrix.deps }}
3744

3845
- name: Setup logs directory
3946
run: mkdir -p build/logs

.scrutinizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ build:
88
override:
99
- command: "vendor/bin/phpunit --coverage-clover=clover.xml --exclude-group flaky"
1010
coverage:
11-
file: "clover.xml"
11+
file: "build/logs/clover.xml"
1212
format: "clover"
1313
- php-scrutinizer-run

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"symfony/polyfill-intl-idn": "^1.26"
1919
},
2020
"require-dev": {
21-
"phpunit/phpunit": "^8.5.8|^9.3.3",
22-
"vimeo/psalm": "^4"
21+
"phpunit/phpunit": "^9.5.27",
22+
"vimeo/psalm": "^4.30"
2323
},
2424
"suggest": {
2525
"ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
@@ -34,4 +34,4 @@
3434
"Egulias\\EmailValidator\\Tests\\": "tests"
3535
}
3636
}
37-
}
37+
}

src/EmailLexer.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,6 @@ class EmailLexer extends AbstractLexer
144144
*/
145145
public Token $current;
146146

147-
/**
148-
* The next token in the input.
149-
*
150-
* @var Token<int, string>|null
151-
*/
152-
public Token|null $lookahead;
153-
154147
/**
155148
* @var Token<int, string>
156149
*/
@@ -334,4 +327,4 @@ public function clearRecorded(): void
334327
{
335328
$this->accumulator = '';
336329
}
337-
}
330+
}

0 commit comments

Comments
 (0)