diff options
| -rw-r--r-- | composer.json | 22 | ||||
| -rw-r--r-- | php-nyholm-psr7.spec | 136 |
2 files changed, 104 insertions, 54 deletions
diff --git a/composer.json b/composer.json index 569cf14..c607615 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "A fast PHP7 implementation of PSR-7", "license": "MIT", "keywords": ["psr-7", "psr-17"], - "homepage": "http://tnyholm.se", + "homepage": "https://tnyholm.se", "authors": [ { "name": "Tobias Nyholm", @@ -15,17 +15,19 @@ } ], "require": { - "php": "^7.1", - "psr/http-message": "^1.0", - "php-http/message-factory": "^1.0", + "php": ">=7.2", + "psr/http-message": "^1.1 || ^2.0", "psr/http-factory": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^7.5", - "php-http/psr7-integration-tests": "dev-master", - "http-interop/http-factory-tests": "dev-master" + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", + "php-http/message-factory": "^1.0", + "php-http/psr7-integration-tests": "^1.0", + "http-interop/http-factory-tests": "^0.9", + "symfony/error-handler": "^4.4" }, "provide": { + "php-http/message-factory-implementation": "1.0", "psr/http-message-implementation": "1.0", "psr/http-factory-implementation": "1.0" }, @@ -39,13 +41,9 @@ "Tests\\Nyholm\\Psr7\\": "tests/" } }, - "scripts": { - "test": "vendor/bin/phpunit", - "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml" - }, "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.8-dev" } } } diff --git a/php-nyholm-psr7.spec b/php-nyholm-psr7.spec index 2bb063e..f82ec1c 100644 --- a/php-nyholm-psr7.spec +++ b/php-nyholm-psr7.spec @@ -1,14 +1,14 @@ # remirepo/fedora spec file for php-nyholm-psr7 # -# Copyright (c) 2019 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2019-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 # github -%global gh_commit 27c828a165ff936f9fe9056baa9cabe0c70a423c +%global gh_commit 3cb4d163b58589e47b35103e8e5e6a6a475b47be %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner Nyholm %global gh_project psr7 @@ -20,21 +20,18 @@ %global php_home %{_datadir}/php %global ns_vendor Nyholm %global ns_project Psr7 -%if %{bootstrap} -%global with_tests 0%{?_with_tests:1} -%else -%global with_tests 0%{!?_without_tests:1} -%endif -# php-http/psr7-integration-tests -%global psr7_integration_tests_commit c3bb79ca4a276df57364ff45bf2f619f769ded4a +%bcond_without tests + +# php-http/psr7-integration-tests 1.1.0 +%global psr7_integration_tests_commit b63c2f50c114a474086c6801aea58c0aa96f9b27 %global psr7_integration_tests_short %(c=%{psr7_integration_tests_commit}; echo ${c:0:7}) -# http-interop/http-factory-tests -%global http_factory_tests_commit 92d8b91e7236957d7512ef93e8a237d241671ce7 +# http-interop/http-factory-tests 0.9.0 +%global http_factory_tests_commit 642056c5360e8a74779cbf133afbc8aa2c174e15 %global http_factory_tests_short %(c=%{http_factory_tests_commit}; echo ${c:0:7}) Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 1.2.0 +Version: 1.8.0 Release: 1%{?dist} Summary: A fast PHP7 implementation of PSR-7 @@ -48,46 +45,48 @@ Source2: https://github.com/php-http/psr7-integration-tests/archive/%{psr Source3: https://github.com/http-interop/http-factory-tests/archive/%{http_factory_tests_commit}/%{name}-factory-tests-%{http_factory_tests_short}.tar.gz BuildArch: noarch -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 7.2 BuildRequires: php-pcre BuildRequires: php-spl +%if %{with tests} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 2) +BuildRequires: (php-composer(psr/http-message) >= 1.1 with php-composer(psr/http-message) < 3) BuildRequires: (php-composer(php-http/message-factory) >= 1.0 with php-composer(php-http/message-factory) < 2) BuildRequires: (php-composer(psr/http-factory) >= 1.0 with php-composer(psr/http-factory) < 2) -# remirepo:5 +BuildRequires: (php-composer(symfony/error-handler) >= 4.4 with php-composer(symfony/error-handler) < 5) +# remirepo:6 %else -BuildRequires: php-psr-http-message +BuildRequires: php-psr-http-message >= 1.1 BuildRequires: php-http-message-factory BuildRequires: php-psr-http-factory +BuildRequires: php-symfony4-error-handler >= 4.4 %endif -# Autoloader -BuildRequires: php-fedora-autoloader-devel >= 1.0.0 -%if %{with_tests} # from composer.json, "require-dev": { -# "phpunit/phpunit": "^7.5", -# "php-http/psr7-integration-tests": "dev-master", -# "http-interop/http-factory-tests": "dev-master" -BuildRequires: phpunit7 > 7.5 +# "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", +# "php-http/message-factory": "^1.0", +# "php-http/psr7-integration-tests": "^1.0", +# "http-interop/http-factory-tests": "^0.9", +# "symfony/error-handler": "^4.4" +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 >= 9.4 %endif +# Autoloader +BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # from composer.json, "require": { -# "php": "^7.1", -# "psr/http-message": "^1.0", -# "php-http/message-factory": "^1.0", +# "php": ">=7.2", +# "psr/http-message": "^1.1 || || ^2.0", # "psr/http-factory": "^1.0" -Requires: php(language) >= 7.1 +Requires: php(language) >= 7.2 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 2) -Requires: (php-composer(php-http/message-factory) >= 1.0 with php-composer(php-http/message-factory) < 2) +Requires: (php-composer(psr/http-message) >= 1.1 with php-composer(psr/http-message) < 3) Requires: (php-composer(psr/http-factory) >= 1.0 with php-composer(psr/http-factory) < 2) -# remirepo:5 +# remirepo:4 %else -Requires: php-psr-http-message -Requires: php-http-message-factory -Requires: php-psr-http-factory/usr/share/php/Psr/Http/Message/http-factory-autoload.php +Requires: php-psr-http-message >= 1.1 +Requires: php-psr-http-factory %endif # from phpcompatinfo report for version 1.1.0 Requires: php-pcre @@ -112,13 +111,15 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %build # Generate the Autoloader -phpab --template fedora --output src/autoload.php src +phpab --tolerant --template fedora --output src/autoload.php src cat << 'EOF' | tee -a src/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/Http/Message/autoload.php', - '%{_datadir}/php/Psr/Http/Message/http-factory-autoload.php', ]); EOF @@ -134,22 +135,30 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} %check -%if %{with_tests} +%if %{with tests} mkdir vendor cat <<EOF | tee vendor/autoload.php <?php require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php'; +require_once '%{php_home}/Symfony4/Component/ErrorHandler/autoload.php'; +require_once '%{_datadir}/php/Psr/Http/Message/http-factory-autoload.php'; require_once dirname(__DIR__) . '/test-autoload.php'; EOF +: Fix path +sed -e 's:./vendor/http-interop/http-factory-tests:http-factory-tests-%{http_factory_tests_commit}:' \ + phpunit.xml.dist >phpunit.xml + : Run upstream test suite : Ignore online tests # TODO testCanDetachStream may fail on local build (extension conflicts ?) +# testIsNotSeekable|testIsNotWritable|testIsNotReadable|testRewindNotSeekable fail only in mock ret=0 -for cmd in php php71 php72 php73 php74; do - if which $cmd; then - $cmd %{_bindir}/phpunit7 \ - --filter '^((?!(testIsNotSeekable|testIsNotWritable|testIsNotReadable|testRewindNotSeekable)).)*$' \ +for cmdarg in "php %{phpunit}" php80 php81 php82; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit9} \ + --filter '^((?!(testIsNotSeekable|testIsNotWritable|testIsNotReadable|testRewindNotSeekable|testCanDetachStream)).)*$' \ --verbose || ret=1 fi done @@ -169,6 +178,49 @@ exit $ret %changelog +* Wed May 3 2023 Remi Collet <remi@remirepo.net> - 1.8.0-1 +- update to 1.8.0 +- drop dependency on php-http/message-factory + +* Thu Apr 20 2023 Remi Collet <remi@remirepo.net> - 1.7.0-1 +- update to 1.7.0 +- raise dependency on psr/http-message 1.1 and allow 2.0 +- raise dependency on PHP 7.2 + +* Wed Apr 19 2023 Remi Collet <remi@remirepo.net> - 1.6.1-1 +- update to 1.6.1 + +* Tue Apr 11 2023 Remi Collet <remi@remirepo.net> - 1.6.0-1 +- update to 1.6.0 + +* Wed Jun 22 2022 Remi Collet <remi@remirepo.net> - 1.5.1-1 +- update to 1.5.1 + +* Thu Feb 3 2022 Remi Collet <remi@remirepo.net> - 1.5.0-1 +- update to 1.5.0 + +* Mon Jul 5 2021 Remi Collet <remi@remirepo.net> - 1.4.1-1 +- update to 1.4.1 + +* Mon Mar 22 2021 Remi Collet <remi@remirepo.net> - 1.4.0-2 +- fir for EL-7 + +* Wed Feb 24 2021 Remi Collet <remi@remirepo.net> - 1.4.0-1 +- update to 1.4.0 + +* Fri Jan 29 2021 Remi Collet <remi@remirepo.net> - 1.3.2-2 +- fix test path and FTBFS + +* Mon Nov 16 2020 Remi Collet <remi@remirepo.net> - 1.3.2-1 +- update to 1.3.2 +- switch to phpunit9 + +* Mon May 25 2020 Remi Collet <remi@remirepo.net> - 1.3.0-1 +- update to 1.3.0 + +* Fri Sep 6 2019 Remi Collet <remi@remirepo.net> - 1.2.1-1 +- update to 1.2.1 (no change) + * Fri Aug 23 2019 Remi Collet <remi@remirepo.net> - 1.2.0-1 - update to 1.2.0 |