[11.x] Move Defer classes to Support component and add `Illuminate\Su…

…pport\defer` function (#52801) * [11.x] Move Defer classes to Concurrency component Also avoid using global `defer()` function when it can be defined in environment such as Swoole Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * Update DeferredCallbackCollection.php * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> --------- Signed-off-by: Mior Muhammad Zaki <[email protected]> Co-authored-by: Taylor Otwell <[email protected]>
laravel · Sep 17, 2024 · 18c22d1 · 18c22d1
1 parent d582690
commit 18c22d1
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 25 deletions.
diff --git a/src/Illuminate/Cache/Repository.php b/src/Illuminate/Cache/Repository.php
@@ -24,6 +24,8 @@
 use Illuminate\Support\InteractsWithTime;
 use Illuminate\Support\Traits\Macroable;
 
+use function Illuminate\Support\defer;
+
 /**
  * @mixin \Illuminate\Contracts\Cache\Store
  */
@@ -517,11 +519,7 @@ public function flexible($key, $ttl, $callback, $lock = null)
             });
         };
 
-        if (function_exists('defer')) {
-            defer($refresh, "illuminate:cache:refresh:{$key}");
-        } else {
-            $refresh();
-        }
+        defer($refresh, "illuminate:cache:refresh:{$key}");
 
         return $value;
     }

diff --git a/src/Illuminate/Concurrency/ForkDriver.php b/src/Illuminate/Concurrency/ForkDriver.php
@@ -4,10 +4,12 @@
 
 use Closure;
 use Illuminate\Contracts\Concurrency\Driver;
-use Illuminate\Foundation\Defer\DeferredCallback;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Defer\DeferredCallback;
 use Spatie\Fork\Fork;
 
+use function Illuminate\Support\defer;
+
 class ForkDriver implements Driver
 {
     /**

diff --git a/src/Illuminate/Concurrency/ProcessDriver.php b/src/Illuminate/Concurrency/ProcessDriver.php
@@ -5,12 +5,14 @@
 use Closure;
 use Illuminate\Console\Application;
 use Illuminate\Contracts\Concurrency\Driver;
-use Illuminate\Foundation\Defer\DeferredCallback;
 use Illuminate\Process\Factory as ProcessFactory;
 use Illuminate\Process\Pool;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Defer\DeferredCallback;
 use Laravel\SerializableClosure\SerializableClosure;
 
+use function Illuminate\Support\defer;
+
 class ProcessDriver implements Driver
 {
     /**

diff --git a/src/Illuminate/Concurrency/SyncDriver.php b/src/Illuminate/Concurrency/SyncDriver.php
@@ -4,8 +4,10 @@
 
 use Closure;
 use Illuminate\Contracts\Concurrency\Driver;
-use Illuminate\Foundation\Defer\DeferredCallback;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Defer\DeferredCallback;
+
+use function Illuminate\Support\defer;
 
 class SyncDriver implements Driver
 {

diff --git a/src/Illuminate/Concurrency/composer.json b/src/Illuminate/Concurrency/composer.json
@@ -20,7 +20,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Illuminate\\Support\\": ""
+            "Illuminate\\Concurrency\\": ""
         }
     },
     "extra": {

diff --git a/src/Illuminate/Contracts/Concurrency/Driver.php b/src/Illuminate/Contracts/Concurrency/Driver.php
@@ -3,7 +3,7 @@
 namespace Illuminate\Contracts\Concurrency;
 
 use Closure;
-use Illuminate\Foundation\Defer\DeferredCallback;
+use Illuminate\Support\Defer\DeferredCallback;
 
 interface Driver
 {

diff --git a/src/Illuminate/Foundation/Http/Middleware/InvokeDeferredCallbacks.php b/src/Illuminate/Foundation/Http/Middleware/InvokeDeferredCallbacks.php
@@ -4,8 +4,8 @@
 
 use Closure;
 use Illuminate\Container\Container;
-use Illuminate\Foundation\Defer\DeferredCallbackCollection;
 use Illuminate\Http\Request;
+use Illuminate\Support\Defer\DeferredCallbackCollection;
 use Symfony\Component\HttpFoundation\Response;
 
 class InvokeDeferredCallbacks

diff --git a/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php b/src/Illuminate/Foundation/Providers/FoundationServiceProvider.php
@@ -13,7 +13,6 @@
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Database\Grammar;
 use Illuminate\Foundation\Console\CliDumper;
-use Illuminate\Foundation\Defer\DeferredCallbackCollection;
 use Illuminate\Foundation\Exceptions\Renderer\Listener;
 use Illuminate\Foundation\Exceptions\Renderer\Mappers\BladeMapper;
 use Illuminate\Foundation\Exceptions\Renderer\Renderer;
@@ -26,6 +25,7 @@
 use Illuminate\Log\Events\MessageLogged;
 use Illuminate\Queue\Events\JobAttempted;
 use Illuminate\Support\AggregateServiceProvider;
+use Illuminate\Support\Defer\DeferredCallbackCollection;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Testing\LoggedExceptionCollection;
 use Illuminate\Testing\ParallelTestingServiceProvider;

diff --git a/src/Illuminate/Foundation/helpers.php b/src/Illuminate/Foundation/helpers.php
@@ -14,8 +14,6 @@
 use Illuminate\Contracts\View\Factory as ViewFactory;
 use Illuminate\Foundation\Bus\PendingClosureDispatch;
 use Illuminate\Foundation\Bus\PendingDispatch;
-use Illuminate\Foundation\Defer\DeferredCallback;
-use Illuminate\Foundation\Defer\DeferredCallbackCollection;
 use Illuminate\Foundation\Mix;
 use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Log\Context\Repository as ContextRepository;
@@ -412,14 +410,7 @@ function decrypt($value, $unserialize = true)
      */
     function defer(?callable $callback = null, ?string $name = null, bool $always = false)
     {
-        if ($callback === null) {
-            return app(DeferredCallbackCollection::class);
-        }
-
-        return tap(
-            new DeferredCallback($callback, $name, $always),
-            fn ($deferred) => app(DeferredCallbackCollection::class)[] = $deferred
-        );
+        return \Illuminate\Support\defer($callback, $name, $always);
     }
 }
 

