diff options
| -rw-r--r-- | composer.json | 17 | ||||
| -rw-r--r-- | php-phpunit-phploc.spec | 58 |
2 files changed, 46 insertions, 29 deletions
diff --git a/composer.json b/composer.json index 3174e67..2a44088 100644 --- a/composer.json +++ b/composer.json @@ -13,11 +13,18 @@ "support": { "issues": "https://github.com/sebastianbergmann/phploc/issues" }, + "config": { + "platform": { + "php": "7.3.0" + }, + "optimize-autoloader": true, + "sort-packages": true + }, "require": { - "php": "^7.2", - "sebastian/finder-facade": "^1.1", - "sebastian/version": "^2.0", - "symfony/console": "^4.0" + "php": "^7.3", + "sebastian/finder-facade": "^2.0", + "sebastian/version": "^3.0", + "symfony/console": "^4.0 || ^5.0" }, "autoload": { "classmap": [ @@ -29,7 +36,7 @@ ], "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "6.0-dev" } } } diff --git a/php-phpunit-phploc.spec b/php-phpunit-phploc.spec index 3c144c1..41f7b66 100644 --- a/php-phpunit-phploc.spec +++ b/php-phpunit-phploc.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-phpunit-phploc # -# Copyright (c) 2009-2019 Guillaume Kulakowski, Christof Damian, Remi Collet +# Copyright (c) 2009-2020 Guillaume Kulakowski, Christof Damian, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 5b714ccb7cb8ca29ccf9caf6eb1aed0131d3a884 +%global gh_commit 3304fda7460777233e158c248fdca85d550a2851 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phploc @@ -21,7 +21,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-phpunit-phploc -Version: 5.0.0 +Version: 6.0.0 Release: 1%{?dist} Summary: A tool for quickly measuring the size of a PHP project @@ -33,7 +33,7 @@ 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: php-dom @@ -42,13 +42,13 @@ BuildRequires: php-spl BuildRequires: php-tokenizer # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -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) >= 4.0 with php-composer(symfony/console) < 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) >= 4.0 with php-composer(symfony/console) < 6) # remirepo:5 %else -BuildRequires: php-phpunit-FinderFacade >= 1.1 -BuildRequires: php-phpunit-Version >= 2.0 +BuildRequires: php-sebastian-finder-facade2 +BuildRequires: php-sebastian-version3 BuildRequires: php-symfony4-console %endif %global phpunit %{_bindir}/phpunit8 @@ -56,21 +56,21 @@ BuildRequires: %{phpunit} %endif # From composer.json, "require": { -# "php": "^7.2", -# "sebastian/finder-facade": "^1.1", -# "sebastian/version": "^2.0", -# "symfony/console": "^4.0" -Requires: php(language) >= 7.2 +# "php": "^7.3", +# "sebastian/finder-facade": "^2.0", +# "sebastian/version": "^3.0", +# "symfony/console": "^4.0 || ^5.0" +Requires: php(language) >= 7.3 Requires: php-cli # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -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) >= 4.0 with php-composer(symfony/console) < 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) >= 4.0 with php-composer(symfony/console) < 6) # remirepo:5 %else -Requires: php-phpunit-FinderFacade >= 1.1 -Requires: php-phpunit-Version >= 2.0 +Requires: php-sebastian-finder-facade2 +Requires: php-sebastian-version3 Requires: php-symfony4-console %endif # From phpcompatinfo report for version 5.0.0 @@ -110,10 +110,13 @@ need to get a quick understanding of a project's size. cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{_datadir}/php/SebastianBergmann/FinderFacade/autoload.php', - '%{_datadir}/php/SebastianBergmann/Version/autoload.php', + '%{_datadir}/php/SebastianBergmann/FinderFacade2/autoload.php', + '%{_datadir}/php/SebastianBergmann/Version3/autoload.php', '%{_datadir}/php/TheSeer/fDOMDocument/autoload.php', - '%{_datadir}/php/Symfony4/Component/Console/autoload.php', + [ + '%{_datadir}/php/Symfony5/Component/Console/autoload.php', + '%{_datadir}/php/Symfony4/Component/Console/autoload.php', + ], ]); EOF @@ -128,10 +131,10 @@ install -D -p -m 755 phploc %{buildroot}%{_bindir}/phploc %if %{with_tests} %check ret=0 -for cmd in "php %{phpunit}" php72 php73; do +for cmd in "php %{phpunit}" php73 php74; do if which $cmd; then set $cmd - $1 ${2:-%{_bindir}/phpunit8} \ + $1 ${2:-%{_bindir}/phpunit9} \ --bootstrap %{buildroot}%{php_home}/PHPLOC/autoload.php \ --verbose tests || ret=1 fi @@ -158,6 +161,13 @@ fi %changelog +* Thu Feb 20 2020 Remi Collet <remi@remirepo.net> - 6.0.0-1 +- update to 6.0.0 +- raise depency on PHP 7.3 +- raise depency on sebastian/finder-facade 2 +- raise depency on sebastian/version 3 +- allow symfony 5 + * Sun Mar 17 2019 Remi Collet <remi@remirepo.net> - 5.0.0-1 - update to 5.0.0 - raise dependency on PHP 7.2 |