dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Move up devunt's name to Developers"
[lhc/web/wiklou.git]
/
includes
/
registration
/
ExtensionProcessor.php
diff --git
a/includes/registration/ExtensionProcessor.php
b/includes/registration/ExtensionProcessor.php
index
5555e8b
..
745c233
100644
(file)
--- a/
includes/registration/ExtensionProcessor.php
+++ b/
includes/registration/ExtensionProcessor.php
@@
-110,6
+110,7
@@
class ExtensionProcessor implements Processor {
'type',
'config',
'config_prefix',
'type',
'config',
'config_prefix',
+ 'ServiceWiringFiles',
'ParserTestFiles',
'AutoloadClasses',
'manifest_version',
'ParserTestFiles',
'AutoloadClasses',
'manifest_version',
@@
-174,6
+175,7
@@
class ExtensionProcessor implements Processor {
$this->extractMessagesDirs( $dir, $info );
$this->extractNamespaces( $info );
$this->extractResourceLoaderModules( $dir, $info );
$this->extractMessagesDirs( $dir, $info );
$this->extractNamespaces( $info );
$this->extractResourceLoaderModules( $dir, $info );
+ $this->extractServiceWiringFiles( $dir, $info );
$this->extractParserTestFiles( $dir, $info );
if ( isset( $info['callback'] ) ) {
$this->callbacks[] = $info['callback'];
$this->extractParserTestFiles( $dir, $info );
if ( isset( $info['callback'] ) ) {
$this->callbacks[] = $info['callback'];
@@
-406,6
+408,14
@@
class ExtensionProcessor implements Processor {
}
}
}
}
+ 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 ) {
protected function extractParserTestFiles( $dir, array $info ) {
if ( isset( $info['ParserTestFiles'] ) ) {
foreach ( $info['ParserTestFiles'] as $path ) {