From 920ef42ae0923219ac42eef8d0822726834c5a9e Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Mon, 26 Jan 2015 23:00:07 -0800 Subject: [PATCH] registration: Ignore keys prefixed with @ in "config" This will allow for documentation of individual configuration options. Change-Id: I180bc742c96985c2a8358aef814d993fca9aba84 --- includes/registration/ExtensionProcessor.php | 4 +++- .../phpunit/includes/registration/ExtensionProcessorTest.php | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php index fe86ca927b..25222f6568 100644 --- a/includes/registration/ExtensionProcessor.php +++ b/includes/registration/ExtensionProcessor.php @@ -237,7 +237,9 @@ class ExtensionProcessor implements Processor { protected function extractConfig( array $info ) { if ( isset( $info['config'] ) ) { foreach ( $info['config'] as $key => $val ) { - $this->globals["wg$key"] = $val; + if ( $key[0] !== '@' ) { + $this->globals["wg$key"] = $val; + } } $this->processed[] = 'config'; } diff --git a/tests/phpunit/includes/registration/ExtensionProcessorTest.php b/tests/phpunit/includes/registration/ExtensionProcessorTest.php index e57c2b340a..96df354b01 100644 --- a/tests/phpunit/includes/registration/ExtensionProcessorTest.php +++ b/tests/phpunit/includes/registration/ExtensionProcessorTest.php @@ -87,12 +87,14 @@ class ExtensionProcessorTest extends MediaWikiTestCase { 'config' => array( 'Bar' => 'somevalue', 'Foo' => 10, + '@IGNORED' => 'yes', ), ) + self::$default; $processor->extractInfo( $this->dir, $info ); $extracted = $processor->getExtractedInfo(); $this->assertEquals( 'somevalue', $extracted['globals']['wgBar'] ); $this->assertEquals( 10, $extracted['globals']['wgFoo'] ); + $this->assertArrayNotHasKey( 'wg@IGNORED', $extracted['globals'] ); } public static function provideSetToGlobal() { -- 2.20.1