diff options
| -rw-r--r-- | composer.json | 14 | ||||
| -rw-r--r-- | php-phpunit-phploc.spec | 48 |
2 files changed, 30 insertions, 32 deletions
diff --git a/composer.json b/composer.json index 9a7eba1..c4e2153 100644 --- a/composer.json +++ b/composer.json @@ -14,14 +14,10 @@ "issues": "https://github.com/sebastianbergmann/phploc/issues" }, "require": { - "php": ">=5.6", - "sebastian/finder-facade": "~1.1", - "sebastian/git": "~2.1", - "sebastian/version": "~1.0.3|~2.0", - "symfony/console": "~2.5|~3.0" - }, - "require-dev": { - "phpunit/phpunit": "~5" + "php": "^5.6 || ^7.0", + "sebastian/finder-facade": "^1.1", + "sebastian/version": "^2.0", + "symfony/console": "^2.7|^3.0" }, "autoload": { "classmap": [ @@ -33,7 +29,7 @@ ], "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } } } diff --git a/php-phpunit-phploc.spec b/php-phpunit-phploc.spec index 20252eb..e90ad8f 100644 --- a/php-phpunit-phploc.spec +++ b/php-phpunit-phploc.spec @@ -7,7 +7,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 74f917e6f80f291856989960d31afa44a4196859 +%global gh_commit 7335bb2173c687759631fe4901db6897245f6e2b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phploc @@ -17,8 +17,8 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-phpunit-phploc -Version: 3.0.1 -Release: 3%{?dist} +Version: 4.0.0 +Release: 1%{?dist} Summary: A tool for quickly measuring the size of a PHP project Group: Development/Libraries @@ -35,36 +35,32 @@ BuildRequires: php-fedora-autoloader-devel %if %{with_tests} BuildRequires: php-composer(sebastian/finder-facade) < 2 BuildRequires: php-composer(sebastian/finder-facade) >= 1.1 -BuildRequires: php-composer(sebastian/git) < 3 -BuildRequires: php-composer(sebastian/git) >= 2.1 BuildRequires: php-composer(sebastian/version) < 3 -BuildRequires: php-composer(sebastian/version) >= 1.0.3 +BuildRequires: php-composer(sebastian/version) >= 2.0 BuildRequires: php-composer(symfony/console) < 4 BuildRequires: php-composer(symfony/console) >= 2.5 -# For our autoloader -BuildRequires: php-composer(symfony/class-loader) -# From composer.json, "require-dev": { -# "phpunit/phpunit": "~5" -BuildRequires: php-composer(phpunit/phpunit) >= 5 +%if 0%{?fedora} >= 26 +%global phpunit %{_bindir}/phpunit6 +%else +%global phpunit %{_bindir}/phpunit +%endif +BuildRequires: %{phpunit} %endif # From composer.json, "require": { -# "php": ">=5.6", -# "sebastian/finder-facade": "~1.1", -# "sebastian/git": "~2.1", -# "sebastian/version": "~1.0.3|~2.0", -# "symfony/console": "~2.5|~3.0" +# "php": "^5.6 || ^7.0", +# "sebastian/finder-facade": "^1.1", +# "sebastian/version": "^2.0", +# "symfony/console": "^2.7|^3.0" Requires: php(language) >= 5.6 Requires: php-cli Requires: php-composer(sebastian/finder-facade) >= 1.1 Requires: php-composer(sebastian/finder-facade) < 2 -Requires: php-composer(sebastian/git) >= 2.1 -Requires: php-composer(sebastian/git) < 3 -Requires: php-composer(sebastian/version) >= 1.0.3 +Requires: php-composer(sebastian/version) >= 2.0 Requires: php-composer(sebastian/version) < 3 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 4 -# From phpcompatinfo report for version 2.1.3 +# From phpcompatinfo report for version 4.0.0 Requires: php-dom Requires: php-spl Requires: php-tokenizer @@ -101,7 +97,6 @@ cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ '%{_datadir}/php/SebastianBergmann/FinderFacade/autoload.php', - '%{_datadir}/php/SebastianBergmann/Git/autoload.php', '%{_datadir}/php/SebastianBergmann/Version/autoload.php', '%{_datadir}/php/TheSeer/fDOMDocument/autoload.php', [ @@ -121,9 +116,10 @@ install -D -p -m 755 phploc %{buildroot}%{_bindir}/phploc %if %{with_tests} %check -for cmd in php php56 php70 php71 php72; do +for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do if which $cmd; then - $cmd %{_bindir}/phpunit \ + set $cmd + $1 ${2:-%{_bindir}/phpunit6} \ --bootstrap %{buildroot}%{php_home}/PHPLOC/autoload.php \ --verbose tests fi @@ -148,6 +144,12 @@ fi %changelog +* Wed Jun 7 2017 Remi Collet <remi@remirepo.net> - 4.0.0-1 +- Update to 4.0.0 +- use phpunit6 when available +- drop dependency on sebastian/git +- raise dependency on sebastian/version 2.0 + * Thu May 11 2017 Remi Collet <remi@remirepo.net> - 3.0.1-3 - switch to fedora/autoloader - use Symfony 3 when available |