Replace jeremeamia/superclosure with opis/closure

owncloud · Apr 11, 2020 · 6a7bf2f · 6a7bf2f
1 parent cb28395
commit 6a7bf2f
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 175 deletions.
diff --git a/changelog/unreleased/37238 b/changelog/unreleased/37238
@@ -0,0 +1,6 @@
+Change: Replace jeremeamia/superclosure with opis/closure
+
+jeremeamia/superclosure library is no longer maintained.
+Replace it with the recommended opis/closure library.
+
+https://github.com/owncloud/core/pull/37238
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         "php": ">=7.1",
         "doctrine/dbal": "^2.8",
         "phpseclib/phpseclib": "^2.0",
-        "jeremeamia/superclosure": "^2.4",
+        "opis/closure": "^3.5",
         "bantu/ini-get-wrapper": "v1.0.1",
         "punic/punic": "^3.1",
         "pear/archive_tar": "1.4.9",

diff --git a/composer.lock b/composer.lock
diff --git a/lib/private/Command/AsyncBus.php b/lib/private/Command/AsyncBus.php
@@ -23,7 +23,7 @@
 
 use OCP\Command\IBus;
 use OCP\Command\ICommand;
-use SuperClosure\Serializer;
+use Opis\Closure\SerializableClosure;
 
 /**
  * Asynchronous command bus that uses the background job system as backend
@@ -103,8 +103,7 @@ private function getJobClass($command) {
 	 */
 	private function serializeCommand($command) {
 		if ($command instanceof \Closure) {
-			$serializer = new Serializer();
-			return $serializer->serialize($command);
+			return \serialize(new SerializableClosure($command));
 		} elseif (\is_callable($command) or $command instanceof ICommand) {
 			return \serialize($command);
 		} else {

diff --git a/lib/private/Command/ClosureJob.php b/lib/private/Command/ClosureJob.php
@@ -22,12 +22,11 @@
 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);
+		$serializedClosure = \unserialize($serializedCallable);
+		$callable = $serializedClosure->getClosure();
 		if (\is_callable($callable)) {
 			$callable();
 		} else {