From 04c037ebfd80e6f91edafa24b2cd06ecceb1fc43 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sat, 28 Nov 2020 14:58:47 +0100
Subject: [PATCH] [3rdparty] Migrate to Opis/Closure
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
3rdparty | 2 +-
lib/private/Command/ClosureJob.php | 4 +---
lib/private/Command/CommandJob.php | 2 +-
lib/private/Command/CronBus.php | 6 ++----
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/3rdparty b/3rdparty
index 8d7a96cde06..8f03ccac973 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 8d7a96cde06a0357ce5805e00773b576d7595ef8
+Subproject commit 8f03ccac97331ff781340d76a3f4a49a017d6ae1
diff --git a/lib/private/Command/ClosureJob.php b/lib/private/Command/ClosureJob.php
index d67dad348a3..1f8470005e4 100644
--- a/lib/private/Command/ClosureJob.php
+++ b/lib/private/Command/ClosureJob.php
@@ -23,12 +23,10 @@
namespace OC\Command;
use OC\BackgroundJob\QueuedJob;
-use SuperClosure\Serializer;
class ClosureJob extends QueuedJob {
protected function run($serializedCallable) {
- $serializer = new Serializer();
- $callable = $serializer->unserialize($serializedCallable);
+ $callable = \Opis\Closure\unserialize($serializedCallable);
if (is_callable($callable)) {
$callable();
} else {
diff --git a/lib/private/Command/CommandJob.php b/lib/private/Command/CommandJob.php
index 7b2ae60beab..6b1e79f93de 100644
--- a/lib/private/Command/CommandJob.php
+++ b/lib/private/Command/CommandJob.php
@@ -30,7 +30,7 @@ use OCP\Command\ICommand;
*/
class CommandJob extends QueuedJob {
protected function run($serializedCommand) {
- $command = unserialize($serializedCommand);
+ $command = \Opis\Closure\unserialize($serializedCommand);
if ($command instanceof ICommand) {
$command->handle();
} else {
diff --git a/lib/private/Command/CronBus.php b/lib/private/Command/CronBus.php
index 5bb8e4b0045..32f19c913e8 100644
--- a/lib/private/Command/CronBus.php
+++ b/lib/private/Command/CronBus.php
@@ -26,7 +26,6 @@
namespace OC\Command;
use OCP\Command\ICommand;
-use SuperClosure\Serializer;
class CronBus extends AsyncBus {
/**
@@ -68,10 +67,9 @@ class CronBus extends AsyncBus {
*/
private function serializeCommand($command) {
if ($command instanceof \Closure) {
- $serializer = new Serializer();
- return $serializer->serialize($command);
+ return \Opis\Closure\serialize($command);
} elseif (is_callable($command) or $command instanceof ICommand) {
- return serialize($command);
+ return \Opis\Closure\serialize($command);
} else {
throw new \InvalidArgumentException('Invalid command');
}
--
GitLab