summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-01-14 15:57:42 +0100
committerRemi Collet <remi@php.net>2022-01-14 15:57:42 +0100
commitbc16693d6db5150ed3e66e730ab3f3eecbf26630 (patch)
tree43771a5f70cf1207170b0d06530abefdcd0f99a9
parent82db286f681e5d2076c8c1081d16904088342e2c (diff)
update to 1.11.0HEADmaster
raise dependency on react/promise-timer 1.8 raise dependency on clue/block-react 1.5
-rw-r--r--composer.json4
-rw-r--r--php-react-socket.spec26
2 files changed, 15 insertions, 15 deletions
diff --git a/composer.json b/composer.json
index 9ff445f..ec50942 100644
--- a/composer.json
+++ b/composer.json
@@ -31,11 +31,11 @@
"react/dns": "^1.8",
"react/event-loop": "^1.2",
"react/promise": "^2.6.0 || ^1.2.1",
- "react/promise-timer": "^1.4.0",
+ "react/promise-timer": "^1.8",
"react/stream": "^1.2"
},
"require-dev": {
- "clue/block-react": "^1.2",
+ "clue/block-react": "^1.5",
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
"react/promise-stream": "^1.2"
},
diff --git a/php-react-socket.spec b/php-react-socket.spec
index dbf5567..e965408 100644
--- a/php-react-socket.spec
+++ b/php-react-socket.spec
@@ -12,16 +12,16 @@
%global github_owner reactphp
%global github_name socket
-%global github_version 1.10.0
-%global github_commit d132fde589ea97f4165f2d94b5296499eac125ec
+%global github_version 1.11.0
+%global github_commit f474156aaab4f09041144fa8b57c7d70aed32a1c
%global composer_vendor react
%global composer_project socket
# "php": ">=5.3.0"
%global php_min_ver 5.3.0
-# "clue/block-react": "^1.2"
-%global clue_block_react_min_ver 1.2
+# "clue/block-react": "^1.5"
+%global clue_block_react_min_ver 1.5
%global clue_block_react_max_ver 2.0
# "evenement/evenement": "^3.0 || ^2.0 || ^1.0"
%global evenement_min_ver 1.0
@@ -38,8 +38,8 @@
# "react/promise-stream": "^1.2"
%global react_promise_stream_min_ver 1.2
%global react_promise_stream_max_ver 2.0
-# "react/promise-timer": "^1.4.0"
-%global react_promise_timer_min_ver 1.4.0
+# "react/promise-timer": "^1.8"
+%global react_promise_timer_min_ver 1.8
%global react_promise_timer_max_ver 2.0
# "react/stream": "^1.2"
%global react_stream_min_ver 1.2
@@ -214,13 +214,9 @@ BOOTSTRAP
: Skip test requiring network access
rm -f tests/IntegrationTest.php
-: Skip "Class "React\Dns\Resolver\Resolver" is declared "final" and cannot be mocked" warnings
-: Why is PHPUnit 6 failing the test run for this even if convertWarningsToExceptions="false"?
-rm -f tests/DnsConnectorTest.php
-FILTER="testConnectorUsesGivenResolverInstance|testConnectorUsesResolvedHostnameIfDnsIsUsed"
%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9
# https://github.com/reactphp/socket/issues/275 - OpenSSL 3.0
-FILTER="$FILTER|testClientUsesTls10WhenCryptoMethodIsExplicitlyConfiguredByClient"
+FILTER="--filter '^((?!(testClientUsesTls10WhenCryptoMethodIsExplicitlyConfiguredByClient)).)*$'"
%endif
: Upstream tests
@@ -228,9 +224,8 @@ RETURN_CODE=0
PHPUNIT=$(which %{phpunit_exec})
for PHP_EXEC in "" php74 php80 php81; do
if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
- $PHP_EXEC $PHPUNIT \
+ $PHP_EXEC $PHPUNIT $FILTER \
--bootstrap bootstrap.php \
- --filter "^((?!($FILTER)).)*\$" \
--exclude-group internet \
--verbose || RETURN_CODE=1
fi
@@ -250,6 +245,11 @@ exit $RETURN_CODE
%changelog
+* Fri Jan 14 2022 Remi Collet <remi@remirepo.net> - 1.11.0-1
+- update to 1.11.0
+- raise dependency on react/promise-timer 1.8
+- raise dependency on clue/block-react 1.5
+
* Mon Nov 29 2021 Remi Collet <remi@remirepo.net> - 1.10.0-1
- update to 1.10.0