Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 4a38f4a08539 · 2019-09-24T17:57:39.000+02:00
* 4.3:
  [Security/Http] fix typo in deprecation message
  Various tweaks 3.4
  Various tweaks 4.3
  [PhpUnit] Fix usleep mock return value
  [Lock] use Predis\ClientInterface instead of Predis\Client
  Fix version typo in deprecation notice
  Make legacy "wrong" RFC2047 encoding apply only to one header
diff --git a/ClockMock.php b/ClockMock.php
@@ -53,12 +53,10 @@ public static function sleep($s)
     public static function usleep($us)
     {
         if (null === self::$now) {
-            return \usleep($us);
+            \usleep($us);
+        } else {
+            self::$now += $us / 1000000;
         }
-
-        self::$now += $us / 1000000;
-
-        return null;
     }
 
     public static function microtime($asFloat = false)
@@ -127,7 +125,7 @@ function sleep(\$s)
 
 function usleep(\$us)
 {
-    return \\$self::usleep(\$us);
+    \\$self::usleep(\$us);
 }
 
 function date(\$format, \$timestamp = null)

Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,10 @@ public static function sleep($s)`
`53`	`53`	`public static function usleep($us)`
`54`	`54`	`{`
`55`	`55`	`if (null === self::$now) {`
`56`		`- return \usleep($us);`
	`56`	`+ \usleep($us);`
	`57`	`+ } else {`
	`58`	`+ self::$now += $us / 1000000;`
`57`	`59`	`}`
`58`		`-`
`59`		`- self::$now += $us / 1000000;`
`60`		`-`
`61`		`- return null;`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`public static function microtime($asFloat = false)`
`@@ -127,7 +125,7 @@ function sleep(\$s)`
`127`	`125`
`128`	`126`	`function usleep(\$us)`
`129`	`127`	`{`
`130`		`- return \\$self::usleep(\$us);`
	`128`	`+ \\$self::usleep(\$us);`
`131`	`129`	`}`
`132`	`130`
`133`	`131`	`function date(\$format, \$timestamp = null)`