rpms/php-egulias-email-validator2
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: rpms:rawhide
Branches Tags
rpms:rawhide
rpms:f43
rpms:main
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f34
rpms:f32
rpms:f33
rpms:f30
rpms:f31
rpms:f29
rpms:f27
rpms:f28
rpms:f26
..
compare: rpms:f26
Branches Tags
rpms:f43
rpms:main
rpms:rawhide
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f34
rpms:f32
rpms:f33
rpms:f30
rpms:f31
rpms:f29
rpms:f27
rpms:f28
rpms:f26

No commits in common. "rawhide" and "f26" have entirely different histories.
rawhide ... f26

5 changed files with 39 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

22
.gitignore vendored
View file

@ -1,24 +1,2 @@
clog
/php-egulias-email-validator2-2.1.2-bc31baa.tgz
/php-egulias-email-validator2-2.1.3-1bec00a.tgz
/php-egulias-email-validator2-2.1.4-8790f59.tgz
/php-egulias-email-validator2-2.1.5-54859fa.tgz
/php-egulias-email-validator2-2.1.6-0578b32.tgz
/php-egulias-email-validator2-2.1.7-709f21f.tgz
/php-egulias-email-validator2-2.1.9-128cc72.tgz
/php-egulias-email-validator2-2.1.10-a6c8d71.tgz
/php-egulias-email-validator2-2.1.11-92dd169.tgz
/php-egulias-email-validator2-2.1.12-a625560.tgz
/php-egulias-email-validator2-2.1.13-834593d.tgz
/php-egulias-email-validator2-2.1.14-c4b8d12.tgz
/php-egulias-email-validator2-2.1.15-e834eea.tgz
/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
/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
/php-egulias-email-validator2-2.1.24-ca90a32.tgz
/php-egulias-email-validator2-2.1.25-0dbf5d7.tgz

2
makesrc.sh
View file

@ -20,7 +20,7 @@ cp composer.json ../composer.json
popd
echo "Archiving..."
tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT
tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
echo "Cleaning..."
rm -rf $PROJECT-$COMMIT

36
php-egulias-email-validator2-phpunit.patch
View file

@ -1,36 +0,0 @@
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;
}

206
php-egulias-email-validator2.spec
View file

