diff options
| author | Remi Collet <remi@remirepo.net> | 2023-04-11 11:09:21 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2023-04-11 11:09:21 +0200 |
| commit | 633c348894b2500b7793f54cbc5e4138f84e1103 (patch) | |
| tree | bbf08e1c8b4169e1f5eb15fe9da9521475395946 | |
| parent | 6d25a387b858dfb3bce8b2e16298ce732635871c (diff) | |
allow psr/http-message 2.0
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | php-psr-http-server-middleware.spec | 27 |
2 files changed, 19 insertions, 12 deletions
diff --git a/composer.json b/composer.json index 1595513..1511671 100644 --- a/composer.json +++ b/composer.json @@ -15,12 +15,12 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "require": { "php": ">=7.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.0 || ^2.0", "psr/http-server-handler": "^1.0" }, "autoload": { diff --git a/php-psr-http-server-middleware.spec b/php-psr-http-server-middleware.spec index a845a94..3503cc6 100644 --- a/php-psr-http-server-middleware.spec +++ b/php-psr-http-server-middleware.spec @@ -1,14 +1,14 @@ # remirepo/fedora spec file for php-psr-http-server-middleware # -# Copyright (c) 2020 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2020-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Github -%global gh_commit 2296f45510945530b9dceb8bcedb5cb84d40c5f5 +%global gh_commit c1481f747daaa6a0782775cd6a8c26a1bf4a3829 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner php-fig %global gh_project http-server-middleware @@ -21,7 +21,7 @@ %global ns_sub Server Name: php-%{pk_vendor}-%{pk_project} -Version: 1.0.1 +Version: 1.0.2 Release: 1%{?dist} Summary: Common interface for HTTP server-side middleware @@ -35,11 +35,11 @@ BuildRequires: php(language) >= 7.0 BuildRequires: php-cli # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(%{pk_vendor}/http-message) >= 1.0 with php-composer(%{pk_vendor}/http-message) < 2) +BuildRequires: (php-composer(%{pk_vendor}/http-message) >= 1.0 with php-composer(%{pk_vendor}/http-message) < 3) BuildRequires: (php-composer(%{pk_vendor}/http-server-handler) >= 1.0 with php-composer(%{pk_vendor}/http-server-handler) < 2) # remirepo:6 %else -BuildRequires: php-composer(%{pk_vendor}/http-message) < 2 +BuildRequires: php-composer(%{pk_vendor}/http-message) < 3 BuildRequires: php-composer(%{pk_vendor}/http-message) >= 1.0 BuildRequires: php-composer(%{pk_vendor}/http-server-handler) < 2 BuildRequires: php-composer(%{pk_vendor}/http-server-handler) >= 1.0 @@ -50,15 +50,15 @@ BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { # "php": ">=7.0", # "psr/http-message": "^1.0", -# "psr/http-server-handler": "^1.0" +# "psr/http-server-handler": "^1.0 || ^2.0" Requires: php(language) >= 7.0 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(%{pk_vendor}/http-message) >= 1.0 with php-composer(%{pk_vendor}/http-message) < 2) +Requires: (php-composer(%{pk_vendor}/http-message) >= 1.0 with php-composer(%{pk_vendor}/http-message) < 3) Requires: (php-composer(%{pk_vendor}/http-server-handler) >= 1.0 with php-composer(%{pk_vendor}/http-server-handler) < 2) # remirepo:6 %else -Requires: php-composer(%{pk_vendor}/http-message) < 2 +Requires: php-composer(%{pk_vendor}/http-message) < 3 Requires: php-composer(%{pk_vendor}/http-message) >= 1.0 Requires: php-composer(%{pk_vendor}/http-server-handler) < 2 Requires: php-composer(%{pk_vendor}/http-server-handler) >= 1.0 @@ -95,7 +95,10 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/%{ns_sub}/middleware-auto %{_bindir}/phpab --template fedora --output src/middleware-autoload.php src cat << 'EOF' | tee -a src/middleware-autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{_datadir}/php/Psr/Http/Message/autoload.php', + [ + '%{_datadir}/php/Psr/Http/Message2/autoload.php', + '%{_datadir}/php/Psr/Http/Message/autoload.php', + ], '%{_datadir}/php/Psr/Http/Server/autoload.php', ]); EOF @@ -124,5 +127,9 @@ exit (interface_exists("%{ns_vendor}\\%{ns_project}\\%{ns_sub}\\MiddlewareInterf %changelog +* Tue Apr 11 2023 Remi Collet <remi@remirepo.net> - 1.0.2-1 +- update to 1.0.2 +- allow psr/http-message 2.0 + * Thu Jan 2 2020 Remi Collet <remi@remirepo.net> - 1.0.1-1 - Initial package, version 1.0.1 |