diff --git a/...ate/Foundation/Defer/DeferredCallback.php → ...minate/Support/Defer/DeferredCallback.php b/...ate/Foundation/Defer/DeferredCallback.php → ...minate/Support/Defer/DeferredCallback.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Illuminate\Foundation\Defer;
+namespace Illuminate\Support\Defer;
 
 use Illuminate\Support\Str;
 

diff --git a/...tion/Defer/DeferredCallbackCollection.php → ...port/Defer/DeferredCallbackCollection.php b/...tion/Defer/DeferredCallbackCollection.php → ...port/Defer/DeferredCallbackCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Illuminate\Foundation\Defer;
+namespace Illuminate\Support\Defer;
 
 use ArrayAccess;
 use Closure;

diff --git a/src/Illuminate/Support/Facades/Concurrency.php b/src/Illuminate/Support/Facades/Concurrency.php
@@ -18,7 +18,7 @@
  * @method static \Illuminate\Concurrency\ConcurrencyManager extend(string $name, \Closure $callback)
  * @method static \Illuminate\Concurrency\ConcurrencyManager setApplication(\Illuminate\Contracts\Foundation\Application $app)
  * @method static array run(\Closure|array $tasks)
- * @method static \Illuminate\Foundation\Defer\DeferredCallback defer(\Closure|array $tasks)
+ * @method static \Illuminate\Support\Defer\DeferredCallback defer(\Closure|array $tasks)
  *
  * @see \Illuminate\Concurrency\ConcurrencyManager
  */

diff --git a/src/Illuminate/Support/functions.php b/src/Illuminate/Support/functions.php
@@ -2,8 +2,30 @@
 
 namespace Illuminate\Support;
 
+use Illuminate\Support\Defer\DeferredCallback;
+use Illuminate\Support\Defer\DeferredCallbackCollection;
 use Illuminate\Support\Process\PhpExecutableFinder;
 
+/**
+ * Defer execution of the given callback.
+ *
+ * @param  callable|null  $callback
+ * @param  string|null  $name
+ * @param  bool  $always
+ * @return \Illuminate\Support\Defer\DeferredCallback
+ */
+function defer(?callable $callback = null, ?string $name = null, bool $always = false)
+{
+    if ($callback === null) {
+        return app(DeferredCallbackCollection::class);
+    }
+
+    return tap(
+        new DeferredCallback($callback, $name, $always),
+        fn ($deferred) => app(DeferredCallbackCollection::class)[] = $deferred
+    );
+}
+
 /**
  * Determine the PHP Binary.
  *