Skip to content

Commit c164078

Browse files
timacdonaldnunomadurotaylorotwell
authored
[10.x] Siesta (#46904)
* wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update src/Illuminate/Support/Siesta.php Co-authored-by: Nuno Maduro <[email protected]> * Update src/Illuminate/Support/Siesta.php Co-authored-by: Nuno Maduro <[email protected]> * Update src/Illuminate/Support/Siesta.php Co-authored-by: Nuno Maduro <[email protected]> * wip * wip * wip * wip * wip * wip * wip * wip * formatting and rename to sleep --------- Co-authored-by: Nuno Maduro <[email protected]> Co-authored-by: Taylor Otwell <[email protected]>
1 parent 6e8b883 commit c164078

File tree

8 files changed

+789
-5
lines changed

8 files changed

+789
-5
lines changed

src/Illuminate/Cache/Lock.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Illuminate\Contracts\Cache\Lock as LockContract;
66
use Illuminate\Contracts\Cache\LockTimeoutException;
77
use Illuminate\Support\InteractsWithTime;
8+
use Illuminate\Support\Sleep;
89
use Illuminate\Support\Str;
910

1011
abstract class Lock implements LockContract
@@ -114,7 +115,7 @@ public function block($seconds, $callback = null)
114115
$starting = $this->currentTime();
115116

116117
while (! $this->acquire()) {
117-
usleep($this->sleepMilliseconds * 1000);
118+
Sleep::usleep($this->sleepMilliseconds * 1000);
118119

119120
if ($this->currentTime() - $seconds >= $starting) {
120121
throw new LockTimeoutException;

src/Illuminate/Foundation/Testing/TestCase.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Illuminate\Support\Carbon;
1111
use Illuminate\Support\Facades\Facade;
1212
use Illuminate\Support\Facades\ParallelTesting;
13+
use Illuminate\Support\Sleep;
1314
use Illuminate\Support\Str;
1415
use Illuminate\View\Component;
1516
use Mockery;
@@ -245,6 +246,7 @@ protected function tearDown(): void
245246
Component::forgetFactory();
246247
Queue::createPayloadUsing(null);
247248
HandleExceptions::forgetApp();
249+
Sleep::fake(false);
248250

249251
if ($this->callbackException) {
250252
throw $this->callbackException;

src/Illuminate/Redis/Limiters/ConcurrencyLimiter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Illuminate\Redis\Limiters;
44

55
use Illuminate\Contracts\Redis\LimiterTimeoutException;
6+
use Illuminate\Support\Sleep;
67
use Illuminate\Support\Str;
78
use Throwable;
89

@@ -75,7 +76,7 @@ public function block($timeout, $callback = null, $sleep = 250)
7576
throw new LimiterTimeoutException;
7677
}
7778

78-
usleep($sleep * 1000);
79+
Sleep::usleep($sleep * 1000);
7980
}
8081

8182
if (is_callable($callback)) {

src/Illuminate/Redis/Limiters/DurationLimiter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Illuminate\Redis\Limiters;
44

55
use Illuminate\Contracts\Redis\LimiterTimeoutException;
6+
use Illuminate\Support\Sleep;
67

78
class DurationLimiter
89
{
@@ -84,7 +85,7 @@ public function block($timeout, $callback = null, $sleep = 750)
8485
throw new LimiterTimeoutException;
8586
}
8687

87-
usleep($sleep * 1000);
88+
Sleep::usleep($sleep * 1000);
8889
}
8990

9091
if (is_callable($callback)) {

0 commit comments

Comments
 (0)