summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json3
-rw-r--r--php-egulias-email-validator3.spec29
2 files changed, 16 insertions, 16 deletions
diff --git a/composer.json b/composer.json
index d598d1b..6a273e2 100644
--- a/composer.json
+++ b/composer.json
@@ -14,11 +14,10 @@
},
"require": {
"php": ">=7.2",
- "doctrine/lexer": "^1.2",
+ "doctrine/lexer": "^1.2|^2",
"symfony/polyfill-intl-idn": "^1.15"
},
"require-dev": {
- "php-coveralls/php-coveralls": "^2.2",
"phpunit/phpunit": "^8.5.8|^9.3.3",
"vimeo/psalm": "^4"
},
diff --git a/php-egulias-email-validator3.spec b/php-egulias-email-validator3.spec
index d8d385f..bd0830c 100644
--- a/php-egulias-email-validator3.spec
+++ b/php-egulias-email-validator3.spec
@@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-egulias-email-validator3
#
-# Copyright (c) 2014-2022 Shawn Iwinski, Remi Collet
+# Copyright (c) 2014-2023 Shawn Iwinski, Remi Collet
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -10,8 +10,8 @@
%global github_owner egulias
%global github_name EmailValidator
-%global github_version 3.2.1
-%global github_commit f88dcf4b14af14a98ad96b14b2b317969eab6715
+%global github_version 3.2.5
+%global github_commit b531a2311709443320c786feb4519cfaf94af796
%global github_short %(c=%{github_commit}; echo ${c:0:7})
%global major 3
@@ -20,9 +20,9 @@
# "php": ">= 7.2"
%global php_min_ver 7.2
-# "doctrine/lexer": "^1.2"
+# "doctrine/lexer": "^1.2|^2"
%global doctrine_lexer_min_ver 1.2
-%global doctrine_lexer_max_ver 2
+%global doctrine_lexer_max_ver 3
# Build using "--without tests" to disable tests
%bcond_without tests
@@ -46,13 +46,8 @@ BuildArch: noarch
# "php-coveralls/php-coveralls": "^2.2",
# "phpunit/phpunit": "^8.5.8|^9.3.3",
# "vimeo/psalm": "^4"
-%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
%global phpunit %{_bin dir}/phpunit9
BuildRequires: phpunit9 >= 9.3.3
-%else
-%global phpunit %{_bindir}/phpunit8
-BuildRequires: phpunit8 >= 8.5.8
-%endif
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
# remirepo:1
@@ -113,9 +108,12 @@ phpab --template fedora \
cat <<'AUTOLOAD' | tee -a src/autoload.php
-\Fedora\Autoloader\Dependencies::required(array(
- '%{phpdir}/Doctrine/Common/Lexer/autoload.php',
-));
+\Fedora\Autoloader\Dependencies::required([
+ [
+ '%{phpdir}/Doctrine/Common/Lexer2/autoload.php',
+ '%{phpdir}/Doctrine/Common/Lexer/autoload.php',
+ ],
+]);
AUTOLOAD
@@ -139,7 +137,7 @@ rm tests/EmailValidator/Validation/Extra/SpoofCheckValidationTest.php
: Upstream tests
ret=0
-for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do
+for cmdarg in "php %{phpunit}" php80 php81 php82; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit9} \
@@ -163,6 +161,9 @@ exit $ret
%changelog
+* Tue Jan 3 2023 Remi Collet <remi@remirepo.net> - 3.2.5-1
+- update to 3.2.5
+
* Mon Jun 20 2022 Remi Collet <remi@remirepo.net> - 3.2.1-1
- update to 3.2.1