Merge "Sort $wgLogActionsHandlers/$wgLogActions/$wgLogHeaders"

[lhc/web/wiklou.git] / tests / phpunit / includes / registration / ExtensionProcessorTest.php

diff --git a/tests/phpunit/includes/registration/ExtensionProcessorTest.php b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
index 9474496..a79c9a8 100644 (file)
--- a/tests/phpunit/includes/registration/ExtensionProcessorTest.php
+++ b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
@@ -14,7 +14,7 @@ class ExtensionProcessorTest extends MediaWikiTestCase {
         *
         * @var array
         */
-       static $default = array(
+       public static $default = array(
                'name' => 'FooBar',
        );
 
@@ -28,7 +28,7 @@ class ExtensionProcessorTest extends MediaWikiTestCase {
                        '@metadata' => array( 'foobarbaz' ),
                        'AnAttribute' => array( 'omg' ),
                        'AutoloadClasses' => array( 'FooBar' => 'includes/FooBar.php' ),
-               ) );
+               ), 1 );
 
                $extracted = $processor->getExtractedInfo();
                $attributes = $extracted['attributes'];
@@ -95,7 +95,7 @@ class ExtensionProcessorTest extends MediaWikiTestCase {
         */
        public function testRegisterHooks( $pre, $info, $expected ) {
                $processor = new MockExtensionProcessor( array( 'wgHooks' => $pre ) );
-               $processor->extractInfo( $this->dir, $info );
+               $processor->extractInfo( $this->dir, $info, 1 );
                $extracted = $processor->getExtractedInfo();
                $this->assertEquals( $expected, $extracted['globals']['wgHooks'] );
        }
@@ -112,7 +112,7 @@ class ExtensionProcessorTest extends MediaWikiTestCase {
                                '@IGNORED' => 'yes',
                        ),
                ) + self::$default;
-               $processor->extractInfo( $this->dir, $info );
+               $processor->extractInfo( $this->dir, $info, 1 );
                $extracted = $processor->getExtractedInfo();
                $this->assertEquals( 'somevalue', $extracted['globals']['wgBar'] );
                $this->assertEquals( 10, $extracted['globals']['wgFoo'] );
@@ -149,7 +149,7 @@ class ExtensionProcessorTest extends MediaWikiTestCase {
         */
        public function testExtracttExtensionMessagesFiles( $input, $expected ) {
                $processor = new ExtensionProcessor();
-               $processor->extractInfo( $this->dir, $input + self::$default );
+               $processor->extractInfo( $this->dir, $input + self::$default, 1 );
                $out = $processor->getExtractedInfo();
                foreach ( $expected as $key => $value ) {
                        $this->assertEquals( $value, $out['globals'][$key] );
@@ -177,7 +177,7 @@ class ExtensionProcessorTest extends MediaWikiTestCase {
         */
        public function testExtractMessagesDirs( $input, $expected ) {
                $processor = new ExtensionProcessor();
-               $processor->extractInfo( $this->dir, $input + self::$default );
+               $processor->extractInfo( $this->dir, $input + self::$default, 1 );
                $out = $processor->getExtractedInfo();
                foreach ( $expected as $key => $value ) {
                        $this->assertEquals( $value, $out['globals'][$key] );
@@ -190,7 +190,7 @@ class ExtensionProcessorTest extends MediaWikiTestCase {
         */
        public function testExtractResourceLoaderModules( $input, $expected ) {
                $processor = new ExtensionProcessor();
-               $processor->extractInfo( $this->dir, $input + self::$default );
+               $processor->extractInfo( $this->dir, $input + self::$default, 1 );
                $out = $processor->getExtractedInfo();
                foreach ( $expected as $key => $value ) {
                        $this->assertEquals( $value, $out['globals'][$key] );