3 files changed, 127 insertions, 10 deletions
diff --git a/phpBB/includes/cron/task/collection.php b/phpBB/includes/cron/task/collection.php
new file mode 100644
index 0000000000..d05be9012c
--- /dev/null
+++ b/phpBB/includes/cron/task/collection.php
@@ -0,0 +1,72 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Collects cron tasks
+*
+* @package phpBB3
+*/
+class phpbb_cron_task_collection implements ArrayAccess
+{
+	/**
+	* ArrayAccess method
+	*
+	* @param mixed $offset Array offset
+	*/
+	public function offsetExists($offset)
+	{
+		return isset($this->tasks[$offset]);
+	}
+
+	/**
+	* ArrayAccess method
+	*
+	* @param mixed $offset Array offset
+	*/
+	public function offsetGet($offset)
+	{
+		return $this->offsetExists($offset) ? $this->tasks[$offset] : null;
+	}
+
+	/**
+	* ArrayAccess method
+	*
+	* @param mixed $offset Array offset
+	* @param mixed $value New value
+	*/
+	public function offsetSet($offset, $value)
+	{
+		if ($offset === null)
+		{
+			$this->tasks[] = $value;
+		}
+		else
+		{
+			$this->tasks[$offset] = $value;
+		}
+	}
+
+	/**
+	* ArrayAccess method
+	*
+	* @param mixed $offset Array offset
+	*/
+	public function offsetUnset($offset)
+	{
+		$this->tasks[$offset] = null;
+	}
+}
diff --git a/phpBB/includes/cron/task/provider.php b/phpBB/includes/cron/task/provider.php
index 134723ebd1..08e54a651a 100644
--- a/phpBB/includes/cron/task/provider.php
+++ b/phpBB/includes/cron/task/provider.php
@@ -26,10 +26,11 @@ use Symfony\Component\DependencyInjection\TaggedContainerInterface;
 */
 class phpbb_cron_task_provider implements IteratorAggregate
 {
-	private $container;
+	private $tasks;
 
-	public function __construct(TaggedContainerInterface $container)
+	public function __construct(phpbb_cron_task_collection $tasks, TaggedContainerInterface $container)
 	{
+		$this->tasks = $tasks;
 		$this->container = $container;
 	}
 
@@ -40,18 +41,24 @@ class phpbb_cron_task_provider implements IteratorAggregate
 	*/
 	public function getIterator()
 	{
-		$definitions = $this->container->findTaggedServiceIds('cron.task');
-
 		$tasks = array();
-		foreach ($definitions as $name => $definition)
+		foreach ($this->tasks as $names)
 		{
-			$task = $this->container->get($name);
-			if ($task instanceof phpbb_cron_task_base)
+			foreach ($names as $name)
 			{
-				$task->set_name($name);
-			}
+				if (!$this->container->has($name))
+				{
+					continue;
+				}
 
-			$tasks[] = $task;
+				$task = $this->container->get($name);
+				if ($task instanceof phpbb_cron_task_base)
+				{
+					$task->set_name($name);
+				}
+
+				$tasks[] = $task;
+			}
 		}
 
 		return new ArrayIterator($tasks);
diff --git a/phpBB/includes/di/pass/cron.php b/phpBB/includes/di/pass/cron.php
new file mode 100644
index 0000000000..b5fc4af9fc
--- /dev/null
+++ b/phpBB/includes/di/pass/cron.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+class phpbb_di_pass_cron implements CompilerPassInterface
+{
+	/**
+	* Modify the container before it is passed to the rest of the code
+	*
+	* @param ContainerBuilder $container ContainerBuilder object
+	* @return null
+	*/
+	public function process(ContainerBuilder $container)
+	{
+		$definition = $container->getDefinition('cron.task_collection');
+
+		foreach ($container->findTaggedServiceIds('cron.task') as $id => $data)
+		{
+			$definition->addMethodCall('offsetSet', array(null, $id));
+		}
+	}
+}