summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json20
-rw-r--r--php-sabre-vobject4.spec20
2 files changed, 29 insertions, 11 deletions
diff --git a/composer.json b/composer.json
index 9e522f8..d4fa56a 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,8 @@
},
"require-dev" : {
"friendsofphp/php-cs-fixer": "~2.16.1",
- "phpunit/phpunit" : "^7 || ^8"
+ "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0",
+ "phpstan/phpstan": "^0.12"
},
"suggest" : {
"hoa/bench" : "If you would like to run the benchmark scripts"
@@ -86,7 +87,20 @@
"dev-master" : "4.0.x-dev"
}
},
- "config" : {
- "bin-dir" : "bin"
+ "scripts": {
+ "phpstan": [
+ "phpstan analyse lib tests"
+ ],
+ "cs-fixer": [
+ "php-cs-fixer fix"
+ ],
+ "phpunit": [
+ "phpunit --configuration tests/phpunit.xml"
+ ],
+ "test": [
+ "composer phpstan",
+ "composer cs-fixer",
+ "composer phpunit"
+ ]
}
}
diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec
index 082d8f4..c6a4c86 100644
--- a/php-sabre-vobject4.spec
+++ b/php-sabre-vobject4.spec
@@ -10,11 +10,11 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit 5b2248d965160f93053f3a24704794a13a22a1bb
+%global gh_commit a7feca8311462e5da16952454e420b92c20d3586
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sabre-io
%global gh_project vobject
-%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
+%bcond_without tests
%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
%global with_cmd 1
@@ -24,7 +24,7 @@
Name: php-sabre-vobject4
Summary: Library to parse and manipulate iCalendar and vCard objects
-Version: 4.3.0
+Version: 4.3.1
Release: 1%{?dist}
URL: http://sabre.io/vobject/
@@ -36,7 +36,7 @@ Source1: %{name}-autoload.php
Patch0: %{name}-bin.patch
BuildArch: noarch
-%if %{with_tests}
+%if %{with tests}
BuildRequires: php(language) >= 7.1
BuildRequires: php-mbstring
# remirepo:1
@@ -53,8 +53,9 @@ BuildRequires: php-spl
BuildRequires: php-xml
# From composer.json, "require-dev"
# "friendsofphp/php-cs-fixer": "~2.16.1",
-# "phpunit/phpunit" : "^7 || ^8"
-BuildRequires: phpunit8
+# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0",
+# "phpstan/phpstan": "^0.12"
+BuildRequires: phpunit8 >= 8.5
# Autoloader
BuildRequires: php-composer(fedora/autoloader)
%endif
@@ -126,7 +127,7 @@ install -Dpm 0755 bin/generate_vcards \
%check
-%if %{with_tests}
+%if %{with tests}
: Fix bootstrap
cd tests
sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php
@@ -138,7 +139,7 @@ fi
: Run upstream test suite against installed library
ret=0
-for cmd in php php72 php73 php74; do
+for cmd in php php72 php73 php74 php80; do
if which $cmd; then
$cmd %{_bindir}/phpunit8 $opt || ret=1
fi
@@ -161,6 +162,9 @@ exit $ret
%endif
%changelog
+* Mon Jul 13 2020 Remi Collet <remi@remirepo.net> - 4.3.1-1
+- update to 4.3.1
+
* Sat Feb 1 2020 Remi Collet <remi@remirepo.net> - 4.3.0-1
- update to 4.3.0
- raise dependency on PHP 7.1