diff options
| -rw-r--r-- | composer.json | 20 | ||||
| -rw-r--r-- | php-sabre-http7.spec | 74 |
2 files changed, 54 insertions, 40 deletions
diff --git a/composer.json b/composer.json index 48caa44..98edcd7 100644 --- a/composer.json +++ b/composer.json @@ -5,17 +5,20 @@ "homepage" : "https://github.com/fruux/sabre-http", "license" : "BSD-3-Clause", "require" : { - "php" : "^7.1 || ^8.0", + "php" : "^7.4 || ^8.0", "ext-mbstring" : "*", "ext-ctype" : "*", "ext-curl" : "*", - "sabre/event" : ">=4.0 <6.0", - "sabre/uri" : "^2.0" + "sabre/event" : "^6.0", + "sabre/uri" : "^2.3 || ^3.0" }, "require-dev" : { - "friendsofphp/php-cs-fixer": "~2.17.1||^3.63", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6" + "friendsofphp/php-cs-fixer": "^3.64", + "phpstan/phpstan": "^1.11", + "phpstan/phpstan-phpunit": "^1.4", + "phpstan/phpstan-strict-rules": "^1.6", + "phpstan/extension-installer": "^1.3", + "phpunit/phpunit" : "^9.6" }, "suggest" : { "ext-curl" : " to make http requests with the Client class" @@ -60,5 +63,10 @@ "composer cs-fixer", "composer phpunit" ] + }, + "config": { + "allow-plugins": { + "phpstan/extension-installer": true + } } } diff --git a/php-sabre-http7.spec b/php-sabre-http7.spec index 293d405..ad1355f 100644 --- a/php-sabre-http7.spec +++ b/php-sabre-http7.spec @@ -1,8 +1,8 @@ -# remirepo/fedora spec file for php-sabre-http5 +# remirepo/fedora spec file for php-sabre-http7 # -# Copyright (c) 2013-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit dedff73f3995578bc942fa4c8484190cac14f139 +%global gh_commit 5666164e1656808ac5f6ce8502e5aef0841bafab %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project http @@ -20,59 +20,54 @@ # Namespace %global ns_vendor Sabre %global ns_project HTTP -%global major 5 +%global major 7 Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Library for dealing with http requests and responses -Version: 5.1.12 +Version: 7.0.4 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} License: BSD-3-Clause -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh BuildArch: noarch %if %{with tests} -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 7.4 BuildRequires: php-mbstring BuildRequires: php-ctype -BuildRequires: (php-composer(sabre/event) >= 4.0 with php-composer(sabre/event) < 6) -BuildRequires: (php-composer(sabre/uri) >= 2.0 with php-composer(sabre/uri) < 3) +BuildRequires: php-curl +BuildRequires: (php-composer(sabre/event) >= 6.0 with php-composer(sabre/event) < 7) +BuildRequires: (php-composer(sabre/uri) >= 2.3 with php-composer(sabre/uri) < 4) # From composer.json, "require-dev" : { -# "friendsofphp/php-cs-fixer": "~2.17.1||^3.63", -# "phpstan/phpstan": "^0.12", -# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6" +# "friendsofphp/php-cs-fixer": "^3.64", +# "phpstan/phpstan": "^1.11", +# "phpstan/phpstan-phpunit": "^1.4", +# "phpstan/phpstan-strict-rules": "^1.6", +# "phpstan/extension-installer": "^1.3", +# "phpunit/phpunit" : "^9.6" BuildRequires: phpunit9 >= 9.6 %global phpunit %{_bindir}/phpunit9 -BuildRequires: php-curl -BuildRequires: php-date -BuildRequires: php-hash -BuildRequires: php-pcre -BuildRequires: php-spl -BuildRequires: php-xml %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" : { -# "php" : "^7.1 || ^8.0", +# "php" : "^7.4 || ^8.0", # "ext-mbstring" : "*", # "ext-ctype" : "*", # "ext-curl" : "*", -# "sabre/event" : ">=4.0 <6.0", -# "sabre/uri" : "~2.0" -Requires: php(language) >= 7.1 +# "sabre/event" : "^6.0", +# "sabre/uri" : "^2.3 || ^3.0" +Requires: php(language) >= 7.4 Requires: php-mbstring Requires: php-ctype Requires: php-curl -Requires: (php-composer(sabre/event) >= 4.0 with php-composer(sabre/event) < 6) -Requires: (php-composer(sabre/uri) >= 2.0 with php-composer(sabre/uri) < 3) -# From phpcompatinfo report for version 5.0.0 -Requires: php-date -Requires: php-hash -Requires: php-pcre -Requires: php-spl -Requires: php-xml +Requires: (php-composer(sabre/event) >= 6.0 with php-composer(sabre/event) < 7) +Requires: (php-composer(sabre/uri) >= 2.3 with php-composer(sabre/uri) < 4) +# From phpcompatinfo report for version 7.0.4 +# Only date, hash, pcre, spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -116,8 +111,11 @@ cat << 'EOF' | tee -a lib/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ - '%{_datadir}/php/Sabre/Event5/autoload.php', - '%{_datadir}/php/Sabre/Uri2/autoload.php', + '%{_datadir}/php/Sabre/Event6/autoload.php', + [ + '%{_datadir}/php/Sabre/Uri3/autoload.php', + '%{_datadir}/php/Sabre/Uri2/autoload.php', + ], ]); // Functions @@ -181,6 +179,14 @@ exit $ret %changelog +* Thu Feb 13 2025 Remi Collet <remi@remirepo.net> - 7.0.4-1 +- update to 7.0.4 +- raise dependency on PHP 7.4 +- rename to php-sabre-http7 +- install in /usr/share/php/Sabre/HTTP7 +- raise dependency on sabre/event 6 +- raise dependency on sabre/uri 2.3 or 3.0 + * Wed Aug 28 2024 Remi Collet <remi@remirepo.net> - 5.1.12-1 - update to 5.1.12 (no change, CS only) |