Skip to content

Commit

Permalink
Fix Lexer 2 compatibility (#349)
Browse files Browse the repository at this point in the history
  • Loading branch information
derrabus committed Jan 2, 2023
1 parent 2a096c7 commit 17865e0
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ build:
override:
- command: "vendor/bin/phpunit --coverage-clover=clover.xml --exclude-group flaky"
coverage:
file: "clover.xml"
file: "build/logs/clover.xml"
format: "clover"
- php-scrutinizer-run
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -34,4 +34,4 @@
"Egulias\\EmailValidator\\Tests\\": "tests"
}
}
}
}
9 changes: 1 addition & 8 deletions src/EmailLexer.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,6 @@ class EmailLexer extends AbstractLexer
*/
public Token $current;

/**
* The next token in the input.
*
* @var Token<int, string>|null
*/
public Token|null $lookahead;

/**
* @var Token<int, string>
*/
Expand Down Expand Up @@ -334,4 +327,4 @@ public function clearRecorded(): void
{
$this->accumulator = '';
}
}
}

0 comments on commit 17865e0

Please sign in to comment.