mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move legacy backgroundjob classes to a place where they can be autoloaded

This commit is contained in:
Robin Appelman 2013-05-03 16:42:48 +02:00
parent b31dc10c3c
commit b7585050b5
3 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/backgroundjob/legacy/queuedjob.php Normal file
View File

@ -0,0 +1,18 @@
<?php
/**
* Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OC\BackgroundJob\Legacy;
class QueuedJob extends \OC\BackgroundJob\QueuedJob {
public function run($argument) {
$class = $argument['klass'];
$method = $argument['method'];
$parameters = $argument['parameters'];
call_user_func(array($class, $method), $parameters);
}
}

15
lib/backgroundjob/legacy/regularjob.php Normal file
View File

@ -0,0 +1,15 @@
<?php
/**
* Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OC\BackgroundJob\Legacy;
class RegularJob extends \OC\BackgroundJob\Job {
public function run($argument) {
call_user_func($argument);
}
}

24
lib/public/backgroundjob.php
View File

@ -21,7 +21,7 @@
*/
/**
* Public interface of ownCloud forbackground jobs.
* Public interface of ownCloud for background jobs.
*/
// use OCP namespace for all classes that are considered public.
@ -83,7 +83,7 @@ class BackgroundJob {
* @return true
*/
public static function addRegularTask($klass, $method) {
self::registerJob('RegularLegacyJob', array($klass, $method));
self::registerJob('OC\BackgroundJob\Legacy\RegularJob', array($klass, $method));
return true;
}
@ -169,7 +169,7 @@ class BackgroundJob {
* @return int id of task
*/
public static function addQueuedTask($app, $class, $method, $parameters) {
self::registerJob('QueuedLegacyJob', array('app' => $app, 'klass' => $class, 'method' => $method, 'parameters' => $parameters));
self::registerJob('OC\BackgroundJob\Legacy\QueuedJob', array('app' => $app, 'klass' => $class, 'method' => $method, 'parameters' => $parameters));
return true;
}
@ -189,21 +189,3 @@ class BackgroundJob {
}
}
}
/**
* Wrappers to support old versions of the BackgroundJob api
*/
class RegularLegacyJob extends \OC\BackgroundJob\Job {
public function run($argument) {
call_user_func($argument);
}
}
class QueuedLegacyJob extends \OC\BackgroundJob\QueuedJob {
public function run($argument) {
$class = $argument['klass'];
$method = $argument['method'];
$parameters = $argument['parameters'];
call_user_func(array($class, $method), $parameters);
}
}