From d55448069723b0d593c0bff1f0f26cdd184e7bd4 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 24 Jul 2014 17:51:16 +0200
Subject: [PATCH] [ticket/289] Add missing class variable to modules_helper

---
 config/services.yml                         |  1 +
 includes/modules_helper.php                 | 10 +++++++++-
 tests/unit/acp/move_module_test.php         |  2 +-
 tests/unit/functions/fetch_news_test.php    |  2 +-
 tests/unit/includes/modules_helper_test.php |  3 ++-
 tests/unit/portal/fetch_posts_test.php      |  2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/config/services.yml b/config/services.yml
index c4dc603b..a84e42e4 100644
--- a/config/services.yml
+++ b/config/services.yml
@@ -55,6 +55,7 @@ services:
         class: board3\portal\includes\modules_helper
         arguments:
             - @auth
+            - @config
 
     board3.portal.fetch_posts:
         class: board3\portal\portal\fetch_posts
diff --git a/includes/modules_helper.php b/includes/modules_helper.php
index e366aeac..fcc9d6fa 100644
--- a/includes/modules_helper.php
+++ b/includes/modules_helper.php
@@ -17,15 +17,23 @@ class modules_helper
 	*/
 	protected $auth;
 
+	/**
+	* phpBB config
+	* @var \phpbb\config\config
+	*/
+	protected $config;
+
 	/**
 	* Constructor
 	* NOTE: The parameters of this method must match in order and type with
 	* the dependencies defined in the services.yml file for this service.
 	* @param \phpbb\auth\auth $auth Auth object
+	* @param \phpbb\config\config $config phpBB config
 	*/
-	public function __construct($auth)
+	public function __construct($auth, $config)
 	{
 		$this->auth = $auth;
+		$this->config = $config;
 	}
 
 	/**
diff --git a/tests/unit/acp/move_module_test.php b/tests/unit/acp/move_module_test.php
index a76d389b..5a1e49b8 100644
--- a/tests/unit/acp/move_module_test.php
+++ b/tests/unit/acp/move_module_test.php
@@ -39,7 +39,7 @@ class phpbb_acp_move_module_test extends \board3\portal\tests\testframework\data
 				new \board3\portal\modules\donation($config, $template, $user),
 			));
 		$phpbb_container->set('board3.portal.helper', new \board3\portal\includes\helper($phpbb_container->get('board3.module_collection')));
-		$phpbb_container->set('board3.portal.modules_helper', new \board3\portal\includes\modules_helper(new \phpbb\auth\auth()));
+		$phpbb_container->set('board3.portal.modules_helper', new \board3\portal\includes\modules_helper(new \phpbb\auth\auth(), $config));
 		$phpbb_container->setParameter('board3.modules.table', $table_prefix . 'portal_modules');
 		$phpbb_container->setParameter('board3.config.table', $table_prefix . 'portal_config');
 		$cache = $this->getMock('\phpbb\cache\cache', array('destroy', 'sql_exists', 'get', 'put'));
diff --git a/tests/unit/functions/fetch_news_test.php b/tests/unit/functions/fetch_news_test.php
index 07b834a9..1c5a592f 100644
--- a/tests/unit/functions/fetch_news_test.php
+++ b/tests/unit/functions/fetch_news_test.php
@@ -51,7 +51,7 @@ class phpbb_functions_fetch_news_test extends \board3\portal\tests\testframework
 		$this->auth = $auth;
 		$this->user = $user;
 		$phpbb_container = new \phpbb_mock_container_builder();
-		$this->modules_helper = new \board3\portal\includes\modules_helper($auth);
+		$this->modules_helper = new \board3\portal\includes\modules_helper($auth, $this->config);
 		$phpbb_container->set('board3.portal.modules_helper', $this->modules_helper);
 		$phpbb_container->set('board3.portal.fetch_posts', new \board3\portal\portal\fetch_posts($auth, $cache, $this->config, $this->db, $this->modules_helper, $user));
 		$template = $this->getMock('\phpbb\template', array('set_filenames', 'destroy_block_vars', 'assign_block_vars', 'assign_display'));
diff --git a/tests/unit/includes/modules_helper_test.php b/tests/unit/includes/modules_helper_test.php
index 1d1633ae..d7ed2e94 100644
--- a/tests/unit/includes/modules_helper_test.php
+++ b/tests/unit/includes/modules_helper_test.php
@@ -24,8 +24,9 @@ class board3_includes_modules_helper_test extends \board3\portal\tests\testframe
 		parent::setUp();
 
 		$auth = new \phpbb\auth\auth();
+		$config = new \phpbb\config\config(array());
 
-		$this->modules_helper = new \board3\portal\includes\modules_helper($auth);
+		$this->modules_helper = new \board3\portal\includes\modules_helper($auth, $config);
 	}
 
 	public function data_get_disallowed_forums()
diff --git a/tests/unit/portal/fetch_posts_test.php b/tests/unit/portal/fetch_posts_test.php
index da42eaf5..4e2ff7c0 100644
--- a/tests/unit/portal/fetch_posts_test.php
+++ b/tests/unit/portal/fetch_posts_test.php
@@ -50,7 +50,7 @@ class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\d
 		// Pretend to allow downloads in forum 1
 		$auth->acl[1][0] = true;
 		$this->auth = $auth;
-		$this->modules_helper = new \board3\portal\includes\modules_helper($auth);
+		$this->modules_helper = new \board3\portal\includes\modules_helper($auth, $this->config);
 		$this->user = $user;
 		$template = $this->getMock('\phpbb\template', array('set_filenames', 'destroy_block_vars', 'assign_block_vars', 'assign_display'));
 		$this->fetch_posts = new \board3\portal\portal\fetch_posts($auth, $cache, $this->config, $this->db, $this->modules_helper, $user);