8000 Removes `opis/closure` package (#39087) · laravel/framework@2232263 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2232263

Browse files
nunomaduronunomaduro
authored
Removes opis/closure package (#39087)
1 parent ae0ef69 commit 2232263

13 files changed

+20
-120
lines changed

‎composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
&qu 10000 ot;league/flysystem": "^2.0",
2727
"monolog/monolog": "^2.0",
2828
"nesbot/carbon": "^2.31",
29-
"opis/closure": "^3.6",
3029
"psr/container": "^1.1.1|^2.0.1",
3130
"psr/log": "^1.0|^2.0",
3231
"psr/simple-cache": "^1.0",

‎src/Illuminate/Bus/PendingBatch.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
use Illuminate\Bus\Events\BatchDispatched;
77
use Illuminate\Contracts\Container\Container;
88
use Illuminate\Contracts\Events\Dispatcher as EventDispatcher;
9-
use Illuminate\Queue\SerializableClosureFactory;
109
use Illuminate\Support\Arr;
1110
use Illuminate\Support\Collection;
11+
use Laravel\SerializableClosure\SerializableClosure;
1212
use Throwable;
1313

1414
class PendingBatch
@@ -78,7 +78,7 @@ public function add($jobs)
7878
public function then($callback)
7979
{
8080
$this->options['then'][] = $callback instanceof Closure
81-
? SerializableClosureFactory::make($callback)
81+
? new SerializableClosure($callback)
8282
: $callback;
8383

8484
return $this;
@@ -103,7 +103,7 @@ public function thenCallbacks()
103103
public function catch($callback)
104104
{
105105
$this->options['catch'][] = $callback instanceof Closure
106-
? SerializableClosureFactory::make($callback)
106+
? new SerializableClosure($callback)
107107
: $callback;
108108

109109
return $this;
@@ -128,7 +128,7 @@ public function catchCallbacks()
128128
public function finally($callback)
129129
{
130130
$this->options['finally'][] = $callback instanceof Closure
131-
? SerializableClosureFactory::make($callback)
131+
? new SerializableClosure($callback)
132132
: $callback;
133133

134134
return $this;

‎src/Illuminate/Encryption/EncryptionServiceProvider.php

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use Illuminate\Support\ServiceProvider;
66
use Illuminate\Support\Str;
77
use Laravel\SerializableClosure\SerializableClosure;
8-
use Opis\Closure\SerializableClosure as OpisSerializableClosure;
98

109
class EncryptionServiceProvider extends ServiceProvider
1110
{
@@ -17,7 +16,6 @@ class EncryptionServiceProvider extends ServiceProvider
1716
public function register()
1817
{
1918
$this->registerEncrypter();
20-
$this->registerOpisSecurityKey();
2119
$this->registerSerializableClosureSecurityKey();
2220
}
2321

@@ -35,26 +33,6 @@ protected function registerEncrypter()
3533
});
3634
}
3735

38-
/**
39-
* Configure Opis Closure signing for security.
40-
*
41-
* @return void
42-
*
43-
* @deprecated Will be removed in a future Laravel version.
44-
*/
45-
protected function registerOpisSecurityKey()
46-
{
47-
if (\PHP_VERSION_ID < 80100) {
48-
$config = $this->app->make('config')->get('app');
49-
50-
if (! class_exists(OpisSerializableClosure::class) || empty($config['key'])) {
51-
return;
52-
}
53-
54-
OpisSerializableClosure::setSecretKey($this-&g 10000 t;parseKey($config));
55-
}
56-
}
57-
5836
/**
5937
* Configure Serializable Closure signing for security.
6038
*

‎src/Illuminate/Events/QueuedClosure.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Illuminate\Events;
44

55
use Closure;
6-
use Illuminate\Queue\SerializableClosureFactory;
6+
use Laravel\SerializableClosure\SerializableClosure;
77

88
class QueuedClosure
99
{
@@ -114,10 +114,10 @@ public function resolve()
114114
{
115115
return function (...$arguments) {
116116
dispatch(new CallQueuedListener(InvokeQueuedClosure::class, 'handle', [
117-
'closure' => SerializableClosureFactory::make($this->closure),
117+
'closure' => new SerializableClosure($this->closure),
118118
'arguments' => $arguments,
119119
'catch' => collect($this->catchCallbacks)->map(function ($callback) {
120-
return SerializableClosureFactory::make($callback);
120+
return new SerializableClosure($callback);
121121
})->all(),
122122
]))->onConnection($this->connection)->onQueue($this->queue)->delay($this->delay);
123123
};

‎src/Illuminate/Foundation/Bus/PendingChain.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Closure;
66
use Illuminate\Contracts\Bus\Dispatcher;
77
use Illuminate\Queue\CallQueuedClosure;
8-
use Illuminate\Queue\SerializableClosureFactory;
8+
use Laravel\SerializableClosure\SerializableClosure;
99

1010
class PendingChain
1111
{
@@ -112,7 +112,7 @@ public function delay($delay)
112112
public function catch($callback)
113113
{
114114
$this->catchCallbacks[] = $callback instanceof Closure
115-
? SerializableClosureFactory::make($callback)
115+
? new SerializableClosure($callback)
116116
: $callback;
117117

118118
return $this;

‎src/Illuminate/Queue/CallQueuedClosure.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Illuminate\Contracts\Container\Container;
99
use Illuminate\Contracts\Queue\ShouldQueue;
1010
use Illuminate\Foundation\Bus\Dispatchable;
11+
use Laravel\SerializableClosure\SerializableClosure;
1112
use ReflectionFunction;
1213

1314
class CallQueuedClosure implements ShouldQueue
@@ -54,7 +55,7 @@ public function __construct($closure)
5455
*/
5556
public static function create(Closure $job)
5657
{
57-
return new self(SerializableClosureFactory::make($job));
58+
return new self(new SerializableClosure($job));
5859
}
5960

6061
/**
@@ -77,7 +78,7 @@ public function handle(Container $container)
7778
public function onFailure($callback)
7879
{
7980
$this->failureCallbacks[] = $callback instanceof Closure
80-
? SerializableClosureFactory::make($callback)
81+
? new SerializableClosure($callback)
8182
: $callback;
8283

8384
return $this;

‎src/Illuminate/Queue/SerializableClosure.php

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎src/Illuminate/Queue/SerializableClosureFactory.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/Illuminate/Queue/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"illuminate/pipeline": "^9.0",
2626
"illuminate/support": "^9.0",
2727
"laravel/serializable-closure": "^1.0",
28-
"opis/closure": "^3.6",
2928
"ramsey/uuid": "^4.2.2",
3029
"symfony/process": "^6.0"
3130
},

‎src/Illuminate/Routing/Route.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Illuminate\Support\Traits\Macroable;
1717
use Laravel\SerializableClosure\SerializableClosure;
1818
use LogicException;
19-
use Opis\Closure\SerializableClosure as OpisSerializableClosure;
2019
use ReflectionFunction;
2120
use Symfony\Component\Routing\Route as SymfonyRoute;
2221

@@ -977,7 +976,6 @@ public function getMissing()
977976

978977
return is_string($missing) &&
979978
Str::startsWith($missing, [
980-
'C:32:"Opis\\Closure\\SerializableClosure',
981979
'O:47:"Laravel\\SerializableClosure\\SerializableClosure',
982980
]) ? unserialize($missing) : $missing;
983981
}
@@ -1228,16 +1226,14 @@ public function setContainer(Container $container)
12281226
public function prepareForSerialization()
12291227
{
12301228
if ($this->action['uses'] instanceof Closure) {
1231-
$this->action['uses'] = serialize(\PHP_VERSION_ID < 70400
1232-
? new OpisSerializableClosure($this->action['uses'])
1233-
: new SerializableClosure($this->action['uses'])
1229+
$this->action['uses'] = serialize(
1230+
new SerializableClosure($this->action['uses'])
12341231
);
12351232
}
12361233

12371234
if (isset($this->action['missing']) && $this->action['missing'] instanceof Closure) {
1238-
$this->action['missing'] = serialize(\PHP_VERSION_ID < 70400
1239-
? new OpisSerializableClosure($this->action['missing'])
1240-
: new SerializableClosure($this->action['missing'])
1235+
$this->action['missing'] = serialize(
1236+
new SerializableClosure($this->action['missing'])
12411237
);
12421238
}
12431239

0 commit comments

Comments
 (0)
0