Removes opis/closure package (#39087)

Author: nunomaduro

composer.json

@@ -26,7 +26,6 @@
         "league/flysystem": "^2.0",
         "monolog/monolog": "^2.0",
         "nesbot/carbon": "^2.31",
-        "opis/closure": "^3.6",
         "psr/container": "^1.1.1|^2.0.1",
         "psr/log": "^1.0|^2.0",
         "psr/simple-cache": "^1.0",

src/Illuminate/Bus/PendingBatch.php

@@ -6,9 +6,9 @@
 use Illuminate\Bus\Events\BatchDispatched;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Events\Dispatcher as EventDispatcher;
-use Illuminate\Queue\SerializableClosureFactory;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
+use Laravel\SerializableClosure\SerializableClosure;
 use Throwable;
 
 class PendingBatch
@@ -78,7 +78,7 @@ public function add($jobs)
     public function then($callback)
     {
         $this->options['then'][] = $callback instanceof Closure
-                        ? SerializableClosureFactory::make($callback)
+                        ? new SerializableClosure($callback)
                         : $callback;
 
         return $this;
@@ -103,7 +103,7 @@ public function thenCallbacks()
     public function catch($callback)
     {
         $this->options['catch'][] = $callback instanceof Closure
-                    ? SerializableClosureFactory::make($callback)
+                    ? new SerializableClosure($callback)
                     : $callback;
 
         return $this;
@@ -128,7 +128,7 @@ public function catchCallbacks()
     public function finally($callback)
     {
         $this->options['finally'][] = $callback instanceof Closure
-                    ? SerializableClosureFactory::make($callback)
+                    ? new SerializableClosure($callback)
                     : $callback;
 
         return $this;

src/Illuminate/Encryption/EncryptionServiceProvider.php

@@ -5,7 +5,6 @@
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 use Laravel\SerializableClosure\SerializableClosure;
-use Opis\Closure\SerializableClosure as OpisSerializableClosure;
 
 class EncryptionServiceProvider extends ServiceProvider
 {
@@ -17,7 +16,6 @@ class EncryptionServiceProvider extends ServiceProvider
     public function register()
     {
         $this->registerEncrypter();
-        $this->registerOpisSecurityKey();
         $this->registerSerializableClosureSecurityKey();
     }
 
@@ -35,26 +33,6 @@ protected function registerEncrypter()
         });
     }
 
-    /**
-     * Configure Opis Closure signing for security.
-     *
-     * @return void
-     *
-     * @deprecated Will be removed in a future Laravel version.
-     */
-    protected function registerOpisSecurityKey()
-    {
-        if (\PHP_VERSION_ID < 80100) {
-            $config = $this->app->make('config')->get('app');
-
-            if (! class_exists(OpisSerializableClosure::class) || empty($config['key'])) {
-                return;
-            }
-
-            OpisSerializableClosure::setSecretKey($this->parseKey($config));
-        }
-    }
-
     /**
      * Configure Serializable Closure signing for security.
      *

src/Illuminate/Events/QueuedClosure.php

@@ -3,7 +3,7 @@
 namespace Illuminate\Events;
 
 use Closure;
-use Illuminate\Queue\SerializableClosureFactory;
+use Laravel\SerializableClosure\SerializableClosure;
 
 class QueuedClosure
 {
@@ -114,10 +114,10 @@ public function resolve()
     {
         return function (...$arguments) {
             dispatch(new CallQueuedListener(InvokeQueuedClosure::class, 'handle', [
-                'closure' => SerializableClosureFactory::make($this->closure),
+                'closure' => new SerializableClosure($this->closure),
                 'arguments' => $arguments,
                 'catch' => collect($this->catchCallbacks)->map(function ($callback) {
-                    return SerializableClosureFactory::make($callback);
+                    return new SerializableClosure($callback);
                 })->all(),
             ]))->onConnection($this->connection)->onQueue($this->queue)->delay($this->delay);
         };

src/Illuminate/Foundation/Bus/PendingChain.php

@@ -5,7 +5,7 @@
 use Closure;
 use Illuminate\Contracts\Bus\Dispatcher;
 use Illuminate\Queue\CallQueuedClosure;
-use Illuminate\Queue\SerializableClosureFactory;
+use Laravel\SerializableClosure\SerializableClosure;
 
 class PendingChain
 {
@@ -112,7 +112,7 @@ public function delay($delay)
     public function catch($callback)
     {
         $this->catchCallbacks[] = $callback instanceof Closure
-                        ? SerializableClosureFactory::make($callback)
+                        ? new SerializableClosure($callback)
                         : $callback;
 
         return $this;

src/Illuminate/Queue/CallQueuedClosure.php

@@ -8,6 +8,7 @@
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Laravel\SerializableClosure\SerializableClosure;
 use ReflectionFunction;
 
 class CallQueuedClosure implements ShouldQueue
@@ -54,7 +55,7 @@ public function __construct($closure)
      */
     public static function create(Closure $job)
     {
-        return new self(SerializableClosureFactory::make($job));
+        return new self(new SerializableClosure($job));
     }
 
     /**
@@ -77,7 +78,7 @@ public function handle(Container $container)
     public function onFailure($callback)
     {
         $this->failureCallbacks[] = $callback instanceof Closure
-                        ? SerializableClosureFactory::make($callback)
+                        ? new SerializableClosure($callback)
                         : $callback;
 
         return $this;

src/Illuminate/Queue/SerializableClosure.php

@@ -25,7 +25,6 @@
         "illuminate/pipeline": "^9.0",
         "illuminate/support": "^9.0",
         "laravel/serializable-closure": "^1.0",
-        "opis/closure": "^3.6",
         "ramsey/uuid": "^4.2.2",
         "symfony/process": "^6.0"
     },

src/Illuminate/Queue/SerializableClosureFactory.php

@@ -16,7 +16,6 @@
 use Illuminate\Support\Traits\Macroable;
 use Laravel\SerializableClosure\SerializableClosure;
 use LogicException;
-use Opis\Closure\SerializableClosure as OpisSerializableClosure;
 use ReflectionFunction;
 use Symfony\Component\Routing\Route as SymfonyRoute;
 
@@ -977,7 +976,6 @@ public function getMissing()
 
         return is_string($missing) &&
             Str::startsWith($missing, [
-                'C:32:"Opis\\Closure\\SerializableClosure',
                 'O:47:"Laravel\\SerializableClosure\\SerializableClosure',
             ]) ? unserialize($missing) : $missing;
     }
@@ -1228,16 +1226,14 @@ public function setContainer(Container $container)
     public function prepareForSerialization()
     {
         if ($this->action['uses'] instanceof Closure) {
-            $this->action['uses'] = serialize(\PHP_VERSION_ID < 70400
-                ? new OpisSerializableClosure($this->action['uses'])
-                : new SerializableClosure($this->action['uses'])
+            $this->action['uses'] = serialize(
+                new SerializableClosure($this->action['uses'])
             );
         }
 
         if (isset($this->action['missing']) && $this->action['missing'] instanceof Closure) {
-            $this->action['missing'] = serialize(\PHP_VERSION_ID < 70400
-                ? new OpisSerializableClosure($this->action['missing'])
-                : new SerializableClosure($this->action['missing'])
+            $this->action['missing'] = serialize(
+                new SerializableClosure($this->action['missing'])
             );
         }