From 9274d803e3d82230361f71d81c4bfd2554581b82 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 7 Feb 2020 14:48:07 +0100 Subject: update to 4.0.0 raise dependency on PHP 7.3 raise dependency on sebastian/object-reflector 2 raise dependency on sebastian/recursion-context 4 rename to php-sebastian-global-state4 move to /usr/share/php/SebastianBergmann/GlobalState4 --- composer.json | 13 ++++---- php-sebastian-global-state4.spec | 65 ++++++++++++++++++++++++---------------- 2 files changed, 47 insertions(+), 31 deletions(-) diff --git a/composer.json b/composer.json index 166649d..031a7d3 100644 --- a/composer.json +++ b/composer.json @@ -12,17 +12,20 @@ ], "prefer-stable": true, "config": { + "platform": { + "php": "7.3.0" + }, "optimize-autoloader": true, "sort-packages": true }, "require": { - "php": "^7.2", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "php": "^7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" }, "require-dev": { "ext-dom": "*", - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^9.0" }, "suggest": { "ext-uopz": "*" @@ -42,7 +45,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } } } diff --git a/php-sebastian-global-state4.spec b/php-sebastian-global-state4.spec index a6c4ff4..cbaff64 100644 --- a/php-sebastian-global-state4.spec +++ b/php-sebastian-global-state4.spec @@ -1,22 +1,24 @@ -# spec file for php-sebastian-global-state3 +# spec file for php-sebastian-global-state4 # -# Copyright (c) 2014-2019 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 edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4 +%global gh_commit bdb1e7c79e592b8c82cb1699be3c8743119b8a72 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project global-state +# Packagist %global pk_vendor sebastian %global pk_project %{gh_project} -%global major 3 -%global php_home %{_datadir}/php +# Namespace %global ns_vendor SebastianBergmann %global ns_project GlobalState +%global major 4 +%global php_home %{_datadir}/php %if %{bootstrap} %global with_tests 0%{?_with_tests:1} %else @@ -24,8 +26,8 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.0 -Release: 2%{?dist} +Version: 4.0.0 +Release: 1%{?dist} Summary: Snapshotting of global state License: BSD @@ -33,7 +35,7 @@ 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.2 +BuildRequires: php(language) >= 7.3 BuildRequires: php-reflection BuildRequires: php-spl # Autoloader @@ -41,35 +43,36 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with_tests} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(sebastian/object-reflector) >= 1.1.1 with php-composer(sebastian/object-reflector) < 2) -BuildRequires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 4) +BuildRequires: (php-composer(sebastian/object-reflector) >= 2.0 with php-composer(sebastian/object-reflector) < 3) +BuildRequires: (php-composer(sebastian/recursion-context) >= 4.0 with php-composer(sebastian/recursion-context) < 5) # remirepo:4 %else -BuildRequires: php-sebastian-object-reflector >= 1.1.1 -BuildRequires: php-sebastian-recursion-context3 +BuildRequires: php-sebastian-object-reflector2 +BuildRequires: php-sebastian-recursion-context4 %endif # from composer.json, "require-dev": { # "ext-dom": "*", -# "phpunit/phpunit": "^8.0" +# "phpunit/phpunit": "^9.0" +# TODO test suite passes with v8, switch to v9 when available BuildRequires: phpunit8 BuildRequires: php-dom %endif # from composer.json, "require": { -# "php": "^7.2", -# "sebastian/object-reflector": "^1.1.1", -# "sebastian/recursion-context": "^3.0" -Requires: php(language) >= 7.2 +# "php": "^7.3", +# "sebastian/object-reflector": "^2.0", +# "sebastian/recursion-context": "^4.0" +Requires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(sebastian/object-reflector) >= 1.1.1 with php-composer(sebastian/object-reflector) < 2) -Requires: (php-composer(sebastian/recursion-context) >= 3.0 with php-composer(sebastian/recursion-context) < 4) +Requires: (php-composer(sebastian/object-reflector) >= 2.0 with php-composer(sebastian/object-reflector) < 3) +Requires: (php-composer(sebastian/recursion-context) >= 4.0 with php-composer(sebastian/recursion-context) < 5) # remirepo:4 %else -Requires: php-sebastian-object-reflector >= 1.1.1 -Requires: php-sebastian-recursion-context3 +Requires: php-sebastian-object-reflector2 +Requires: php-sebastian-recursion-context4 %endif -# from phpcompatinfo report for version 2.0.0 +# from phpcompatinfo report for version 4.0.0 Requires: php-reflection Requires: php-spl # from composer.json, "suggest": { @@ -97,8 +100,8 @@ factored out of PHPUnit into a stand-alone component. phpab --template fedora --output src/autoload.php src cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/%{ns_vendor}/ObjectReflector/autoload.php', - '%{php_home}/%{ns_vendor}/RecursionContext3/autoload.php', + '%{php_home}/%{ns_vendor}/ObjectReflector2/autoload.php', + '%{php_home}/%{ns_vendor}/RecursionContext4/autoload.php', ]); EOF @@ -116,14 +119,16 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} mkdir vendor cat < - 4.0.0-1 +- update to 4.0.0 +- raise dependency on PHP 7.3 +- raise dependency on sebastian/object-reflector 2 +- raise dependency on sebastian/recursion-context 4 +- rename to php-sebastian-global-state4 +- move to /usr/share/php/SebastianBergmann/GlobalState4 + * Fri Feb 22 2019 Remi Collet - 3.0.0-2 - normal build -- cgit