Merge branch '5.1' into 5.2

nicolas-grekas · nicolas-grekas · commit a77cbec69ea9 · 2020-12-14T11:56:50.000+01:00
* 5.1:
  Fix EncoderInterface::encode() return type
  [Lock] Prevent store exception break combined store
  Remove check for unsupported PHP version
  [Notifier] Rename test method names
diff --git a/Response/CurlResponse.php b/Response/CurlResponse.php
@@ -328,7 +328,7 @@ private static function perform(ClientState $multi, array &$responses = null): v
      */
     private static function select(ClientState $multi, float $timeout): int
     {
-        if (\PHP_VERSION_ID < 70123 || (70200 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70211)) {
+        if (\PHP_VERSION_ID < 70211) {
             // workaround https://bugs.php.net/76480
             $timeout = min($timeout, 0.01);
         }

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ private static function perform(ClientState $multi, array &$responses = null): v`
`328`	`328`	`*/`
`329`	`329`	`private static function select(ClientState $multi, float $timeout): int`
`330`	`330`	`{`
`331`		`- if (\PHP_VERSION_ID < 70123 \|\| (70200 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70211)) {`
	`331`	`+ if (\PHP_VERSION_ID < 70211) {`
`332`	`332`	`// workaround https://bugs.php.net/76480`
`333`	`333`	`$timeout = min($timeout, 0.01);`
`334`	`334`	`}`