1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander
2021-11-01 16:57:35 +01:00
9 changed files with 117 additions and 5 deletions

View File

@@ -30,6 +30,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
{
parent::setUp();
$this->db = null;
$this->extension_manager = $this->create_extension_manager();
}
@@ -95,7 +96,12 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
$this->assertEquals(array('vendor2/foo'), array_keys($this->extension_manager->all_enabled()));
$this->extension_manager->enable('vendor2/bar');
$this->assertEquals(array('vendor2/bar', 'vendor2/foo'), array_keys($this->extension_manager->all_enabled()));
// We should not display the extension as being enabled in the same request
$this->assertEquals(array('vendor2/foo'), array_keys($this->extension_manager->all_enabled()));
// With a different request we should see the extension as being disabled
$this->assertEquals(array('vendor2/bar', 'vendor2/foo'), array_keys($this->create_extension_manager()->all_enabled()));
$this->assertEquals(array('vendor/moo', 'vendor2/bar', 'vendor2/foo'), array_keys($this->extension_manager->all_configured()));
$this->assertEquals(4, vendor2\bar\ext::$state);
@@ -119,7 +125,12 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
$this->assertEquals(array('vendor2/foo'), array_keys($this->extension_manager->all_enabled()));
$this->extension_manager->disable('vendor2/foo');
$this->assertEquals(array(), array_keys($this->extension_manager->all_enabled()));
// We should still display the extension as being enabled in the current request
$this->assertEquals(array('vendor2/foo'), array_keys($this->extension_manager->all_enabled()));
// With a different request we should see the extension as being disabled
$this->assertEquals(array(), array_keys($this->create_extension_manager()->all_enabled()));
$this->assertEquals(array('vendor/moo', 'vendor2/foo'), array_keys($this->extension_manager->all_configured()));
$this->assertTrue(vendor2\foo\ext::$disabled);
@@ -179,6 +190,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
$db,
$config,
$finder_factory,
new phpbb_mock_dummy_router(),
'phpbb_ext',
__DIR__ . '/',
($with_cache) ? new \phpbb\cache\service(new phpbb_mock_cache(), $config, $db, $phpbb_root_path, $php_ext) : null

View File

@@ -99,6 +99,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$this->db,
$this->config,
$finder_factory,
new phpbb_mock_dummy_router(),
'phpbb_ext',
$this->phpbb_root_path,
$this->cache