[3rdparty] Migrate to Opis/Closure
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
6f4d3edb5e
commit
04c037ebfd
2
3rdparty
2
3rdparty
|
@ -1 +1 @@
|
||||||
Subproject commit 8d7a96cde06a0357ce5805e00773b576d7595ef8
|
Subproject commit 8f03ccac97331ff781340d76a3f4a49a017d6ae1
|
|
@ -23,12 +23,10 @@
|
||||||
namespace OC\Command;
|
namespace OC\Command;
|
||||||
|
|
||||||
use OC\BackgroundJob\QueuedJob;
|
use OC\BackgroundJob\QueuedJob;
|
||||||
use SuperClosure\Serializer;
|
|
||||||
|
|
||||||
class ClosureJob extends QueuedJob {
|
class ClosureJob extends QueuedJob {
|
||||||
protected function run($serializedCallable) {
|
protected function run($serializedCallable) {
|
||||||
$serializer = new Serializer();
|
$callable = \Opis\Closure\unserialize($serializedCallable);
|
||||||
$callable = $serializer->unserialize($serializedCallable);
|
|
||||||
if (is_callable($callable)) {
|
if (is_callable($callable)) {
|
||||||
$callable();
|
$callable();
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -30,7 +30,7 @@ use OCP\Command\ICommand;
|
||||||
*/
|
*/
|
||||||
class CommandJob extends QueuedJob {
|
class CommandJob extends QueuedJob {
|
||||||
protected function run($serializedCommand) {
|
protected function run($serializedCommand) {
|
||||||
$command = unserialize($serializedCommand);
|
$command = \Opis\Closure\unserialize($serializedCommand);
|
||||||
if ($command instanceof ICommand) {
|
if ($command instanceof ICommand) {
|
||||||
$command->handle();
|
$command->handle();
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
namespace OC\Command;
|
namespace OC\Command;
|
||||||
|
|
||||||
use OCP\Command\ICommand;
|
use OCP\Command\ICommand;
|
||||||
use SuperClosure\Serializer;
|
|
||||||
|
|
||||||
class CronBus extends AsyncBus {
|
class CronBus extends AsyncBus {
|
||||||
/**
|
/**
|
||||||
|
@ -68,10 +67,9 @@ class CronBus extends AsyncBus {
|
||||||
*/
|
*/
|
||||||
private function serializeCommand($command) {
|
private function serializeCommand($command) {
|
||||||
if ($command instanceof \Closure) {
|
if ($command instanceof \Closure) {
|
||||||
$serializer = new Serializer();
|
return \Opis\Closure\serialize($command);
|
||||||
return $serializer->serialize($command);
|
|
||||||
} elseif (is_callable($command) or $command instanceof ICommand) {
|
} elseif (is_callable($command) or $command instanceof ICommand) {
|
||||||
return serialize($command);
|
return \Opis\Closure\serialize($command);
|
||||||
} else {
|
} else {
|
||||||
throw new \InvalidArgumentException('Invalid command');
|
throw new \InvalidArgumentException('Invalid command');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue