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

diff --git a/lib/backgroundjob/legacy/queuedjob.php b/lib/backgroundjob/legacy/queuedjob.php
new file mode 100644 (file)
index 0000000..2bc0011
--- /dev/null
+++ b/lib/backgroundjob/legacy/queuedjob.php
@@ -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);
+       }
+}

diff --git a/lib/backgroundjob/legacy/regularjob.php b/lib/backgroundjob/legacy/regularjob.php
new file mode 100644 (file)
index 0000000..d4cfa34
--- /dev/null
+++ b/lib/backgroundjob/legacy/regularjob.php
@@ -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);
+       }
+}

diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
index aa6c59067e09e9887b9b9944526ecb36d7de9b2d..cc076a3a845ad2944721cc8346c686434475dc9c 100644 (file)
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@ -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);
-       }
-}