1
0
Fork 0

Merge branch '2.3'

pull/10933/head
Jordi Boggiano 2022-07-01 12:24:58 +02:00
commit c422fefda4
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 3 additions and 3 deletions

View File

@ -409,7 +409,7 @@ class ConfigTest extends TestCase
} }
} }
public function testMergesPluginConfig() public function testMergesPluginConfig(): void
{ {
$config = new Config(false); $config = new Config(false);
$config->merge(array('config' => array('allow-plugins' => array('some/plugin' => true)))); $config->merge(array('config' => array('allow-plugins' => array('some/plugin' => true))));
@ -419,7 +419,7 @@ class ConfigTest extends TestCase
$this->assertEquals(array('some/plugin' => true, 'another/plugin' => true), $config->get('allow-plugins')); $this->assertEquals(array('some/plugin' => true, 'another/plugin' => true), $config->get('allow-plugins'));
} }
public function testOverridesGlobalBooleanPluginsConfig() public function testOverridesGlobalBooleanPluginsConfig(): void
{ {
$config = new Config(false); $config = new Config(false);
$config->merge(array('config' => array('allow-plugins' => true))); $config->merge(array('config' => array('allow-plugins' => true)));
@ -429,7 +429,7 @@ class ConfigTest extends TestCase
$this->assertEquals(array('another/plugin' => true), $config->get('allow-plugins')); $this->assertEquals(array('another/plugin' => true), $config->get('allow-plugins'));
} }
public function testAllowsAllPluginsFromLocalBoolean() public function testAllowsAllPluginsFromLocalBoolean(): void
{ {
$config = new Config(false); $config = new Config(false);
$config->merge(array('config' => array('allow-plugins' => array('some/plugin' => true)))); $config->merge(array('config' => array('allow-plugins' => array('some/plugin' => true))));