mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
This reverts commit 5e09afa0bc.
This commit is contained in:
Nathan Guse
2013-09-10 10:06:13 -05:00
parent 5e09afa0bc
commit d5f93f5ce4
5 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/test_framework/phpbb_database_test_case.php
View File

@@ -17,20 +17,9 @@ 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'),

11
tests/test_framework/phpbb_test_case.php
View File

@@ -11,20 +11,9 @@ 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'),