[10.x] Siesta (laravel#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]>
bert-w · May 3, 2023 · c164078 · c164078
1 parent 6e8b883
commit c164078
Show file tree

Hide file tree

Showing 8 changed files with 789 additions and 5 deletions.
diff --git a/src/Illuminate/Cache/Lock.php b/src/Illuminate/Cache/Lock.php
@@ -5,6 +5,7 @@
 use Illuminate\Contracts\Cache\Lock as LockContract;
 use Illuminate\Contracts\Cache\LockTimeoutException;
 use Illuminate\Support\InteractsWithTime;
+use Illuminate\Support\Sleep;
 use Illuminate\Support\Str;
 
 abstract class Lock implements LockContract
@@ -114,7 +115,7 @@ public function block($seconds, $callback = null)
         $starting = $this->currentTime();
 
         while (! $this->acquire()) {
-            usleep($this->sleepMilliseconds * 1000);
+            Sleep::usleep($this->sleepMilliseconds * 1000);
 
             if ($this->currentTime() - $seconds >= $starting) {
                 throw new LockTimeoutException;

diff --git a/src/Illuminate/Foundation/Testing/TestCase.php b/src/Illuminate/Foundation/Testing/TestCase.php
@@ -10,6 +10,7 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Facade;
 use Illuminate\Support\Facades\ParallelTesting;
+use Illuminate\Support\Sleep;
 use Illuminate\Support\Str;
 use Illuminate\View\Component;
 use Mockery;
@@ -245,6 +246,7 @@ protected function tearDown(): void
         Component::forgetFactory();
         Queue::createPayloadUsing(null);
         HandleExceptions::forgetApp();
+        Sleep::fake(false);
 
         if ($this->callbackException) {
             throw $this->callbackException;

diff --git a/src/Illuminate/Redis/Limiters/ConcurrencyLimiter.php b/src/Illuminate/Redis/Limiters/ConcurrencyLimiter.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Redis\Limiters;
 
 use Illuminate\Contracts\Redis\LimiterTimeoutException;
+use Illuminate\Support\Sleep;
 use Illuminate\Support\Str;
 use Throwable;
 
@@ -75,7 +76,7 @@ public function block($timeout, $callback = null, $sleep = 250)
                 throw new LimiterTimeoutException;
             }
 
-            usleep($sleep * 1000);
+            Sleep::usleep($sleep * 1000);
         }
 
         if (is_callable($callback)) {

diff --git a/src/Illuminate/Redis/Limiters/DurationLimiter.php b/src/Illuminate/Redis/Limiters/DurationLimiter.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Redis\Limiters;
 
 use Illuminate\Contracts\Redis\LimiterTimeoutException;
+use Illuminate\Support\Sleep;
 
 class DurationLimiter
 {
@@ -84,7 +85,7 @@ public function block($timeout, $callback = null, $sleep = 750)
                 throw new LimiterTimeoutException;
             }
 
-            usleep($sleep * 1000);
+            Sleep::usleep($sleep * 1000);
         }
 
         if (is_callable($callback)) {