From 2ad6aa7a69c69df3119b2390d28fbac94a898bac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 7 Feb 2025 08:30:39 +0100 Subject: add bootstrap --- composer.json | 12 ++++---- php-sebastian-object-enumerator7.spec | 55 ++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/composer.json b/composer.json index 333d744..442e002 100644 --- a/composer.json +++ b/composer.json @@ -16,18 +16,18 @@ "prefer-stable": true, "config": { "platform": { - "php": "8.2.0" + "php": "8.3.0" }, "optimize-autoloader": true, "sort-packages": true }, "require": { - "php": ">=8.2", - "sebastian/object-reflector": "^4.0", - "sebastian/recursion-context": "^6.0" + "php": ">=8.3", + "sebastian/object-reflector": "^5.0", + "sebastian/recursion-context": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^11.0" + "phpunit/phpunit": "^12.0" }, "autoload": { "classmap": [ @@ -41,7 +41,7 @@ }, "extra": { "branch-alias": { - "dev-main": "6.0-dev" + "dev-main": "7.0-dev" } } } diff --git a/php-sebastian-object-enumerator7.spec b/php-sebastian-object-enumerator7.spec index a170626..be2cfce 100644 --- a/php-sebastian-object-enumerator7.spec +++ b/php-sebastian-object-enumerator7.spec @@ -1,4 +1,4 @@ -# remirepo/fedora spec file for php-sebastian-object-enumerator6 +# remirepo/fedora spec file for php-sebastian-object-enumerator7 # # SPDX-FileCopyrightText: Copyright 2015-2025 Remi Collet # SPDX-License-Identifier: CECILL-2.1 @@ -7,26 +7,26 @@ # Please, preserve the changelog entries # -# disabled until phpunit11 available -%bcond_without tests +# disabled until phpunit12 available +%bcond_with tests -%global gh_commit f5b498e631a74204185071eb41f33f38d64608aa +%global gh_commit 1effe8e9b8e068e9ae228e542d5d11b5d16db894 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project object-enumerator -%global gh_date 2024-07-03 +%global gh_date 2025-02-07 # Packagist %global pk_vendor sebastian %global pk_project %{gh_project} # Namespace %global ns_vendor SebastianBergmann %global ns_project ObjectEnumerator -%global major 6 +%global major 7 %global php_home %{_datadir}/php Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 6.0.1 -Release: 2%{?dist} +Version: 7.0.0 +Release: 1%{?dist} Summary: Traverses array and object to enumerate all referenced objects, version %{major} License: BSD-3-Clause @@ -36,24 +36,23 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -BuildRequires: php(language) >= 8.2 +BuildRequires: php(language) >= 8.3 BuildRequires: php-fedora-autoloader-devel %if %{with tests} -BuildRequires: (php-composer(%{pk_vendor}/object-reflector) >= 4.0 with php-composer(%{pk_vendor}/object-reflector) < 5) -BuildRequires: (php-composer(sebastian/recursion-context) >= 6.0 with php-composer(sebastian/recursion-context) < 7) -BuildRequires: php-spl +BuildRequires: (php-composer(%{pk_vendor}/object-reflector) >= 5.0 with php-composer(%{pk_vendor}/object-reflector) < 6) +BuildRequires: (php-composer(sebastian/recursion-context) >= 7.0 with php-composer(sebastian/recursion-context) < 8) # From composer.json"require-dev": { -# "phpunit/phpunit": "^11.0" -BuildRequires: phpunit11 +# "phpunit/phpunit": "^12.0" +BuildRequires: phpunit12 %endif # from composer.json -# "php": ">=8.2", -# "sebastian/object-reflector": "^4.0", -# "sebastian/recursion-context": "^6.0" -Requires: php(language) >= 8.2 -Requires: (php-composer(%{pk_vendor}/object-reflector) >= 4.0 with php-composer(%{pk_vendor}/object-reflector) < 5) -Requires: (php-composer(sebastian/recursion-context) >= 6.0 with php-composer(sebastian/recursion-context) < 7) +# "php": ">=8.3", +# "sebastian/object-reflector": "^5.0", +# "sebastian/recursion-context": "^7.0" +Requires: php(language) >= 8.3 +Requires: (php-composer(%{pk_vendor}/object-reflector) >= 5.0 with php-composer(%{pk_vendor}/object-reflector) < 6) +Requires: (php-composer(sebastian/recursion-context) >= 7.0 with php-composer(sebastian/recursion-context) < 8) # from phpcompatinfo report for version 5.0.0: #nothing # Autoloader @@ -82,8 +81,8 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %{_bindir}/phpab --template fedora --output src/autoload.php src cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/%{ns_vendor}/ObjectReflector4/autoload.php', - '%{php_home}/%{ns_vendor}/RecursionContext6/autoload.php', + '%{php_home}/%{ns_vendor}/ObjectReflector5/autoload.php', + '%{php_home}/%{ns_vendor}/RecursionContext7/autoload.php', ]); EOF @@ -100,10 +99,10 @@ mkdir vendor : Run upstream test suite ret=0 -for cmd in php php82 php83 php84; do +for cmd in php php83 php84; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit11 || ret=1 + %{_bindir}/phpunit12 --bootstrap vendor/autoload.php || ret=1 fi done exit $ret @@ -119,6 +118,14 @@ exit $ret %changelog +* Fri Feb 7 2025 Remi Collet - 7.0.0-1 +- update to 7.0.0 +- raise dependency on PHP 8.3 +- raise dependency on sebastian/object-reflector 5 +- raise dependency on sebastian/recursion-context 7 +- rename to php-sebastian-object-enumerator7 +- move to /usr/share/php/SebastianBergmann/ObjectEnumerator7 + * Tue Feb 4 2025 Remi Collet - 6.0.1-2 - enable test suite -- cgit