diff options
| -rw-r--r-- | composer.json | 11 | ||||
| -rw-r--r-- | php-egulias-email-validator2.spec | 22 |
2 files changed, 16 insertions, 17 deletions
diff --git a/composer.json b/composer.json index 1d36f01..96cd91b 100644 --- a/composer.json +++ b/composer.json @@ -18,15 +18,14 @@ "url": "https://github.com/dominicsayers/isemail" } ], - "require": { - "php": ">= 5.5", + "require": { + "php": ">=5.5", "doctrine/lexer": "^1.0.1" }, - "require-dev" : { + "require-dev": { "satooshi/php-coveralls": "^1.0.1", - "phpunit/phpunit": "^4.8.35||^5.7||^6.0", - "symfony/phpunit-bridge": "^4.4@dev", - "dominicsayers/isemail": "dev-master" + "phpunit/phpunit": "^4.8.36|^7.5.15", + "dominicsayers/isemail": "^3.0.7" }, "suggest": { "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" diff --git a/php-egulias-email-validator2.spec b/php-egulias-email-validator2.spec index db1cb75..7faa9f1 100644 --- a/php-egulias-email-validator2.spec +++ b/php-egulias-email-validator2.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-egulias-email-validator2 # -# Copyright (c) 2014-2019 Shawn Iwinski, Remi Collet +# Copyright (c) 2014-2020 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 2.1.12 -%global github_commit a6255605af39f2db7f5cb62e672bd8a7bad8d208 +%global github_version 2.1.13 +%global github_commit 834593d5900615639208417760ba6a17299e2497 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global major 2 @@ -44,17 +44,16 @@ BuildArch: noarch %if %{with_tests} ## composer.json (require-dev) # "satooshi/php-coveralls": "^1.0.1", -# "phpunit/phpunit": "^4.8.35||^5.7||^6.0", -# "symfony/phpunit-bridge": "^4.4@dev", -# "dominicsayers/isemail": "dev-master" +# "phpunit/phpunit": "^4.8.36|^7.5.15", +# "dominicsayers/isemail": "^3.0.7" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: phpunit6 +BuildRequires: phpunit7 >= 7.5.15 %global phpunit %{_bindir}/phpunit6 BuildRequires: (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver}) # remirepo:5 %else -BuildRequires: php-phpunit-PHPUnit >= 5.7 +BuildRequires: php-phpunit-PHPUnit >= 4.8.36 %global phpunit %{_bindir}/phpunit BuildRequires: php-doctrine-lexer >= %{doctrine_lexer_min_ver} %endif @@ -135,9 +134,6 @@ EOF rm Tests/EmailValidator/Validation/DNSCheckValidationTest.php rm Tests/EmailValidator/Validation/SpoofCheckValidationTest.php -: To avoid symfony/phpunit-bridge -sed -e '/listener/d' phpunit.xml.dist >phpunit.xml - : Upstream tests ret=0 for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do @@ -164,6 +160,10 @@ exit $ret %changelog +* Thu Jan 2 2020 Remi Collet <remi@remirepo.net> - 2.1.13-1 +- update to 2.1.13 (no change) +- use phpunit7 + * Fri Dec 20 2019 Remi Collet <remi@remirepo.net> - 2.1.12-1 - update to 2.1.12 (no change) |