summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-11-04 07:52:23 +0100
committerRemi Collet <remi@php.net>2021-11-04 07:52:23 +0100
commit4336c9383887fab7aa73463745474f73ea2f6fd3 (patch)
treea207460dcf92b3c45b8e89c421a2363e6e7064f7
parentc837617ecf3fb50d4a05ed0c86f30ba47ab6b67b (diff)
update to 2.2.5
-rw-r--r--composer.json2
-rw-r--r--php-sabre-xml2.spec15
2 files changed, 8 insertions, 9 deletions
diff --git a/composer.json b/composer.json
index b54cf19..4524cf5 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
}
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "~2.16.1",
+ "friendsofphp/php-cs-fixer": "~2.17.1",
"phpstan/phpstan": "^0.12",
"phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0"
},
diff --git a/php-sabre-xml2.spec b/php-sabre-xml2.spec
index 81c1796..d3ee460 100644
--- a/php-sabre-xml2.spec
+++ b/php-sabre-xml2.spec
@@ -10,7 +10,7 @@
%bcond_without tests
# Github
-%global gh_commit c3b959f821c19b36952ec4a595edd695c216bfc6
+%global gh_commit a6af111850e7536d200d9637c34885cd3c77a86c
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sabre-io
%global gh_project xml
@@ -24,7 +24,7 @@
Name: php-%{pk_vendor}-%{pk_project}%{major}
Summary: XML library that you may not hate
-Version: 2.2.3
+Version: 2.2.5
Release: 1%{?dist}
URL: https://github.com/%{gh_owner}/%{gh_project}
@@ -50,15 +50,11 @@ BuildRequires: php-libxml
BuildRequires: php-pcre
BuildRequires: php-spl
# From composer.json, "require-dev": {
+# "friendsofphp/php-cs-fixer": "~2.17.1",
# "phpstan/phpstan": "^0.12",
# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0"
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9
BuildRequires: phpunit9
%global phpunit %{_bindir}/phpunit9
-%else
-BuildRequires: phpunit8
-%global phpunit %{_bindir}/phpunit8
-%endif
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
@@ -142,7 +138,7 @@ cd tests
: Run upstream test suite against installed library
ret=0
-for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit9} || ret=1
@@ -164,6 +160,9 @@ exit $ret
%changelog
+* Thu Nov 4 2021 Remi Collet <remi@remirepo.net> - 2.2.5-1
+- update to 2.2.5
+
* Mon Oct 5 2020 Remi Collet <remi@remirepo.net> - 2.2.3-1
- update to 2.2.3