Skip to content

Commit a7cd3b9

Browse files
Merge branch '4.4'
* 4.4: [Security/Http] fix typo in deprecation message [Security] Deprecate isGranted()/decide() on more than one attribute Fixed a minor typo in the UPGRADE to 5.0 guide Various tweaks 3.4 Various tweaks 4.3 [Security] Make stateful firewalls turn responses private only when needed [PhpUnit] Fix usleep mock return value Revert \"feature #33507 [WebProfiler] Deprecated intercept_redirects in 4.4 (dorumd)\" [TwigBundle] typo [TwigBundle] fix test case [Lock] use Predis\ClientInterface instead of Predis\Client Allow Twig 3 Minor tweaks Fix version typo in deprecation notice [Form][SubmitType] Add "validate" option hint to the --parse-tags when parsing tags fails Make legacy "wrong" RFC2047 encoding apply only to one header
2 parents 13187ba + 4a38f4a commit a7cd3b9

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

ClockMock.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,10 @@ public static function sleep($s)
5353
public static function usleep($us)
5454
{
5555
if (null === self::$now) {
56-
return \usleep($us);
56+
\usleep($us);
57+
} else {
58+
self::$now += $us / 1000000;
5759
}
58-
59-
self::$now += $us / 1000000;
60-
61-
return null;
6260
}
6361

6462
public static function microtime($asFloat = false)
@@ -127,7 +125,7 @@ function sleep(\$s)
127125
128126
function usleep(\$us)
129127
{
130-
return \\$self::usleep(\$us);
128+
\\$self::usleep(\$us);
131129
}
132130
133131
function date(\$format, \$timestamp = null)

0 commit comments

Comments
 (0)