X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fregistration%2FExtensionProcessor.php;h=0d0a6e47619f444621602b314c365295bd92503f;hb=08b2cf66387856c623ff99bca4a83db2b7d8c9e6;hp=fe617c54bb839aa9e2b1a76a713b1eb89d089bf3;hpb=766b71ef7f65ac1866341782e7235ee5b0c55648;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index fe617c54bb..0d0a6e4761 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -197,8 +197,20 @@ class ExtensionProcessor implements Processor {
 		$this->extractMessagesDirs( $dir, $info );
 		$this->extractNamespaces( $info );
 		$this->extractResourceLoaderModules( $dir, $info );
-		$this->extractServiceWiringFiles( $dir, $info );
-		$this->extractParserTestFiles( $dir, $info );
+		if ( isset( $info['ServiceWiringFiles'] ) ) {
+			$this->extractPathBasedGlobal(
+				'wgServiceWiringFiles',
+				$dir,
+				$info['ServiceWiringFiles']
+			);
+		}
+		if ( isset( $info['ParserTestFiles'] ) ) {
+			$this->extractPathBasedGlobal(
+				'wgParserTestFiles',
+				$dir,
+				$info['ParserTestFiles']
+			);
+		}
 		$name = $this->extractCredits( $path, $info );
 		if ( isset( $info['callback'] ) ) {
 			$this->callbacks[$name] = $info['callback'];
@@ -499,19 +511,9 @@ class ExtensionProcessor implements Processor {
 		$this->globals[$key] = $value;
 	}
 
-	protected function extractServiceWiringFiles( $dir, array $info ) {
-		if ( isset( $info['ServiceWiringFiles'] ) ) {
-			foreach ( $info['ServiceWiringFiles'] as $path ) {
-				$this->globals['wgServiceWiringFiles'][] = "$dir/$path";
-			}
-		}
-	}
-
-	protected function extractParserTestFiles( $dir, array $info ) {
-		if ( isset( $info['ParserTestFiles'] ) ) {
-			foreach ( $info['ParserTestFiles'] as $path ) {
-				$this->globals['wgParserTestFiles'][] = "$dir/$path";
-			}
+	protected function extractPathBasedGlobal( $global, $dir, $paths ) {
+		foreach ( $paths as $path ) {
+			$this->globals[$global][] = "$dir/$path";
 		}
 	}