summaryrefslogtreecommitdiffstats
path: root/php-masterminds-html5.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-03-17 16:01:35 +0100
committerRemi Collet <remi@remirepo.net>2021-03-17 16:01:35 +0100
commitf447b149e0148d61ff9132dca830790d74bea804 (patch)
tree26f1b1788bd813a54ccfc264c71b48207315ad66 /php-masterminds-html5.spec
parent81746e329cc9e664d86825a426d0efa9470ad9ad (diff)
update to 2.7.4
drop patch merged upstream switch to phpunit8
Diffstat (limited to 'php-masterminds-html5.spec')
-rw-r--r--php-masterminds-html5.spec38
1 files changed, 28 insertions, 10 deletions
diff --git a/php-masterminds-html5.spec b/php-masterminds-html5.spec
index 6a011d5..b461425 100644
--- a/php-masterminds-html5.spec
+++ b/php-masterminds-html5.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-masterminds-html5
#
-# Copyright (c) 2015-2019 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2015-2020 Shawn Iwinski <shawn.iwinski@gmail.com>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -12,8 +12,8 @@
%global github_owner Masterminds
%global github_name html5-php
-%global github_version 2.7.0
-%global github_commit 104443ad663d15981225f99532ba73c2f1d6b6f2
+%global github_version 2.7.4
+%global github_commit 9227822783c75406cfe400984b2f095cdf03d417
%global composer_vendor masterminds
%global composer_project html5
@@ -33,9 +33,10 @@ Summary: An HTML5 parser and serializer
License: MIT
URL: http://masterminds.github.io/html5-php
-Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
-
-Patch0: https://patch-diff.githubusercontent.com/raw/Masterminds/html5-php/pull/170.patch
+# GitHub export does not include tests.
+# Run php-league-container-get-source.sh to create full source.
+Source0: %{name}-%{github_version}-%{github_commit}.tar.gz
+Source1: %{name}-get-source.sh
BuildArch: noarch
# Autoload generation
@@ -44,7 +45,7 @@ BuildRequires: %{_bindir}/phpab
%if %{with_tests}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: php-composer(phpunit/phpunit) >= 4.8.35
+BuildRequires: phpunit8
BuildRequires: php-ctype
BuildRequires: php-dom
## phpcompatinfo (computed from version 2.7.0)
@@ -85,7 +86,6 @@ refactoring work, we began a new parser.
%prep
%setup -qn %{github_name}-%{github_commit}
-%patch0 -p1 -b .pr170
: Docs
mkdir -p docs/{Parser,Serializer}
@@ -121,10 +121,23 @@ require '%{buildroot}%{phpdir}/Masterminds/HTML5/autoload.php';
require __DIR__ . '/../test/autoload.php';
AUTOLOAD
+: fix for phpunit8
+find test \
+ -name \*.php \
+ -exec sed \
+ -e 's/function setUp()/function setUp():void/' \
+ -i {} \;
+
+sed -e 's/assertContains(/assertStringContainsString(/' \
+ -i test/HTML5/Html5Test.php
+
+grep -v blacklist < phpunit.xml.dist | \
+ grep -v '<file' > phpunit.xml
+
: Upstream tests
RETURN_CODE=0
-PHPUNIT=$(which phpunit)
-for PHP_EXEC in "" %{?rhel:php54 php55 php56 php70} php71 php72 php73 php74; do
+PHPUNIT=$(which phpunit8)
+for PHP_EXEC in "" php72 php73 php74 php80; do
if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose || RETURN_CODE=1
fi
@@ -143,6 +156,11 @@ exit $RETURN_CODE
%changelog
+* Wed Mar 17 2021 Remi Collet <remi@remirepo.net> - 2.7.4-1
+- update to 2.7.4
+- drop patch merged upstream
+- switch to phpunit8
+
* Fri Oct 11 2019 Remi Collet <remi@remirepo.net> - 2.7.0-1
- update to 2.7.0
- add patch for PHP 7.4 from