Merge remote-tracking branch 'github-igorw/feature/dic' into develop

* github-igorw/feature/dic: (35 commits)
  [feature/dic] Spaces to tabs, add useless docblocks
  [feature/dic] Remove unneeded newline
  [feature/dic] Add a doc block for the prune_forum cron task forum_data
  [feature/dic] Update composer.lock to symfony/* RC1
  [feature/dic] Fix re-ordering of services
  [feature/dic] Fix parse errors
  [feature/dic] Add docblock for cron_manager::wrap_task()
  [feature/dic] Make cron task attributes protected, one per line
  [feature/dic] Coding style: Braces
  [feature/dic] Re-order services alphabetically
  [feature/dic] Remove duplicate event-dispatcher dependency
  [feature/dic] Adjust installer script to work with partially configured container
  [feature/dic] Generate full cache driver class name on fresh install
  [feature/dic] Adjust cache driver class name for BC
  [feature/dic] Rename {phpEx => php_ext} for consistency
  [feature/dic] Add trailing newline to htaccess
  [feature/dic] Require symfony/* 2.1.*, tabs instead of spaces, --dev lock file
  [feature/dic] Load services from extensions
  [feature/dic] Introduce DI processors instead of abusing compiler passes
  [feature/dic] Add dbal_ class prefix to dbal.driver.class
  ...

1 files changed, 23 insertions, 14 deletions

diff --git a/tests/cron/task_provider_test.php b/tests/cron/task_provider_test.php
index b42f40bb4a..ec853bb3ba 100644
--- a/tests/cron/task_provider_test.php
+++ b/tests/cron/task_provider_test.php
@@ -11,31 +11,40 @@ class phpbb_cron_task_provider_test extends PHPUnit_Framework_TestCase
 {
 	public function setUp()
 	{
-		$this->extension_manager = new phpbb_mock_extension_manager(
-			dirname(__FILE__) . '/',
-			array(
-				'testext' => array(
-					'ext_name'      => 'testext',
-					'ext_active'    => true,
-					'ext_path'      => 'ext/testext/'
-				),
-			));
-		$this->provider = new phpbb_cron_task_provider($this->extension_manager);
+		$this->tasks = array(
+			'phpbb_cron_task_core_dummy_task',
+			'phpbb_cron_task_core_second_dummy_task',
+			'phpbb_ext_testext_cron_dummy_task',
+		);
+
+		$container = $this->getMock('Symfony\Component\DependencyInjection\TaggedContainerInterface');
+		$container
+			->expects($this->once())
+			->method('findTaggedServiceIds')
+			->will($this->returnValue(array_flip($this->tasks)));
+		$container
+			->expects($this->any())
+			->method('get')
+			->will($this->returnCallback(function ($name) {
+				return new $name;
+			}));
+
+		$this->provider = new phpbb_cron_task_provider($container);
 	}
 
 	public function test_manager_finds_shipped_tasks()
 	{
-		$tasks = array();
+		$task_names = array();
 		foreach ($this->provider as $task)
 		{
-			$tasks[] = $task;
+			$task_names[] = $task->get_name();
 		}
-		sort($tasks);
+		sort($task_names);
 
 		$this->assertEquals(array(
 			'phpbb_cron_task_core_dummy_task',
 			'phpbb_cron_task_core_second_dummy_task',
 			'phpbb_ext_testext_cron_dummy_task',
-		), $tasks);
+		), $task_names);
 	}
 }