From 2c82a46eb88b9b7d069508a16b89022e1e2b37f2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Aug 2020 11:50:37 +0200 Subject: [PATCH 1/7] update to 2.1.19 switch to phpunit9 (cherry picked from commit 079cf7d3ca5a82ba24e71af7a157b540f67f0a43) --- .gitignore | 1 + php-egulias-email-validator2-phpunit.patch | 36 ++++++++++++++++++++++ php-egulias-email-validator2.spec | 23 ++++++++------ sources | 2 +- 4 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 php-egulias-email-validator2-phpunit.patch diff --git a/.gitignore b/.gitignore index ce884e1..09cf9b3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /php-egulias-email-validator2-2.1.16-5065faf.tgz /php-egulias-email-validator2-2.1.17-ade6887.tgz /php-egulias-email-validator2-2.1.18-cfa3d44.tgz +/php-egulias-email-validator2-2.1.19-840d560.tgz diff --git a/php-egulias-email-validator2-phpunit.patch b/php-egulias-email-validator2-phpunit.patch new file mode 100644 index 0000000..632042c --- /dev/null +++ b/php-egulias-email-validator2-phpunit.patch @@ -0,0 +1,36 @@ +diff -up ./tests/EmailValidator/Validation/MultipleValidationWithAndTest.php.old ./tests/EmailValidator/Validation/MultipleValidationWithAndTest.php +--- ./tests/EmailValidator/Validation/MultipleValidationWithAndTest.php.old 2020-08-11 11:42:35.142594018 +0200 ++++ ./tests/EmailValidator/Validation/MultipleValidationWithAndTest.php 2020-08-11 11:43:45.452483997 +0200 +@@ -28,11 +28,9 @@ class MultipleValidationWithAndTest exte + $this->assertFalse($multipleValidation->isValid("exmpale@example.com", $lexer)); + } + +- /** +- * @expectedException \Egulias\EmailValidator\Validation\Exception\EmptyValidationList +- */ + public function testEmptyListIsNotAllowed() +- { ++ { ++ $this->expectException(\Egulias\EmailValidator\Validation\Exception\EmptyValidationList::class); + new MultipleValidationWithAnd([]); + } + +diff -up ./tests/EmailValidator/Validation/RFCValidationTest.php.old ./tests/EmailValidator/Validation/RFCValidationTest.php +--- ./tests/EmailValidator/Validation/RFCValidationTest.php.old 2020-08-11 11:41:25.030703727 +0200 ++++ ./tests/EmailValidator/Validation/RFCValidationTest.php 2020-08-11 11:41:32.397692197 +0200 +@@ -49,13 +49,13 @@ class RFCValidationTest extends TestCase + */ + protected $lexer; + +- protected function setUp() ++ protected function setUp(): void + { + $this->validator = new RFCValidation(); + $this->lexer = new EmailLexer(); + } + +- protected function tearDown() ++ protected function tearDown(): void + { + $this->validator = null; + } diff --git a/php-egulias-email-validator2.spec b/php-egulias-email-validator2.spec index b70b0a8..20a75ea 100644 --- a/php-egulias-email-validator2.spec +++ b/php-egulias-email-validator2.spec @@ -10,8 +10,8 @@ %global github_owner egulias %global github_name EmailValidator -%global github_version 2.1.18 -%global github_commit cfa3d44471c7f5bfb684ac2b0da7114283d78441 +%global github_version 2.1.19 +%global github_commit 840d5603eb84cc81a6a0382adac3293e57c1c64c %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global major 2 @@ -39,6 +39,9 @@ URL: https://github.com/%{github_owner}/%{github_name} Source0: %{name}-%{github_version}-%{github_short}.tgz Source1: makesrc.sh +# adapt for recent PHPUnit +Patch0: %{name}-phpunit.patch + BuildArch: noarch # Tests %if %{with tests} @@ -47,8 +50,8 @@ BuildArch: noarch # "phpunit/phpunit": "^4.8.36|^7.5.15", # "satooshi/php-coveralls": "^1.0.1" BuildRequires: (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver}) -BuildRequires: phpunit7 >= 7.5.15 -%global phpunit %{_bindir}/phpunit6 +%global phpunit %{_bindir}/phpunit9 +BuildRequires: %{phpunit} ## composer.json BuildRequires: php(language) >= %{php_min_ver} ## phpcompatinfo (computed from version 2.1.2) @@ -82,6 +85,7 @@ Autoloader: %{phpdir}/Egulias/EmailValidator%{major}/autoload.php %prep %setup -qn %{github_name}-%{github_commit} +%patch0 -p1 -b .phpunit %build @@ -112,19 +116,16 @@ require_once "%{buildroot}%{phpdir}/Egulias/EmailValidator%{major}/autoload.php" \Fedora\Autoloader\Autoload::addPsr4('Egulias\\Tests\\', dirname(__DIR__) . "/tests"); EOF -# See https://github.com/egulias/EmailValidator/pull/244 -sed -e 's/Tests/tests/' phpunit.xml.dist >phpunit.xml - : Skip online tests rm tests/EmailValidator/Validation/DNSCheckValidationTest.php rm tests/EmailValidator/Validation/SpoofCheckValidationTest.php : Upstream tests ret=0 -for cmdarg in "php %{phpunit}" php72 php73 php74 php80; do +for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit7} \ + $1 ${2:-%{_bindir}/phpunit9} \ --verbose || ret=1 fi done @@ -143,6 +144,10 @@ exit $ret %changelog +* Tue Aug 11 2020 Remi Collet - 2.1.19-1 +- update to 2.1.19 +- switch to phpunit9 + * Wed Jun 17 2020 Remi Collet - 2.1.18-1 - update to 2.1.18 - open https://github.com/egulias/EmailValidator/pull/244 diff --git a/sources b/sources index f7ff331..b03041f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-egulias-email-validator2-2.1.18-cfa3d44.tgz) = 83289b6696f7347472142bbbc838e7fdd3f2b5e185ef79fc1b09b5fae16b537ae39191e50079f3370312de24884c3e3a02934daf54066e0531e8de9a3be24158 +SHA512 (php-egulias-email-validator2-2.1.19-840d560.tgz) = d8f2fead8e5af438ea6c5961de6b4962351aeb5baf3c69bb492b6729780a62094a09156c02d75b4d8ac87ad052bc8e3c767e7cd8ce0d5eb7d4a42850733870fd From 1ea56b3a86feca776ec096a25fc2d8a54935a8ac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Sep 2020 08:29:02 +0200 Subject: [PATCH 2/7] v2.1.20 (cherry picked from commit 10c75fb1bc390e71dc604a36b5444b613cf7674b) --- .gitignore | 1 + php-egulias-email-validator2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 09cf9b3..f5d5221 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /php-egulias-email-validator2-2.1.17-ade6887.tgz /php-egulias-email-validator2-2.1.18-cfa3d44.tgz /php-egulias-email-validator2-2.1.19-840d560.tgz +/php-egulias-email-validator2-2.1.20-f46887b.tgz diff --git a/php-egulias-email-validator2.spec b/php-egulias-email-validator2.spec index 20a75ea..6a782ea 100644 --- a/php-egulias-email-validator2.spec +++ b/php-egulias-email-validator2.spec @@ -10,8 +10,8 @@ %global github_owner egulias %global github_name EmailValidator -%global github_version 2.1.19 -%global github_commit 840d5603eb84cc81a6a0382adac3293e57c1c64c +%global github_version 2.1.20 +%global github_commit f46887bc48db66c7f38f668eb7d6ae54583617ff %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global major 2 @@ -144,6 +144,9 @@ exit $ret %changelog +* Mon Sep 7 2020 Remi Collet - 2.1.20-1 +- update to 2.1.20 + * Tue Aug 11 2020 Remi Collet - 2.1.19-1 - update to 2.1.19 - switch to phpunit9 diff --git a/sources b/sources index b03041f..a07bb4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-egulias-email-validator2-2.1.19-840d560.tgz) = d8f2fead8e5af438ea6c5961de6b4962351aeb5baf3c69bb492b6729780a62094a09156c02d75b4d8ac87ad052bc8e3c767e7cd8ce0d5eb7d4a42850733870fd +SHA512 (php-egulias-email-validator2-2.1.20-f46887b.tgz) = 4be3db361cb527872fbbcfa0ee918a708a01c1a1b28e57d2bfcf3ce45c86b77b271144da4b691e246e725ff600173a1ed7296d4314de87928948ca063be61473 From 9fd755bd03a64361d497df00529a42ef36a87467 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Sep 2020 12:07:36 +0200 Subject: [PATCH 3/7] v2.1.21 (cherry picked from commit f86a9a97b378deb682f57fd2f426a668728b4805) --- .gitignore | 1 + php-egulias-email-validator2.spec | 12 ++++++++++-- sources | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f5d5221..89bd203 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /php-egulias-email-validator2-2.1.18-cfa3d44.tgz /php-egulias-email-validator2-2.1.19-840d560.tgz /php-egulias-email-validator2-2.1.20-f46887b.tgz +/php-egulias-email-validator2-2.1.21-563d0cd.tgz diff --git a/php-egulias-email-validator2.spec b/php-egulias-email-validator2.spec index 6a782ea..da5b786 100644 --- a/php-egulias-email-validator2.spec +++ b/php-egulias-email-validator2.spec @@ -10,8 +10,8 @@ %global github_owner egulias %global github_name EmailValidator -%global github_version 2.1.20 -%global github_commit f46887bc48db66c7f38f668eb7d6ae54583617ff +%global github_version 2.1.21 +%global github_commit 563d0cdde5d862235ffe24a158497f4d490191b5 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global major 2 @@ -49,8 +49,13 @@ BuildArch: noarch # "dominicsayers/isemail": "^3.0.7", # "phpunit/phpunit": "^4.8.36|^7.5.15", # "satooshi/php-coveralls": "^1.0.1" +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 BuildRequires: (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver}) %global phpunit %{_bindir}/phpunit9 +%else +BuildRequires: php-doctrine-lexer >= %{doctrine_lexer_min_ver} +%global phpunit %{_bindir}/phpunit8 +%endif BuildRequires: %{phpunit} ## composer.json BuildRequires: php(language) >= %{php_min_ver} @@ -144,6 +149,9 @@ exit $ret %changelog +* Mon Sep 21 2020 Remi Collet - 2.1.21-1 +- update to 2.1.21 + * Mon Sep 7 2020 Remi Collet - 2.1.20-1 - update to 2.1.20 diff --git a/sources b/sources index a07bb4b..9a6009a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-egulias-email-validator2-2.1.20-f46887b.tgz) = 4be3db361cb527872fbbcfa0ee918a708a01c1a1b28e57d2bfcf3ce45c86b77b271144da4b691e246e725ff600173a1ed7296d4314de87928948ca063be61473 +SHA512 (php-egulias-email-validator2-2.1.21-563d0cd.tgz) = 2b3a780a632e8100247e2cdff510449a6cce939de31a4627117a021eaa6bd773c5d1763142deb59ef1a988793ef7b9dffbd1f3af72395c6fe3516ac7c0798819 From f714113416777d417439e9cb163a700ab0a22f58 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Sep 2020 08:47:22 +0200 Subject: [PATCH 4/7] v2.1.22 (cherry picked from commit 9d05df2f1ce9c90b0e9b2559d99c50501cd4cbcf) --- .gitignore | 1 + php-egulias-email-validator2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 89bd203..99a219c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /php-egulias-email-validator2-2.1.19-840d560.tgz /php-egulias-email-validator2-2.1.20-f46887b.tgz /php-egulias-email-validator2-2.1.21-563d0cd.tgz +/php-egulias-email-validator2-2.1.22-68e418e.tgz diff --git a/php-egulias-email-validator2.spec b/php-egulias-email-validator2.spec index da5b786..aa4015e 100644 --- a/php-egulias-email-validator2.spec +++ b/php-egulias-email-validator2.spec @@ -10,8 +10,8 @@ %global github_owner egulias %global github_name EmailValidator -%global github_version 2.1.21 -%global github_commit 563d0cdde5d862235ffe24a158497f4d490191b5 +%global github_version 2.1.22 +%global github_commit 68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global major 2 @@ -149,6 +149,9 @@ exit $ret %changelog +* Mon Sep 28 2020 Remi Collet - 2.1.22-1 +- update to 2.1.22 + * Mon Sep 21 2020 Remi Collet - 2.1.21-1 - update to 2.1.21 diff --git a/sources b/sources index 9a6009a..9b64e7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-egulias-email-validator2-2.1.21-563d0cd.tgz) = 2b3a780a632e8100247e2cdff510449a6cce939de31a4627117a021eaa6bd773c5d1763142deb59ef1a988793ef7b9dffbd1f3af72395c6fe3516ac7c0798819 +SHA512 (php-egulias-email-validator2-2.1.22-68e418e.tgz) = 5fdea13118f3c12bafe011aea25b44542d4dae1892159d92e9b4c51cba188d183c8cf17a9d3b17bca97088101a3527322096546678859e6735f34d59a7599713 From 4c755b1b623e252949480afb77ed2ff3407533da Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Nov 2020 09:21:27 +0100 Subject: [PATCH 5/7] v2.1.23 (cherry picked from commit 32ecb4ff361e646f1fbc9665bac160fd7433682d) --- .gitignore | 1 + php-egulias-email-validator2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 99a219c..bf0ee81 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ clog /php-egulias-email-validator2-2.1.20-f46887b.tgz /php-egulias-email-validator2-2.1.21-563d0cd.tgz /php-egulias-email-validator2-2.1.22-68e418e.tgz +/php-egulias-email-validator2-2.1.23-5fa792a.tgz diff --git a/php-egulias-email-validator2.spec b/php-egulias-email-validator2.spec index aa4015e..ac4fcc5 100644 --- a/php-egulias-email-validator2.spec +++ b/php-egulias-email-validator2.spec @@ -10,8 +10,8 @@ %global github_owner egulias %global github_name EmailValidator -%global github_version 2.1.22 -%global github_commit 68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5 +%global github_version 2.1.23 +%global github_commit 5fa792ad1853ae2bc60528dd3e5cbf4542d3c1df %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global major 2 @@ -149,6 +149,9 @@ exit $ret %changelog +* Mon Nov 2 2020 Remi Collet - 2.1.23-1 +- update to 2.1.23 + * Mon Sep 28 2020 Remi Collet - 2.1.22-1 - update to 2.1.22 diff --git a/sources b/sources index 9b64e7c..18800fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-egulias-email-validator2-2.1.22-68e418e.tgz) = 5fdea13118f3c12bafe011aea25b44542d4dae1892159d92e9b4c51cba188d183c8cf17a9d3b17bca97088101a3527322096546678859e6735f34d59a7599713 +SHA512 (php-egulias-email-validator2-2.1.23-5fa792a.tgz) = 7cacc400208df1b9cc7c6b7c1f79dd7401fb9a3744378fe984478db8864d4118062366d142ec9fd3cca67569b6bb1c491ceb524cecb8f956eaf206d4d7e5fe7d From 2b57ad0a1850464d9387a18d0e903b0f1e08c1fd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Nov 2020 09:42:54 +0100 Subject: [PATCH 6/7] v2.1.24 (cherry picked from commit 33f4d353ccf498ea20057e1459a30fd38c508464) --- .gitignore | 1 + php-egulias-email-validator2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bf0ee81..c7c4afa 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ clog /php-egulias-email-validator2-2.1.21-563d0cd.tgz /php-egulias-email-validator2-2.1.22-68e418e.tgz /php-egulias-email-validator2-2.1.23-5fa792a.tgz +/php-egulias-email-validator2-2.1.24-ca90a32.tgz diff --git a/php-egulias-email-validator2.spec b/php-egulias-email-validator2.spec index ac4fcc5..0129c12 100644 --- a/php-egulias-email-validator2.spec +++ b/php-egulias-email-validator2.spec @@ -10,8 +10,8 @@ %global github_owner egulias %global github_name EmailValidator -%global github_version 2.1.23 -%global github_commit 5fa792ad1853ae2bc60528dd3e5cbf4542d3c1df +%global github_version 2.1.24 +%global github_commit ca90a3291eee1538cd48ff25163240695bd95448 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global major 2 @@ -149,6 +149,9 @@ exit $ret %changelog +* Mon Nov 16 2020 Remi Collet - 2.1.24-1 +- update to 2.1.24 + * Mon Nov 2 2020 Remi Collet - 2.1.23-1 - update to 2.1.23 diff --git a/sources b/sources index 18800fe..b915699 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-egulias-email-validator2-2.1.23-5fa792a.tgz) = 7cacc400208df1b9cc7c6b7c1f79dd7401fb9a3744378fe984478db8864d4118062366d142ec9fd3cca67569b6bb1c491ceb524cecb8f956eaf206d4d7e5fe7d +SHA512 (php-egulias-email-validator2-2.1.24-ca90a32.tgz) = fa42588c0c3630dfc689d8ac9e489d7c4709cd23c0c1b504cf9a2e9e08c11a19d3303a4136493f834d8eeb999d8f02e8d99e4178037831db4be87031c1d8f749 From b8258c39d374234af3f5ec6d8541900e42afed54 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 Jan 2021 14:04:37 +0100 Subject: [PATCH 7/7] v2.1.25 (cherry picked from commit bba53e274e24ced94a8c8d79a886b327e2d87b69) --- .gitignore | 1 + php-egulias-email-validator2.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c7c4afa..e1d5281 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ clog /php-egulias-email-validator2-2.1.22-68e418e.tgz /php-egulias-email-validator2-2.1.23-5fa792a.tgz /php-egulias-email-validator2-2.1.24-ca90a32.tgz +/php-egulias-email-validator2-2.1.25-0dbf5d7.tgz diff --git a/php-egulias-email-validator2.spec b/php-egulias-email-validator2.spec index 0129c12..d0947ab 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-2020 Shawn Iwinski, Remi Collet +# Copyright (c) 2014-2021 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.24 -%global github_commit ca90a3291eee1538cd48ff25163240695bd95448 +%global github_version 2.1.25 +%global github_commit 0dbf5d78455d4d6a41d186da50adc1122ec066f4 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global major 2 @@ -149,6 +149,9 @@ exit $ret %changelog +* Wed Jan 6 2021 Remi Collet - 2.1.25-1 +- update to 2.1.25 + * Mon Nov 16 2020 Remi Collet - 2.1.24-1 - update to 2.1.24 diff --git a/sources b/sources index b915699..847477f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-egulias-email-validator2-2.1.24-ca90a32.tgz) = fa42588c0c3630dfc689d8ac9e489d7c4709cd23c0c1b504cf9a2e9e08c11a19d3303a4136493f834d8eeb999d8f02e8d99e4178037831db4be87031c1d8f749 +SHA512 (php-egulias-email-validator2-2.1.25-0dbf5d7.tgz) = c3600fd38fa5e85ef960242ad867618e09d6bc2ca6887e8a4a0a498a1a405d23a6d9f01635a5c3f64c203e7c0d1561040b67c56c99fe566bfa879b8e35128938