[ticket/11832] Make $phpbb_container a global initiated by the framework

Setup common items needed from the container (e.g. filesystem)

PHPBB3-11832

5 files changed, 27 insertions, 11 deletions

diff --git a/tests/acp_board/select_auth_method_test.php b/tests/acp_board/select_auth_method_test.php
index 91aa5d1232..aaad05b33a 100644
--- a/tests/acp_board/select_auth_method_test.php
+++ b/tests/acp_board/select_auth_method_test.php
@@ -27,10 +27,7 @@ class phpbb_acp_board_select_auth_method_test extends phpbb_test_case
 	{
 		parent::setUp();
 
-		global $phpbb_container;
-		$phpbb_container = new phpbb_mock_container_builder();
-
-		$phpbb_container->set('auth.provider_collection', array(
+		$this->phpbb_container->set('auth.provider_collection', array(
 				'auth.provider.acp_board_valid'		=> new phpbb_auth_provider_acp_board_valid,
 				'auth.provider.acp_board_invalid'	=> new phpbb_auth_provider_acp_board_invalid,
 		));
diff --git a/tests/content_visibility/delete_post_test.php b/tests/content_visibility/delete_post_test.php
index 6234aac9ad..f5df5e9cba 100644
--- a/tests/content_visibility/delete_post_test.php
+++ b/tests/content_visibility/delete_post_test.php
@@ -262,7 +262,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 	*/
 	public function test_delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason, $expected_posts, $expected_topic, $expected_forum)
 	{
-		global $auth, $cache, $config, $db, $phpbb_container, $phpbb_root_path, $phpEx;
+		global $auth, $cache, $config, $db, $phpbb_root_path, $phpEx;
 
 		$config['search_type'] = 'phpbb_mock_search';
 		$cache = new phpbb_mock_cache;
@@ -279,9 +279,8 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 			)));
 		$user = $this->getMock('phpbb_user');
 
-		$phpbb_container = new phpbb_mock_container_builder();
-		$phpbb_container->set('notification_manager', new phpbb_mock_notification_manager());
-		$phpbb_container->set('content.visibility', new phpbb_content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE));
+		$this->phpbb_container->set('notification_manager', new phpbb_mock_notification_manager());
+		$this->phpbb_container->set('content.visibility', new phpbb_content_visibility($auth, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE));
 
 		delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason);
 
diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php
index a634863fb6..6827aaa1b6 100644
--- a/tests/log/function_view_log_test.php
+++ b/tests/log/function_view_log_test.php
@@ -23,10 +23,8 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 
 	public static function view_log_function_data()
 	{
-		global $phpEx, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path;
+		global $phpEx, $phpbb_dispatcher;
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
-		$phpbb_container = new phpbb_mock_container_builder();
-		$phpbb_container->set('filesystem', new phpbb_filesystem($phpbb_root_path));
 
 		$expected_data_sets = array(
 			1 => array(
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index c72ea5f765..124706afa6 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -17,9 +17,20 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 	protected $fixture_xml_data;
 
+	protected $phpbb_container;
+
 	public function __construct($name = NULL, array $data = array(), $dataName = '')
 	{
 		parent::__construct($name, $data, $dataName);
+	
+		global $phpbb_container, $phpbb_root_path;
+
+		// Setup the container for global usage
+		$this->phpbb_container = $phpbb_container = new phpbb_mock_container_builder();
+
+		// Set some commonly needed systems up
+		$phpbb_container->set('filesystem', new phpbb_filesystem($phpbb_root_path));
+
 		$this->backupStaticAttributesBlacklist += array(
 			'PHP_CodeCoverage' => array('instance'),
 			'PHP_CodeCoverage_Filter' => array('instance'),
diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php
index 8b16f02638..48c2f48887 100644
--- a/tests/test_framework/phpbb_test_case.php
+++ b/tests/test_framework/phpbb_test_case.php
@@ -11,9 +11,20 @@ class phpbb_test_case extends PHPUnit_Framework_TestCase
 {
 	protected $test_case_helpers;
 
+	protected $phpbb_container;
+
 	public function __construct($name = NULL, array $data = array(), $dataName = '')
 	{
 		parent::__construct($name, $data, $dataName);
+
+		global $phpbb_container, $phpbb_root_path;
+
+		// Setup the container for global usage
+		$this->phpbb_container = $phpbb_container = new phpbb_mock_container_builder();
+
+		// Set some commonly needed systems up
+		$phpbb_container->set('filesystem', new phpbb_filesystem($phpbb_root_path));
+
 		$this->backupStaticAttributesBlacklist += array(
 			'PHP_CodeCoverage' => array('instance'),
 			'PHP_CodeCoverage_Filter' => array('instance'),