From d6e60947fa005cb497c0ee86c50a106408e765cb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Feb 2023 12:49:44 +0100 Subject: update to 6.0.0 raise dependency on PHP 8.1 raise dependency on sebastian/object-reflector 3 raise dependency on sebastian/recursion-context 5 rename to php-sebastian-global-state6 move to /usr/share/php/SebastianBergmann/GlobalState6 --- composer.json | 15 ++++----- php-sebastian-global-state6.spec | 66 +++++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/composer.json b/composer.json index 0fef446..b8c9b72 100644 --- a/composer.json +++ b/composer.json @@ -13,22 +13,19 @@ "prefer-stable": true, "config": { "platform": { - "php": "7.3.0" + "php": "8.1.0" }, "optimize-autoloader": true, "sort-packages": true }, "require": { - "php": ">=7.3", - "sebastian/object-reflector": "^2.0", - "sebastian/recursion-context": "^4.0" + "php": ">=8.1", + "sebastian/object-reflector": "^3.0", + "sebastian/recursion-context": "^5.0" }, "require-dev": { "ext-dom": "*", - "phpunit/phpunit": "^9.3" - }, - "suggest": { - "ext-uopz": "*" + "phpunit/phpunit": "^10.0" }, "autoload": { "classmap": [ @@ -45,7 +42,7 @@ }, "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-main": "6.0-dev" } } } diff --git a/php-sebastian-global-state6.spec b/php-sebastian-global-state6.spec index 318641c..a93079d 100644 --- a/php-sebastian-global-state6.spec +++ b/php-sebastian-global-state6.spec @@ -1,15 +1,16 @@ -# spec file for php-sebastian-global-state4 +# spec file for php-sebastian-global-state5 # -# Copyright (c) 2014-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2014-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%bcond_without tests +# disable until phpunit10 available +%bcond_with tests -%global gh_commit 0ca8db5a5fc9c8646244e629625ac486fa286bf2 +%global gh_commit aab257c712de87b90194febd52e4d184551c2d44 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project global-state @@ -19,11 +20,11 @@ # Namespace %global ns_vendor SebastianBergmann %global ns_project GlobalState -%global major 5 +%global major 6 %global php_home %{_datadir}/php Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 5.0.5 +Version: 6.0.0 Release: 1%{?dist} Summary: Snapshotting of global state, version %{major} @@ -33,7 +34,7 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 8.1 BuildRequires: php-reflection BuildRequires: php-spl # Autoloader @@ -41,42 +42,37 @@ 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) >= 2.0 with php-composer(sebastian/object-reflector) < 3) -BuildRequires: (php-composer(sebastian/recursion-context) >= 4.0 with php-composer(sebastian/recursion-context) < 5) +BuildRequires: (php-composer(sebastian/object-reflector) >= 3.0 with php-composer(sebastian/object-reflector) < 4) +BuildRequires: (php-composer(sebastian/recursion-context) >= 5.0 with php-composer(sebastian/recursion-context) < 6) # remirepo:4 %else -BuildRequires: php-sebastian-object-reflector2 -BuildRequires: php-sebastian-recursion-context4 +BuildRequires: php-sebastian-object-reflector3 +BuildRequires: php-sebastian-recursion-context5 %endif # from composer.json, "require-dev": { # "ext-dom": "*", -# "phpunit/phpunit": "^9.3" -BuildRequires: phpunit9 >= 9.3 +# "phpunit/phpunit": "^10.0" BuildRequires: php-dom +BuildRequires: phpunit10 %endif # from composer.json, "require": { -# "php": ">=7.3", -# "sebastian/object-reflector": "^2.0", -# "sebastian/recursion-context": "^4.0" +# "php": ">=8.1", +# "sebastian/object-reflector": "^3.0", +# "sebastian/recursion-context": "^5.0" Requires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -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) +Requires: (php-composer(sebastian/object-reflector) >= 3.0 with php-composer(sebastian/object-reflector) < 4) +Requires: (php-composer(sebastian/recursion-context) >= 5.0 with php-composer(sebastian/recursion-context) < 6) # remirepo:4 %else -Requires: php-sebastian-object-reflector2 -Requires: php-sebastian-recursion-context4 +Requires: php-sebastian-object-reflector3 +Requires: php-sebastian-recursion-context5 %endif -# from phpcompatinfo report for version 4.0.0 +# from phpcompatinfo report for version 6.0.0 Requires: php-reflection Requires: php-spl -# from composer.json, "suggest": { -# "ext-uopz": "*" -%if 0%{?fedora} > 21 || 0%{?rhel} >= 8 -Suggests: php-uopz -%endif # Autoloader Requires: php-composer(fedora/autoloader) @@ -97,8 +93,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}/ObjectReflector2/autoload.php', - '%{php_home}/%{ns_vendor}/RecursionContext4/autoload.php', + '%{php_home}/%{ns_vendor}/ObjectReflector3/autoload.php', + '%{php_home}/%{ns_vendor}/RecursionContext5/autoload.php', ]); EOF @@ -126,10 +122,10 @@ EOF : Run upstream test suite ret=0 -for cmd in php php74 php80 php81; do +for cmd in php php81 php82; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit9 \ + %{_bindir}/phpunit10 \ --filter '^((?!(testConstructorExcludesAspectsWhenTheyShouldNotBeIncluded|testCanExportGlobalVariablesToCode|testStaticNotInitialisedAttributes)).)*$' \ --verbose || ret=1 fi @@ -151,6 +147,14 @@ exit $ret %changelog +* Fri Feb 3 2023 Remi Collet - 6.0.0-1 +- update to 6.0.0 +- raise dependency on PHP 8.1 +- raise dependency on sebastian/object-reflector 3 +- raise dependency on sebastian/recursion-context 5 +- rename to php-sebastian-global-state6 +- move to /usr/share/php/SebastianBergmann/GlobalState6 + * Mon Feb 14 2022 Remi Collet - 5.0.5-1 - update to 5.0.5 -- cgit