Skip to content

Migrate to doctrine/lexer v3.0 #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Ph0tonic wants to merge 10 commits into from
Closed

Migrate to doctrine/lexer v3.0 #339

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
86933da
Migrate to doctrine/lexer v2.0
Ph0tonic Dec 14, 2022
d807480
Apply feedbacks
Ph0tonic Dec 14, 2022
3d25492
Fix Tests + Psalm issues
Ph0tonic Dec 14, 2022
0841364
Upgrade to doctrine/lexer 3.x
Ph0tonic Dec 18, 2022
f9e4bc5
Use php nullsafe operator to fix type issues
Ph0tonic Dec 18, 2022
7771e2b
Fix types issues
Ph0tonic Dec 18, 2022
4665415
Fix psalm type issues info
Ph0tonic Dec 18, 2022
4898bc2
Fix psalm type check
Ph0tonic Dec 18, 2022
d25d606
Fix readme + clean composer.json
Ph0tonic Dec 28, 2022
b3a424f
loosen constraint over lexer
Ph0tonic Dec 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions .scrutinizer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
imports:
- php
- php

build:
environment:
php: '7.4'
tests:
override:
-
command: 'vendor/bin/phpunit --coverage-clover=clover.xml --exclude-group flaky'
coverage:
file: 'clover.xml'
format: 'clover'
- php-scrutinizer-run
environment:
php: "8.1"
tests:
override:
- command: "vendor/bin/phpunit --coverage-clover=clover.xml --exclude-group flaky"
coverage:
file: "clover.xml"
format: "clover"
- php-scrutinizer-run
10 changes: 3 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@ language: php

matrix:
include:
- php: 7.4
dist: bionic
env:
- psalm=yes
- php: 8.0
- php: 8.1
env:
- psalm=yes
dist: bionic
#ppc64le support code
- php: 7.4
#ppc64le support code
- php: 8.1
arch: ppc64le
env:
- psalm=yes
Expand Down
13 changes: 7 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@ This library aims to support RFCs:

**Current major version with full support is v3**

| Version | Released | EOL | Only critical bug fixes | Full |
| ---- | :----: | :----: | :----: | :----: |
| v3.x | 2020/12/29 | - | X | X |
| v2.1.x | 2016/05/16 | 01/2022 | X | |
| v1.2 | 2013/19/05 | YES | | |
| Version | Released | EOL | Only critical bug fixes | Full |
| ------- | :--------: | :-----: | :---------------------: | :---: |
| v4.x | 2022/12/20 | - | X | X |
| v3.x | 2020/12/29 | - | X | X |
| v2.1.x | 2016/05/16 | 01/2022 | X | |
| v1.2 | 2013/19/05 | YES | | |


## Requirements ##

* PHP 7.2
* PHP 8.1
* [Composer](https://getcomposer.org) is required for installation
* [Spoofchecking](/src/Validation/Extra/SpoofCheckValidation.php) and [DNSCheckValidation](/src/Validation/DNSCheckValidation.php) validation requires that your PHP system has the [PHP Internationalization Libraries](https://php.net/manual/en/book.intl.php) (also known as PHP Intl)

Expand Down
26 changes: 17 additions & 9 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
{
"name": "egulias/email-validator",
"description": "A library for validating emails against several RFCs",
"homepage": "https://github.com/egulias/EmailValidator",
"keywords": ["email", "validation", "validator", "emailvalidation", "emailvalidator"],
"license": "MIT",
"name": "egulias/email-validator",
"description": "A library for validating emails against several RFCs",
"homepage": "https://github.com/egulias/EmailValidator",
"keywords": [
"email",
"validation",
"validator",
"emailvalidation",
"emailvalidator"
],
"license": "MIT",
"authors": [
{"name": "Eduardo Gulias Davis"}
{
"name": "Eduardo Gulias Davis"
}
],
"extra": {
"branch-alias": {
"dev-master": "3.0.x-dev"
"dev-master": "4.0.x-dev"
}
},
"require": {
"php": ">=7.2",
"doctrine/lexer": "^1.2",
"php": ">=8.1",
"doctrine/lexer": "^3.0",
Copy link
Contributor

@derrabus derrabus Dec 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, I would strongly recommend to loosen this constraint to…

Suggested change
"doctrine/lexer": "^3.0",
"doctrine/lexer": "^2.0 || ^3.0",

This should be possible without much extra effort and avoid dependency conflicts downstream for the time being.

Copy link
Owner

@egulias egulias Dec 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have checked Doctrine's ORM and v3 is requiring v2 of the lexer, so @Ph0tonic can you please update to

Suggested change
"doctrine/lexer": "^3.0",
"doctrine/lexer": "^2 || ^3",

Thanks @derrabus

Copy link
Contributor Author

@Ph0tonic Ph0tonic Dec 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done 👍

"symfony/polyfill-intl-idn": "^1.15"
},
"require-dev": {
Expand Down
Loading