5 files changed, 52 insertions, 161 deletions
diff --git a/phpBB/includes/cron/manager.php b/phpBB/includes/cron/manager.php
index 21dcb91695..a0bf018b33 100644
--- a/phpBB/includes/cron/manager.php
+++ b/phpBB/includes/cron/manager.php
@@ -33,129 +33,24 @@ class phpbb_cron_manager
 	protected $tasks = array();
 
 	/**
-	* Path to the root of directory tree with tasks.
-	* For bundled phpBB tasks, this is the path to includes/cron/tasks
-	* under phpBB root.
-	* @var string
-	*/
-	protected $task_path;
-
-	/**
-	* PHP file extension
-	* @var string
-	*/
-	protected $phpEx;
-
-	/**
-	* Cache driver
-	* @var phpbb_cache_driver_interface
-	*/
-	protected $cache;
-
-	/**
 	* Constructor. Loads all available tasks.
 	*
-	* Tasks will be looked up in directory tree rooted at $task_path.
-	* Task classes will be autoloaded and must be named according to
-	* autoloading naming conventions. To load cron tasks shipped with
-	* phpbb, pass $phpbb_root_path . 'includes/cron/task' as $task_path.
-	*
-	* If $cache is given, names of found cron tasks will be cached in it
-	* for one hour. Note that the cron task names are stored without
-	* namespacing; if two different phbb_cron_manager instances are
-	* constructed with different $task_path arguments but the same $cache,
-	* the second instance will use task names found by the first instance.
-	*
-	* @param string $task_path                   Directory containing cron tasks
-	* @param string $phpEx                       PHP file extension
-	* @param phpbb_cache_driver_interface $cache Cache for task names (optional)
-	* @return void
+	* @param array|Traversable $task_names Provides an iterable set of task names
 	*/
-	public function __construct($task_path, $phpEx, phpbb_cache_driver_interface $cache = null)
+	public function __construct($task_names)
 	{
-		$this->task_path = $task_path;
-		$this->phpEx = $phpEx;
-		$this->cache = $cache;
-
-		$task_names = $this->find_cron_task_names();
 		$this->load_tasks($task_names);
 	}
 
 	/**
-	* Finds cron task names.
-	*
-	* A cron task file must follow the naming convention:
-	* includes/cron/task/$mod/$name.php.
-	* $mod is core for tasks that are part of phpbb.
-	* Modifications should use their name as $mod.
-	* $name is the name of the cron task.
-	* Cron task is expected to be a class named phpbb_cron_task_${mod}_${name}.
-	*
-	* @return array		List of task names
-	*/
-	public function find_cron_task_names()
-	{
-		if ($this->cache)
-		{
-			$task_names = $this->cache->get('_cron_tasks');
-
-			if ($task_names !== false)
-			{
-				return $task_names;
-			}
-		}
-
-		$task_names = array();
-		$ext = '.' . $this->phpEx;
-		$ext_length = strlen($ext);
-
-		$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->task_path));
-
-		foreach ($iterator as $fileinfo)
-		{
-			$file = preg_replace('#^' . preg_quote($this->task_path, '#') . '#', '', $fileinfo->getPathname());
-
-			// skip directories and files direclty in the task root path
-			if ($fileinfo->isFile() && strpos($file, '/') !== false)
-			{
-				$task_name = str_replace('/', '_', substr($file, 0, -$ext_length));
-				if (substr($file, -$ext_length) == $ext && $this->is_valid_name($task_name))
-				{
-					$task_names[] = 'phpbb_cron_task_' . $task_name;
-				}
-			}
-		}
-
-		if ($this->cache)
-		{
-			$this->cache->put('_cron_tasks', $task_names, 3600);
-		}
-
-		return $task_names;
-	}
-
-	/**
-	* Checks whether $name is a valid identifier, and
-	* therefore part of valid cron task class name.
-	*
-	* @param string $name		Name to check
-	*
-	* @return bool
-	*/
-	public function is_valid_name($name)
-	{
-		return (bool) preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $name);
-	}
-
-	/**
 	* Loads tasks given by name, wraps them
 	* and puts them into $this->tasks.
 	*
-	* @param array $task_names		Array of strings
+	* @param array|Traversable $task_names		Array of strings
 	*
 	* @return void
 	*/
