diff options
| -rw-r--r-- | composer.json | 21 | ||||
| -rwxr-xr-x | makesrc.sh | 28 | ||||
| -rw-r--r-- | php-egulias-email-validator2.spec (renamed from php-egulias-email-validator.spec) | 67 |
3 files changed, 78 insertions, 38 deletions
diff --git a/composer.json b/composer.json index 6fdc4d0..44c91d7 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "egulias/email-validator", - "description": "A library for validating emails", + "description": "A library for validating emails against several RFCs", "homepage": "https://github.com/egulias/EmailValidator", "type": "Library", "keywords": ["email", "validation", "validator", "emailvalidation", "emailvalidator"], @@ -13,16 +13,27 @@ "dev-master": "2.0.x-dev" } }, + "repositories": [ + { + "type": "git", + "url": "https://github.com/dominicsayers/isemail" + } + ], "require": { - "php": ">= 5.3.3", + "php": ">= 5.5", "doctrine/lexer": "^1.0.1" }, "require-dev" : { - "phpunit/phpunit": "^4.8.24" + "satooshi/php-coveralls": "dev-master", + "phpunit/phpunit": "^4.8.0", + "dominicsayers/isemail": "dev-master" + }, + "suggest": { + "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" }, "autoload": { - "psr-0": { - "Egulias\\": "src/" + "psr-4": { + "Egulias\\EmailValidator\\": "EmailValidator" } } } diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..ab1375c --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global github_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global github_name/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^%global github_version/{s/.* //;p}' $NAME.spec) +COMMIT=$(sed -n '/^%global github_commit/{s/.* //;p}' $NAME.spec) +SHORT=${COMMIT:0:7} + +echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" + +echo "Cloning..." +rm -rf $PROJECT-$COMMIT +git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + +echo "Getting commit..." +pushd $PROJECT-$COMMIT +git checkout $COMMIT +cp composer.json ../composer.json +popd + +echo "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT + +echo "Done." diff --git a/php-egulias-email-validator.spec b/php-egulias-email-validator2.spec index b65c679..41b4f31 100644 --- a/php-egulias-email-validator.spec +++ b/php-egulias-email-validator2.spec @@ -1,8 +1,6 @@ -# remirepo spec file for php-egulias-email-validator, from +# remirepo/fedora spec file for php-egulias-email-validator2 # -# Fedora spec file for php-egulias-email-validator -# -# Copyright (c) 2014-2017 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2014-2017 Shawn Iwinski, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT @@ -12,17 +10,18 @@ %global github_owner egulias %global github_name EmailValidator -%global github_version 1.2.13 -%global github_commit b8bb147f46cc9790326ce2440a13be06cc5a63bb +%global github_version 2.1.2 +%global github_commit bc31baa11ea2883e017f0a10d9722ef9d50eac1c +%global github_short %(c=%{github_commit}; echo ${c:0:7}) +%global major 2 %global composer_vendor egulias %global composer_project email-validator -# "php": ">= 5.3.3" -%global php_min_ver 5.3.3 +# "php": ">= 5.5" +%global php_min_ver 5.5 # "doctrine/lexer": "^1.0.1" -# NOTE: Min version not 1.0.1 because autoloader required -%global doctrine_lexer_min_ver 1.0.1-4 +%global doctrine_lexer_min_ver 1.0.1 %global doctrine_lexer_max_ver 2.0 # Build using "--without tests" to disable tests @@ -30,15 +29,16 @@ %{!?phpdir: %global phpdir %{_datadir}/php} -Name: php-%{composer_vendor}-%{composer_project} +Name: php-%{composer_vendor}-%{composer_project}%{major} Version: %{github_version} -Release: 3%{?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: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz +Source0: %{name}-%{github_version}-%{github_short}.tgz +Source1: makesrc.sh BuildArch: noarch # Tests @@ -47,12 +47,12 @@ 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} -BuildRequires: php-doctrine-lexer >= %{doctrine_lexer_min_ver} -## phpcompatinfo (computed from version 1.2.13) +BuildRequires: php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} +## phpcompatinfo (computed from version 2.1.2) +BuildRequires: php-dom BuildRequires: php-filter +BuildRequires: php-intl BuildRequires: php-pcre -BuildRequires: php-reflection BuildRequires: php-spl ## Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -60,12 +60,11 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -#Requires: php-composer(doctrine/lexer) >= %%{doctrine_lexer_min_ver} -Requires: php-doctrine-lexer >= %{doctrine_lexer_min_ver} +Requires: php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} Requires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver} -# phpcompatinfo (computed from version 1.2.13) +# phpcompatinfo (computed from version 2.1.2) +Requires: php-intl Requires: php-pcre -Requires: php-reflection Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -76,7 +75,7 @@ Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} %description %{summary}. -Autoloader: %{phpdir}/Egulias/EmailValidator/autoload.php +Autoloader: %{phpdir}/Egulias/EmailValidator%{major}/autoload.php %prep @@ -86,7 +85,7 @@ Autoloader: %{phpdir}/Egulias/EmailValidator/autoload.php %build : Create autoloader -cat <<'AUTOLOAD' | tee src/Egulias/EmailValidator/autoload.php +cat <<'AUTOLOAD' | tee EmailValidator/autoload.php <?php /** * Autoloader for %{name} and its' dependencies @@ -103,18 +102,15 @@ AUTOLOAD %install -mkdir -p %{buildroot}%{phpdir} -cp -rp src/* %{buildroot}%{phpdir}/ +mkdir -p %{buildroot}%{phpdir}/Egulias +cp -rp EmailValidator %{buildroot}%{phpdir}/Egulias/EmailValidator%{major} %check %if %{with_tests} -: Skip testValidEmailsWithWarningsCheck and testInvalidEmailsWithDnsCheckAndStrictMode -# because Koji does not have network access so assertEquals(expected_warnings, actual_warnings) -# fails because EmailValidator::DNSWARN_NO_RECORD is not an expected warning -sed -e 's/function testValidEmailsWithWarningsCheck/function SKIP_testValidEmailsWithWarningsCheck/' \ - -e 's/function testInvalidEmailsWithDnsCheckAndStrictMode/function SKIP_testInvalidEmailsWithDnsCheckAndStrictMode/' \ - -i tests/egulias/Tests/EmailValidator/EmailValidatorTest.php +: Skip online tests +rm Tests/EmailValidator/Validation/DNSCheckValidationTest.php +rm Tests/EmailValidator/Validation/SpoofCheckValidationTest.php : Upstream tests RETURN_CODE=0 @@ -122,7 +118,7 @@ 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/autoload.php \ + --bootstrap %{buildroot}%{phpdir}/Egulias/EmailValidator%{major}/autoload.php \ || RETURN_CODE=1 fi done @@ -138,10 +134,15 @@ exit $RETURN_CODE %doc README.md %doc composer.json %dir %{phpdir}/Egulias - %{phpdir}/Egulias/EmailValidator + %{phpdir}/Egulias/EmailValidator%{major} %changelog +* Wed Oct 4 2017 Remi Collet <remi@remirepo.net> - 2.1.2-1 +- Update to 2.1.2 +- rename to php-egulias-email-validator2 +- raise dependency on PHP 5.5 + * Sun May 14 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.2.13-3 - Switch autoloader to php-composer(fedora/autoloader) - Test with SCLs if available |