@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-egulias-email-validator2
#
# Copyright (c) 2014-2021 Shawn Iwinski, Remi Collet
# Copyright (c) 2014-2017 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.25
%global github_commit 0dbf5d78455d4d6a41d186da50adc1122ec066f4
%global github_version 2.1.3
%global github_commit 1bec00a10039b823cc94eef4eddd47dcd3b2ca04
%global github_short %(c=%{github_commit}; echo ${c:0:7})
%global major 2
@ -25,40 +25,29 @@
%global doctrine_lexer_max_ver 2.0
# Build using "--without tests" to disable tests
%bcond_without tests
%global with_tests 0%{!?_without_tests:1}
%{!?phpdir: %global phpdir %{_datadir}/php}
Name: php-%{composer_vendor}-%{composer_project}%{major}
Version: %{github_version}
Release: 12%{?github_release}%{?dist}
Release: 1%{?github_release}%{?dist}
Summary: A library for validating emails
Group: Development/Libraries
License: MIT
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}
## composer.json (require-dev)
# "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}
%if %{with_tests}
BuildRequires: php-composer(phpunit/phpunit)
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver}
BuildRequires: php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver}
## phpcompatinfo (computed from version 2.1.2)
BuildRequires: php-dom
BuildRequires: php-filter
@ -66,12 +55,13 @@ BuildRequires: php-intl
BuildRequires: php-pcre
BuildRequires: php-spl
## Autoloader
BuildRequires: php-fedora-autoloader-devel
BuildRequires: php-composer(fedora/autoloader)
%endif
# composer.json
Requires: php(language) >= %{php_min_ver}
Requires: (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver})
Requires: php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver}
Requires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver}
# phpcompatinfo (computed from version 2.1.2)
Requires: php-intl
Requires: php-pcre
@ -90,16 +80,20 @@ Autoloader: %{phpdir}/Egulias/EmailValidator%{major}/autoload.php
%prep
%setup -qn %{github_name}-%{github_commit}
%patch -P0 -p1 -b .phpunit
%build
: Create autoloader
phpab --template fedora \
--output src/autoload.php \
src
cat <<'AUTOLOAD' | tee -a src/autoload.php
: Create autoloader
cat <<'AUTOLOAD' | tee EmailValidator/autoload.php
<?php
/**
* Autoloader for %{name} and its' dependencies
* (created by %{name}-%{version}-%{release}).
*/
require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('Egulias\\EmailValidator\\', __DIR__);
\Fedora\Autoloader\Dependencies::required(array(
'%{phpdir}/Doctrine/Common/Lexer/autoload.php',
@ -109,38 +103,33 @@ AUTOLOAD
%install
mkdir -p %{buildroot}%{phpdir}/Egulias
cp -rp src %{buildroot}%{phpdir}/Egulias/EmailValidator%{major}
cp -rp EmailValidator %{buildroot}%{phpdir}/Egulias/EmailValidator%{major}
%check
%if %{with tests}
mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
<?php
require_once "%{buildroot}%{phpdir}/Egulias/EmailValidator%{major}/autoload.php";
\Fedora\Autoloader\Autoload::addPsr4('Egulias\\Tests\\', dirname(__DIR__) . "/tests");
EOF
%if %{with_tests}
: Skip online tests
rm tests/EmailValidator/Validation/DNSCheckValidationTest.php
rm tests/EmailValidator/Validation/SpoofCheckValidationTest.php
rm Tests/EmailValidator/Validation/DNSCheckValidationTest.php
rm Tests/EmailValidator/Validation/SpoofCheckValidationTest.php
: Upstream tests
ret=0
for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit9} \
--verbose || ret=1
fi
RETURN_CODE=0
PHPUNIT=$(which phpunit)
for PHP_EXEC in "" %{?rhel:php54 php55} php56 php70 php71 php72; do
if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose \
--bootstrap %{buildroot}%{phpdir}/Egulias/EmailValidator%{major}/autoload.php \
|| RETURN_CODE=1
fi
done
exit $ret
exit $RETURN_CODE
%else
: Tests skipped
%endif
%files
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc README.md
%doc composer.json
@ -149,127 +138,6 @@ exit $ret
%changelog
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.25-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.25-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.25-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.25-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.25-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.25-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.25-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.25-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.25-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.25-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.25-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jan 6 2021 Remi Collet <remi@remirepo.net> - 2.1.25-1
- update to 2.1.25
* Mon Nov 16 2020 Remi Collet <remi@remirepo.net> - 2.1.24-1
- update to 2.1.24
* Mon Nov 2 2020 Remi Collet <remi@remirepo.net> - 2.1.23-1
- update to 2.1.23
* Mon Sep 28 2020 Remi Collet <remi@remirepo.net> - 2.1.22-1
- update to 2.1.22
* Mon Sep 21 2020 Remi Collet <remi@remirepo.net> - 2.1.21-1
- update to 2.1.21
* Mon Sep 7 2020 Remi Collet <remi@remirepo.net> - 2.1.20-1
- update to 2.1.20
* Tue Aug 11 2020 Remi Collet <remi@remirepo.net> - 2.1.19-1
- update to 2.1.19
- switch to phpunit9
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jun 17 2020 Remi Collet <remi@remirepo.net> - 2.1.18-1
- update to 2.1.18
- open https://github.com/egulias/EmailValidator/pull/244
fix tests path
- switch to classmap autoloader
* Fri Feb 14 2020 Remi Collet <remi@remirepo.net> - 2.1.17-1
- update to 2.1.17
* Thu Feb 13 2020 Remi Collet <remi@remirepo.net> - 2.1.16-1
- update to 2.1.16
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Jan 21 2020 Remi Collet <remi@remirepo.net> - 2.1.15-1
- update to 2.1.15
* Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 2.1.14-1
- update to 2.1.14 (no change)
* 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)
* Mon Aug 19 2019 Remi Collet <remi@remirepo.net> - 2.1.11-1
- update to 2.1.11
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Jul 21 2019 Remi Collet <remi@remirepo.net> - 2.1.10-1
- update to 2.1.10
* Tue Jun 25 2019 Remi Collet <remi@remirepo.net> - 2.1.9-1
- update to 2.1.9
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Dec 6 2018 Remi Collet <remi@remirepo.net> - 2.1.7-1
- update to 2.1.7
* Wed Sep 26 2018 Remi Collet <remi@remirepo.net> - 2.1.6-1
- update to 2.1.6 (no change)
* Mon Aug 20 2018 Remi Collet <remi@remirepo.net> - 2.1.5-1
- update to 2.1.5
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Apr 12 2018 Remi Collet <remi@remirepo.net> - 2.1.4-1
- update to 2.1.4
- use range dependencies
- use phpunit6
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Nov 16 2017 Remi Collet <remi@remirepo.net> - 2.1.3-1
- Update to 2.1.3

2
sources
View file

@ -1 +1 @@
SHA512 (php-egulias-email-validator2-2.1.25-0dbf5d7.tgz) = c3600fd38fa5e85ef960242ad867618e09d6bc2ca6887e8a4a0a498a1a405d23a6d9f01635a5c3f64c203e7c0d1561040b67c56c99fe566bfa879b8e35128938
SHA512 (php-egulias-email-validator2-2.1.3-1bec00a.tgz) = 47188b64fed0fcdd10b39ae9b48936a6e8e40dcd5d217cef46706e05359c5d613d71bee70511bff10b834a343f6a7795b55dc1df3ea594b0840a641b853966ee