-	public function load_tasks(array $task_names)
+	public function load_tasks($task_names)
 	{
 		foreach ($task_names as $task_name)
 		{
diff --git a/phpBB/includes/cron/task/base.php b/phpBB/includes/cron/task/base.php
index 38c0b844d9..9db8e3bd44 100644
--- a/phpBB/includes/cron/task/base.php
+++ b/phpBB/includes/cron/task/base.php
@@ -51,23 +51,4 @@ abstract class phpbb_cron_task_base implements phpbb_cron_task
 	{
 		return true;
 	}
-
-	/**
-	* Returns whether this cron task can be run in shutdown function.
-	*
-	* By the time shutdown sequence invokes a particular piece of code,
-	* resources that that code requires may already be released.
-	* If so, a particular cron task may be marked shutdown function-
-	* unsafe, and it will be executed in normal program flow.
-	*
-	* Generally speaking cron tasks should start off as shutdown function-
-	* safe, and only be marked shutdown function-unsafe if a problem
-	* is discovered.
-	*
-	* @return bool		Whether the cron task is shutdown function-safe.
-	*/
-	public function is_shutdown_function_safe()
-	{
-		return true;
-	}
 }
diff --git a/phpBB/includes/cron/task/core/queue.php b/phpBB/includes/cron/task/core/queue.php
index 0e9de05984..96cade0ce5 100644
--- a/phpBB/includes/cron/task/core/queue.php
+++ b/phpBB/includes/cron/task/core/queue.php
@@ -64,21 +64,4 @@ class phpbb_cron_task_core_queue extends phpbb_cron_task_base
 		global $config;
 		return $config['last_queue_run'] < time() - $config['queue_interval_config'];
 	}
-
-	/**
-	* Returns whether this cron task can be run in shutdown function.
-	*
-	* A user reported that using the mail() function during shutdown
-	* function execution does not work. Therefore if email is delivered
-	* via the mail() function (as opposed to SMTP) queue cron task marks
-	* itself shutdown function-unsafe.
-	*
-	* @return bool
-	*/
-	public function is_shutdown_function_safe()
-	{
-		global $config;
-		// A user reported using the mail() function while using shutdown does not work. We do not want to risk that.
-		return !$config['smtp_delivery'];
-	}
 }
diff --git a/phpBB/includes/cron/task/provider.php b/phpBB/includes/cron/task/provider.php
new file mode 100644
index 0000000000..e6ae0f75ec
--- /dev/null
+++ b/phpBB/includes/cron/task/provider.php
@@ -0,0 +1,48 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Provides cron manager with tasks
+*
+* Finds installed cron tasks and makes them available to the cron manager.
+*
+* @package phpBB3
+*/
+class phpbb_cron_task_provider extends phpbb_extension_provider
+{
+	/**
+	* Finds cron task names using the extension manager.
+	*
+	* All PHP files in includes/cron/task/core/ are considered tasks. Tasks
+	* in extensions have to be located in a directory called cron or a subdir
+	* of a directory called cron. The class and filename must end in a _task
+	* suffix. Additionally all PHP files in includes/cron/task/core/ are
+	* tasks.
+	*
+	* @return array     List of task names
+	*/
+	protected function find()
+	{
+		$finder = $this->extension_manager->get_finder();
+
+		return $finder
+			->extension_suffix('_task')
+			->extension_directory('/cron')
+			->core_path('includes/cron/task/core/')
+			->get_classes();
+	}
+}
diff --git a/phpBB/includes/cron/task/task.php b/phpBB/includes/cron/task/task.php
index 58c4a96f8e..cceccce44f 100644
--- a/phpBB/includes/cron/task/task.php
+++ b/phpBB/includes/cron/task/task.php
@@ -45,20 +45,4 @@ interface phpbb_cron_task
 	* @return bool
 	*/
 	public function should_run();
-
-	/**
-	* Returns whether this cron task can be run in shutdown function.
-	*
-	* By the time shutdown sequence invokes a particular piece of code,
-	* resources that that code requires may already be released.
-	* If so, a particular cron task may be marked shutdown function-
-	* unsafe, and it will be executed in normal program flow.
-	*
-	* Generally speaking cron tasks should start off as shutdown function-
-	* safe, and only be marked shutdown function-unsafe if a problem
-	* is discovered.
-	*
-	* @return bool
-	*/
-	public function is_shutdown_function_safe();
 }