diff options
| -rw-r--r-- | composer.json | 13 | ||||
| -rw-r--r-- | php-sebastian-comparator4.spec | 61 |
2 files changed, 44 insertions, 30 deletions
diff --git a/composer.json b/composer.json index e0658bc..f77d2c8 100644 --- a/composer.json +++ b/composer.json @@ -24,14 +24,17 @@ ], "prefer-stable": true, "require": { - "php": "^7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" + "php": "^7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^7.1" + "phpunit/phpunit": "^9.0" }, "config": { + "platform": { + "php": "7.3.0" + }, "optimize-autoloader": true, "sort-packages": true }, @@ -47,7 +50,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } } } diff --git a/php-sebastian-comparator4.spec b/php-sebastian-comparator4.spec index 91a22dc..e467f87 100644 --- a/php-sebastian-comparator4.spec +++ b/php-sebastian-comparator4.spec @@ -1,19 +1,21 @@ -# remirepo/fedora spec file for php-sebastian-comparator3 +# remirepo/fedora spec file for php-sebastian-comparator4 # -# Copyright (c) 2014-2018 Remi Collet +# Copyright (c) 2014-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 5de4fc177adf9bce8df98d8d141a7559d7ccf6da +%global gh_commit 85b3435da967696ed618ff745f32be3ff4a2b8e8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project comparator +# Packagist %global pk_vendor sebastian %global pk_project %{gh_project} -%global major 3 +# Namespace +%global major 4 %global php_home %{_datadir}/php %global ns_vendor SebastianBergmann %global ns_project Comparator @@ -24,7 +26,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.2 +Version: 4.0.0 Release: 1%{?dist} Summary: Compare PHP values for equality @@ -33,38 +35,39 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz BuildArch: noarch -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(%{pk_vendor}/diff) >= 3.0 with php-composer(%{pk_vendor}/diff) < 4) -BuildRequires: (php-composer(%{pk_vendor}/exporter) >= 3.1 with php-composer(%{pk_vendor}/exporter) < 4) +BuildRequires: (php-composer(%{pk_vendor}/diff) >= 4.0 with php-composer(%{pk_vendor}/diff) < 5) +BuildRequires: (php-composer(%{pk_vendor}/exporter) >= 4.0 with php-composer(%{pk_vendor}/exporter) < 5) # remirepo:4 %else -BuildRequires: php-sebastian-diff3 -BuildRequires: php-sebastian-exporter3 >= 3.1 +BuildRequires: php-sebastian-diff4 +BuildRequires: php-sebastian-exporter4 %endif BuildRequires: php-fedora-autoloader-devel %if %{with_tests} # from composer.json, "require-dev": { -# "phpunit/phpunit": "^7.1" -BuildRequires: phpunit7 >= 7.1 +# "phpunit/phpunit": "^9.0" +# TODO test suite passes with v8, switch to v9 when available +BuildRequires: phpunit8 %endif # from composer.json -# "php": "^7.1", -# "sebastian/diff": "^3.0", -# "sebastian/exporter": "^3.1" -Requires: php(language) >= 7.1 +# "php": "^7.3", +# "sebastian/diff": "^4.0", +# "sebastian/exporter": "^4.0" +Requires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(%{pk_vendor}/diff) >= 3.0 with php-composer(%{pk_vendor}/diff) < 4) -Requires: (php-composer(%{pk_vendor}/exporter) >= 3.1 with php-composer(%{pk_vendor}/exporter) < 4) +Requires: (php-composer(%{pk_vendor}/diff) >= 4.0 with php-composer(%{pk_vendor}/diff) < 5) +Requires: (php-composer(%{pk_vendor}/exporter) >= 4.0 with php-composer(%{pk_vendor}/exporter) < 5) # remirepo:4 %else -Requires: php-sebastian-diff3 -Requires: php-sebastian-exporter3 >= 3.1 +Requires: php-sebastian-diff4 +Requires: php-sebastian-exporter4 %endif -# from phpcompatinfo report for version 3.0.0 +# from phpcompatinfo report for version 4.0.0 Requires: php-date Requires: php-dom Requires: php-spl @@ -92,8 +95,8 @@ phpab --template fedora --output src/autoload.php src cat <<EOF | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/%{ns_vendor}/Diff3/autoload.php', - '%{php_home}/%{ns_vendor}/Exporter3/autoload.php', + '%{php_home}/%{ns_vendor}/Diff4/autoload.php', + '%{php_home}/%{ns_vendor}/Exporter4/autoload.php', ]); EOF @@ -110,10 +113,10 @@ mkdir vendor : Run upstream test suite ret=0 -for cmd in php php71 php72 php73; do +for cmd in php php73 php74; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit7 --no-coverage --verbose || ret=1 + %{_bindir}/phpunit8 --no-coverage --verbose || ret=1 fi done exit $ret @@ -131,6 +134,14 @@ exit $ret %changelog +* Fri Feb 7 2020 Remi Collet <remi@remirepo.net> - 4.0.0-1 +- update to 4.0.0 +- raise dependency on PHP 7.3 +- raise dependency on sebastian/diff 4 +- raise dependency on sebastian/exporter 4 +- rename to php-sebastian-comparator4 +- move to /usr/share/php/SebastianBergmann/Comparator4 + * Thu Jul 12 2018 Remi Collet <remi@remirepo.net> - 3.0.2-1 - update to 3.0.2 |