summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json5
-rwxr-xr-xmakesrc.sh2
-rw-r--r--php-egulias-email-validator2.spec15
3 files changed, 18 insertions, 4 deletions
diff --git a/composer.json b/composer.json
index 7cc836f..5423e9f 100644
--- a/composer.json
+++ b/composer.json
@@ -35,5 +35,10 @@
"psr-4": {
"Egulias\\EmailValidator\\": "EmailValidator"
}
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "Egulias\\Tests\\": "test"
+ }
}
}
diff --git a/makesrc.sh b/makesrc.sh
index ab1375c..97be9f6 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -20,7 +20,7 @@ cp composer.json ../composer.json
popd
echo "Archiving..."
-tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT
echo "Cleaning..."
rm -rf $PROJECT-$COMMIT
diff --git a/php-egulias-email-validator2.spec b/php-egulias-email-validator2.spec
index b7d38c0..561e2fb 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.5
-%global github_commit 54859fabea8b3beecbb1a282888d5c990036b9e3
+%global github_version 2.1.6
+%global github_commit 0578b32b30b22de3e8664f797cf846fc9246f786
%global github_short %(c=%{github_commit}; echo ${c:0:7})
%global major 2
@@ -121,6 +121,13 @@ 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__) . "/test");
+EOF
+
: Skip online tests
rm Tests/EmailValidator/Validation/DNSCheckValidationTest.php
rm Tests/EmailValidator/Validation/SpoofCheckValidationTest.php
@@ -131,7 +138,6 @@ for cmdarg in "php %{phpunit}" php70 php71 php72 php73; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit6} \
- --bootstrap %{buildroot}%{phpdir}/Egulias/EmailValidator%{major}/autoload.php \
--verbose|| ret=1
fi
done
@@ -151,6 +157,9 @@ exit $ret
%changelog
+* 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