diff options
-rw-r--r-- | composer.json | 22 | ||||
-rw-r--r-- | php-react-http.spec | 121 |
2 files changed, 92 insertions, 51 deletions
diff --git a/composer.json b/composer.json index 6924ebf..d92ac82 100644 --- a/composer.json +++ b/composer.json @@ -28,20 +28,22 @@ "require": { "php": ">=5.3.0", "evenement/evenement": "^3.0 || ^2.0 || ^1.0", + "fig/http-message-util": "^1.1", "psr/http-message": "^1.0", - "react/event-loop": "^1.0 || ^0.5", - "react/promise": "^2.3 || ^1.2.1", - "react/promise-stream": "^1.1", - "react/socket": "^1.6", - "react/stream": "^1.1", + "react/event-loop": "^1.2", + "react/promise": "^3 || ^2.3 || ^1.2.1", + "react/promise-stream": "^1.4", + "react/socket": "^1.12", + "react/stream": "^1.2", "ringcentral/psr7": "^1.2" }, "require-dev": { - "clue/block-react": "^1.1", - "clue/http-proxy-react": "^1.3", - "clue/reactphp-ssh-proxy": "^1.0", - "clue/socks-react": "^1.0", - "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35" + "clue/http-proxy-react": "^1.8", + "clue/reactphp-ssh-proxy": "^1.4", + "clue/socks-react": "^1.4", + "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35", + "react/async": "^4 || ^3 || ^2", + "react/promise-timer": "^1.9" }, "autoload": { "psr-4": { "React\\Http\\": "src" } diff --git a/php-react-http.spec b/php-react-http.spec index c136e0e..9fb5e37 100644 --- a/php-react-http.spec +++ b/php-react-http.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-react-http # -# Copyright (c) 2017-2021 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2017-2022 Shawn Iwinski <shawn@iwin.ski> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,47 +12,53 @@ %global github_owner reactphp %global github_name http -%global github_version 1.3.0 -%global github_commit bc537273d11ee769c723a830e63aa33c0c35a530 +%global github_version 1.8.0 +%global github_commit aa7512ee17258c88466de30f9cb44ec5f9df3ff3 %global composer_vendor react %global composer_project http # "php": ">=5.3.0" %global php_min_ver 5.3.0 -# "clue/block-react": "^1.1" -%global clue_block_react_min_ver 1.1 -%global clue_block_react_max_ver 2.0 -# "clue/http-proxy-react": "^1.3", ignored as only used in examples -# "clue/reactphp-ssh-proxy": "^1.0", ignored as only used in examples -# "clue/socks-react": "^1.0", ignored as only used in examples +# "clue/http-proxy-react": "^1.8", ignored as only used in examples +# "clue/reactphp-ssh-proxy": "^1.4", ignored as only used in examples +# "clue/socks-react": "^1.4", ignored as only used in examples # "evenement/evenement": "^3.0 || ^2.0 || ^1.0" %global evenement_min_ver 1.0 %global evenement_max_ver 4.0 -# "react/promise": "^2.3 || ^1.2.1" +# "react/promise": "^3 || ^2.3 || ^1.2.1" %global react_promise_min_ver 1.2.1 -%global react_promise_max_ver 3.0 -# "react/promise-stream": "^1.1" -%global react_promise_stream_min_ver 1.1 +%global react_promise_max_ver 4 +# "react/promise-stream": "^1.4" +%global react_promise_stream_min_ver 1.4 %global react_promise_stream_max_ver 2.0 -# "react/socket": "^1.6" -%global react_socket_min_ver 1.6 +# "react/socket": "^1.12" +%global react_socket_min_ver 1.12 %global react_socket_max_ver 2.0 -# "react/stream": "^1.1" -%global react_stream_min_ver 1.1 +# "react/stream": "^1.2" +%global react_stream_min_ver 1.2 %global react_stream_max_ver 2.0 # "ringcentral/psr7": "^1.2" %global ringcentral_psr7_min_ver 1.2 %global ringcentral_psr7_max_ver 2.0 -# "react/event-loop": "^1.0 || ^0.5", -%global react_event_loop_min_ver 1.0 +# "react/event-loop": "^1.2", +%global react_event_loop_min_ver 1.2 %global react_event_loop_max_ver 2.0 +# "react/async": "^4 || ^3 || ^2", +%global react_async_min_ver 2.0 +%global react_async_max_ver 5 +# "react/promise-timer": "^1.9", +%global react_promise_timer_min_ver 1.9 +%global react_promise_timer_max_ver 2 # "psr/http-message": "^1.0" %global psr_http_message_min_ver 1.0 %global psr_http_message_max_ver 2.0 +# "psr/http-message": "^1.0" +%global fig_http_message_util_min_ver 1.1 +%global fig_http_message_util_max_ver 2 # Build using "--without tests" to disable tests -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests # Range dependencies supported? %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -78,7 +84,7 @@ Source1: %{name}-get-source.sh BuildArch: noarch # Tests -%if %{with_tests} +%if %{with tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} %if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 @@ -90,7 +96,6 @@ BuildRequires: phpunit9 >= 9.3 BuildRequires: php-phpunit-PHPUnit >= 4.8.35 %endif %if %{with_range_dependencies} -BuildRequires: (php-composer(clue/block-react) >= %{clue_block_react_min_ver} with php-composer(clue/block-react) < %{clue_block_react_max_ver}) BuildRequires: (php-composer(evenement/evenement) >= %{evenement_min_ver} with php-composer(evenement/evenement) < %{evenement_max_ver}) BuildRequires: (php-composer(react/event-loop) >= %{react_event_loop_min_ver} with php-composer(react/event-loop) < %{react_event_loop_max_ver}) BuildRequires: (php-composer(react/promise-stream) >= %{react_promise_stream_min_ver} with php-composer(react/promise-stream) < %{react_promise_stream_max_ver}) @@ -99,9 +104,10 @@ BuildRequires: (php-composer(react/socket) >= %{react_socket_min_ver} with php-c BuildRequires: (php-composer(react/stream) >= %{react_stream_min_ver} with php-composer(react/stream) < %{react_stream_max_ver}) BuildRequires: (php-composer(ringcentral/psr7) >= %{ringcentral_psr7_min_ver} with php-composer(ringcentral/psr7) < %{ringcentral_psr7_max_ver}) BuildRequires: (php-composer(psr/http-message) >= %{psr_http_message_min_ver} with php-composer(psr/http-message) < %{psr_http_message_max_ver}) +BuildRequires: (php-composer(fig/http-message-util) >= %{fig_http_message_util_min_ver} with php-composer(fig/http-message-util) < %{fig_http_message_util_max_ver}) +BuildRequires: (php-composer(react/async) >= %{react_async_min_ver} with php-composer(react/async) < %{react_async_max_ver}) +BuildRequires: (php-composer(react/promise-timer) >= %{react_promise_timer_min_ver} with php-composer(react/promise-timer) < %{react_promise_timer_max_ver}) %else -BuildRequires: php-clue-block-react < %{clue_block_react_max_ver} -BuildRequires: php-clue-block-react >= %{clue_block_react_min_ver} BuildRequires: php-evenement < %{evenement_max_ver} BuildRequires: php-evenement >= %{evenement_min_ver} BuildRequires: php-react-event-loop < %{react_event_loop_max_ver} @@ -114,10 +120,16 @@ BuildRequires: php-react-socket < %{react_socket_max_ver} BuildRequires: php-react-socket >= %{react_socket_min_ver} BuildRequires: php-react-stream < %{react_stream_max_ver} BuildRequires: php-react-stream >= %{react_stream_min_ver} +BuildRequires: php-composer(react/async) < %{react_async_max_ver} +BuildRequires: php-composer(react/async) >= %{react_async_min_ver} +BuildRequires: php-composer(react/promise-timer) < %{react_promise_timer_max_ver} +BuildRequires: php-composer(react/promise-timer) >= %{react_promise_timer_min_ver} BuildRequires: php-ringcentral-psr7 < %{ringcentral_psr7_max_ver} BuildRequires: php-ringcentral-psr7 >= %{ringcentral_psr7_min_ver} BuildRequires: php-psr-http-message < %{psr_http_message_max_ver} BuildRequires: php-psr-http-message >= %{psr_http_message_min_ver} +BuildRequires: php-composer(fig/http-message-util) < %{fig_http_message_util_max_ver} +BuildRequires: php-composer(fig/http-message-util) >= %{fig_http_message_util_min_ver} %endif ## phpcompatinfo (computed from version 1.1.0) BuildRequires: php-reflection @@ -127,9 +139,9 @@ BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-sockets BuildRequires: php-spl -## Autoloader -BuildRequires: php-composer(fedora/autoloader) %endif +## Autoloader +BuildRequires: php-fedora-autoloader-devel # composer.json Requires: php(language) >= %{php_min_ver} @@ -142,6 +154,7 @@ Requires: (php-composer(react/socket) >= %{react_socket_min_ver} with php-c Requires: (php-composer(react/stream) >= %{react_stream_min_ver} with php-composer(react/stream) < %{react_stream_max_ver}) Requires: (php-composer(ringcentral/psr7) >= %{ringcentral_psr7_min_ver} with php-composer(ringcentral/psr7) < %{ringcentral_psr7_max_ver}) Requires: (php-composer(psr/http-message) >= %{psr_http_message_min_ver} with php-composer(psr/http-message) < %{psr_http_message_max_ver}) +Requires: (php-composer(fig/http-message-util) >= %{fig_http_message_util_min_ver} with php-composer(fig/http-message-util) < %{fig_http_message_util_max_ver}) %else Requires: php-evenement < %{evenement_max_ver} Requires: php-evenement >= %{evenement_min_ver} @@ -159,6 +172,8 @@ Requires: php-ringcentral-psr7 < %{ringcentral_psr7_max_ver} Requires: php-ringcentral-psr7 >= %{ringcentral_psr7_min_ver} Requires: php-psr-http-message < %{psr_http_message_max_ver} Requires: php-psr-http-message >= %{psr_http_message_min_ver} +Requires: php-composer(fig/http-message-util) < %{fig_http_message_util_max_ver} +Requires: php-composer(fig/http-message-util) >= %{fig_http_message_util_min_ver} %endif # phpcompatinfo (computed from version 1.1.0) Requires: php-date @@ -193,17 +208,13 @@ Autoloader: %{phpdir}/React/Http/autoload.php %build : Create autoloader -cat <<'AUTOLOAD' | tee src/autoload.php -<?php -/** - * Autoloader for %{name} and its' dependencies - * (created by %{name}-%{version}-%{release}). - */ -require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; +phpab --template fedora \ + --output src/autoload.php \ + src -\Fedora\Autoloader\Autoload::addPsr4('React\\Http\\', __DIR__); +cat <<'AUTOLOAD' | tee -a src/autoload.php -\Fedora\Autoloader\Dependencies::required(array( +\Fedora\Autoloader\Dependencies::required([ '%{phpdir}/Evenement/autoload.php', '%{phpdir}/React/EventLoop/autoload.php', '%{phpdir}/React/Promise/autoload.php', @@ -212,7 +223,8 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; '%{phpdir}/React/Stream/autoload.php', '%{phpdir}/RingCentral/Psr7/autoload.php', '%{phpdir}/Psr/Http/Message/autoload.php', -)); + '%{phpdir}/Fig/Http/Message/autoload.php', +]); AUTOLOAD @@ -222,7 +234,7 @@ cp -rp src %{buildroot}%{phpdir}/React/Http %check -%if %{with_tests} +%if %{with tests} : Create tests bootstrap mkdir vendor cat <<'BOOTSTRAP' | tee vendor/autoload.php @@ -231,9 +243,10 @@ require '%{buildroot}%{phpdir}/React/Http/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('React\\Tests\\Http\\', dirname(__DIR__).'/tests'); -\Fedora\Autoloader\Dependencies::required(array( - '%{phpdir}/Clue/React/Block/autoload.php', -)); +\Fedora\Autoloader\Dependencies::required([ + '%{phpdir}/React/Async/autoload.php', + '%{phpdir}/React/Promise/Timer/autoload.php', +]); BOOTSTRAP : Skip test requiring network access and/or fail in restrictive buildroot env -- i.e. Bodhi @@ -242,7 +255,7 @@ FILTER="testSuccessfulResponseEmitsEnd|testPostDataReturnsData|testPostJsonRetur : Upstream tests RETURN_CODE=0 -for CMDARG in "php %{phpunit}" "php72 %{_bindir}/phpunit" php73 php74 php80; do +for CMDARG in "php %{phpunit}" php74 php80 php81 php82; do if which $CMDARG; then set $CMDARG $1 ${2:-%{_bindir}/phpunit9} \ @@ -266,6 +279,32 @@ exit $RETURN_CODE %changelog +* Fri Sep 30 2022 Remi Collet <remi@remirepo.net> - 1.8.0-1 +- update to 1.8.0 +- raise dependency on react/stream 1.4 +- raise dependency on react/socket 1.12 + +* Fri Sep 23 2022 Remi Collet <remi@remirepo.net> - 1.7.0-1 +- update to 1.7.0 +- drop build dependency on clue/block-react +- add build dependency on react/async and react/promise-timer +- switch to classmap autoloader + +* Thu Feb 3 2022 Remi Collet <remi@remirepo.net> - 1.6.0-1 +- update to 1.6.0 +- raise dependency on clue/block-react 1.5 +- add dependency on fig/http-message-util + +* Thu Aug 5 2021 Remi Collet <remi@remirepo.net> - 1.5.0-1 +- update to 1.5.0 +- raise dependency on react/socket 1.9 + +* Mon Jul 12 2021 Remi Collet <remi@remirepo.net> - 1.4.0-1 +- update to 1.4.0 +- raise dependency on react/event-loop 1.2 +- raise dependency on react/socket 1.8 +- raise dependency on react/stream 1.2 + * Tue Apr 13 2021 Remi Collet <remi@remirepo.net> - 1.3.0-1 - update to 1.3.0 |