summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json18
-rw-r--r--phpcov.spec87
2 files changed, 58 insertions, 47 deletions
diff --git a/composer.json b/composer.json
index aacc8c7..0d82aeb 100644
--- a/composer.json
+++ b/composer.json
@@ -15,20 +15,20 @@
},
"config": {
"platform": {
- "php": "7.2.0"
+ "php": "7.3.0"
},
"optimize-autoloader": true,
"sort-packages": true
},
"prefer-stable": true,
"require": {
- "php": "^7.2",
- "phpunit/phpunit": "^8.0",
- "phpunit/php-code-coverage": "^7.0",
- "sebastian/diff": "^3.0",
- "sebastian/finder-facade": "^1.1",
- "sebastian/version": "^2.0",
- "symfony/console": "^3.0 || ^4.0"
+ "php": "^7.3",
+ "phpunit/phpunit": "^9.0",
+ "phpunit/php-code-coverage": "^8.0",
+ "sebastian/diff": "^4.0",
+ "sebastian/finder-facade": "^2.0",
+ "sebastian/version": "^3.0",
+ "symfony/console": "^3.0 || ^4.0 || ^5.0"
},
"autoload": {
"classmap": [
@@ -40,7 +40,7 @@
],
"extra": {
"branch-alias": {
- "dev-master": "6.0-dev"
+ "dev-master": "7.0-dev"
}
}
}
diff --git a/phpcov.spec b/phpcov.spec
index dec62c9..77c45df 100644
--- a/phpcov.spec
+++ b/phpcov.spec
@@ -10,7 +10,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit 63c32ed2a7dd18e5bd07f58aed1982d2ec9f1960
+%global gh_commit 23c15ce31681fd8310546f22fdbc42015ca54ab4
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project phpcov
@@ -25,7 +25,7 @@
Name: %{pk_project}
-Version: 6.0.1
+Version: 7.0.1
Release: 1%{?dist}
Summary: CLI frontend for PHP_CodeCoverage
@@ -37,51 +37,51 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
Patch0: %{gh_project}-rpm.patch
BuildArch: noarch
-BuildRequires: php(language) >= 7.2
+BuildRequires: php(language) >= 7.3
BuildRequires: php-fedora-autoloader-devel
%if %{with_tests}
-BuildRequires: phpunit8
+BuildRequires: phpunit9
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0 with php-composer(phpunit/php-code-coverage) < 8)
-BuildRequires: (php-composer(sebastian/diff) >= 3 with php-composer(sebastian/diff) < 4)
-BuildRequires: (php-composer(sebastian/finder-facade) >= 1.1 with php-composer(sebastian/finder-facade) < 2)
-BuildRequires: (php-composer(sebastian/version) >= 2.0 with php-composer(sebastian/version) < 3)
-BuildRequires: (php-composer(symfony/console) >= 3.0 with php-composer(symfony/console) < 5)
+BuildRequires: (php-composer(phpunit/php-code-coverage) >= 8.0 with php-composer(phpunit/php-code-coverage) < 9)
+BuildRequires: (php-composer(sebastian/diff) >= 4 with php-composer(sebastian/diff) < 5)
+BuildRequires: (php-composer(sebastian/finder-facade) >= 2.0 with php-composer(sebastian/finder-facade) < 3)
+BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4)
+BuildRequires: (php-composer(symfony/console) >= 3.0 with php-composer(symfony/console) < 6)
# remirepo:7
%else
-BuildRequires: php-phpunit-php-code-coverage7
-BuildRequires: php-sebastian-diff3
-BuildRequires: php-phpunit-FinderFacade >= 1.1
-BuildRequires: php-phpunit-Version >= 2.0
+BuildRequires: php-phpunit-php-code-coverage8
+BuildRequires: php-sebastian-diff4
+BuildRequires: php-sebastian-finder-facade2
+BuildRequires: php-sebastian-version3
BuildRequires: php-symfony4-console
%endif
BuildRequires: php-pecl(Xdebug)
%endif
# from composer.json
-# "php": "^7.2",
-# "phpunit/phpunit": "^8.0",
-# "phpunit/php-code-coverage": "^7.0",
-# "sebastian/diff": "^3.0",
-# "sebastian/finder-facade": "^1.1",
-# "sebastian/version": "^2.0",
-# "symfony/console": "^3.0|^4.0"
-Requires: php(language) >= 7.2
-Requires: phpunit8
+# "php": "^7.3",
+# "phpunit/phpunit": "^9.0",
+# "phpunit/php-code-coverage": "^8.0",
+# "sebastian/diff": "^4.0",
+# "sebastian/finder-facade": "^2.0",
+# "sebastian/version": "^3.0",
+# "symfony/console": "^3.0 || ^4.0 || ^5.0"
+Requires: php(language) >= 7.3
+Requires: phpunit9
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(phpunit/php-code-coverage) >= 7.0 with php-composer(phpunit/php-code-coverage) < 8)
-Requires: (php-composer(sebastian/diff) >= 3 with php-composer(sebastian/diff) < 4)
-Requires: (php-composer(sebastian/finder-facade) >= 1.1 with php-composer(sebastian/finder-facade) < 2)
-Requires: (php-composer(sebastian/version) >= 2.0 with php-composer(sebastian/version) < 3)
-Requires: (php-composer(symfony/console) >= 3.0 with php-composer(symfony/console) < 5)
+Requires: (php-composer(phpunit/php-code-coverage) >= 8.0 with php-composer(phpunit/php-code-coverage) < 9)
+Requires: (php-composer(sebastian/diff) >= 4 with php-composer(sebastian/diff) < 5)
+Requires: (php-composer(sebastian/finder-facade) >= 2.0 with php-composer(sebastian/finder-facade) < 3)
+Requires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4)
+Requires: (php-composer(symfony/console) >= 3.0 with php-composer(symfony/console) < 6)
# remirepo:7
%else
-Requires: php-phpunit-php-code-coverage7
-Requires: php-sebastian-diff3
-Requires: php-phpunit-FinderFacade >= 1.1
-Requires: php-phpunit-Version >= 2.0
+Requires: php-phpunit-php-code-coverage8
+Requires: php-sebastian-diff4
+Requires: php-sebastian-finder-facade2
+Requires: php-sebastian-version3
Requires: php-symfony4-console
%endif
# from phpcompatinfo report for version 4.0.0
@@ -117,12 +117,13 @@ phpab \
cat << 'EOF' | tee -a src/autoload.php
// Dependencies
\Fedora\Autoloader\Dependencies::required([
- '%{php_home}/PHPUnit8/autoload.php',
- '%{php_home}/%{ns_vendor}/CodeCoverage7/autoload.php',
- '%{php_home}/%{ns_vendor}/Diff3/autoload.php',
- '%{php_home}/%{ns_vendor}/FinderFacade/autoload.php',
- '%{php_home}/%{ns_vendor}/Version/autoload.php',
+ '%{php_home}/PHPUnit9/autoload.php',
+ '%{php_home}/%{ns_vendor}/CodeCoverage8/autoload.php',
+ '%{php_home}/%{ns_vendor}/Diff4/autoload.php',
+ '%{php_home}/%{ns_vendor}/FinderFacade2/autoload.php',
+ '%{php_home}/%{ns_vendor}/Version3/autoload.php',
[
+ '%{php_home}/Symfony5/Component/Console/autoload.php',
'%{php_home}/Symfony4/Component/Console/autoload.php',
'%{php_home}/Symfony3/Component/Console/autoload.php',
]
@@ -147,9 +148,9 @@ then EXT="-d zend_extension=xdebug.so"
fi
ret=0
-for cmd in php php72 php73 php74; do
+for cmd in php php73 php74; do
if which $cmd; then
- $cmd $EXT %{_bindir}/phpunit8 --verbose || ret=1
+ $cmd $EXT %{_bindir}/phpunit9 --verbose || ret=1
fi
done
exit $ret;
@@ -169,6 +170,16 @@ exit $ret;
%changelog
+* Mon Feb 10 2020 Remi Collet <remi@remirepo.net> - 7.0.1-1
+- update to 7.0.1
+- raise dependency on PHP 7.3
+- raise dependency on phpunit/phpunit 9
+- raise dependency on phpunit/php-code-coverage 8
+- raise dependency on sebastian/diff 4
+- raise dependency on sebastian/finder-facade 2
+- raise dependency on sebastian/version 3
+- allow Symfony 5
+
* Mon Nov 18 2019 Remi Collet <remi@remirepo.net> - 6.0.1-1
- update to 6.0.1 (no change)