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 "filebackend: rename and simplify header sanitizing methods in SwiftFileBackend"
[lhc/web/wiklou.git]
/
includes
/
ServiceWiring.php
diff --git
a/includes/ServiceWiring.php
b/includes/ServiceWiring.php
index
d081629
..
689a98e
100644
(file)
--- a/
includes/ServiceWiring.php
+++ b/
includes/ServiceWiring.php
@@
-77,9
+77,7
@@
use Wikimedia\ObjectFactory;
return [
'ActorMigration' => function ( MediaWikiServices $services ) : ActorMigration {
return [
'ActorMigration' => function ( MediaWikiServices $services ) : ActorMigration {
- return new ActorMigration(
- $services->getMainConfig()->get( 'ActorTableSchemaMigrationStage' )
- );
+ return new ActorMigration( SCHEMA_COMPAT_NEW );
},
'BadFileLookup' => function ( MediaWikiServices $services ) : BadFileLookup {
},
'BadFileLookup' => function ( MediaWikiServices $services ) : BadFileLookup {
@@
-109,13
+107,10
@@
return [
},
'BlockManager' => function ( MediaWikiServices $services ) : BlockManager {
},
'BlockManager' => function ( MediaWikiServices $services ) : BlockManager {
- $context = RequestContext::getMain();
return new BlockManager(
new ServiceOptions(
BlockManager::$constructorOptions, $services->getMainConfig()
),
return new BlockManager(
new ServiceOptions(
BlockManager::$constructorOptions, $services->getMainConfig()
),
- $context->getUser(),
- $context->getRequest(),
$services->getPermissionManager()
);
},
$services->getPermissionManager()
);
},
@@
-287,9
+282,9
@@
return [
'LocalServerObjectCache' => function ( MediaWikiServices $services ) : BagOStuff {
$config = $services->getMainConfig();
'LocalServerObjectCache' => function ( MediaWikiServices $services ) : BagOStuff {
$config = $services->getMainConfig();
- $cacheId =
\
ObjectCache::detectLocalServerCache();
+ $cacheId = ObjectCache::detectLocalServerCache();
- return
\
ObjectCache::newFromParams( $config->get( 'ObjectCaches' )[$cacheId] );
+ return ObjectCache::newFromParams( $config->get( 'ObjectCaches' )[$cacheId] );
},
'LockManagerGroupFactory' => function ( MediaWikiServices $services ) : LockManagerGroupFactory {
},
'LockManagerGroupFactory' => function ( MediaWikiServices $services ) : LockManagerGroupFactory {
@@
-318,7
+313,7
@@
return [
"Cache type \"$id\" is not present in \$wgObjectCaches." );
}
"Cache type \"$id\" is not present in \$wgObjectCaches." );
}
- return
\
ObjectCache::newFromParams( $mainConfig->get( 'ObjectCaches' )[$id] );
+ return ObjectCache::newFromParams( $mainConfig->get( 'ObjectCaches' )[$id] );
},
'MainWANObjectCache' => function ( MediaWikiServices $services ) : WANObjectCache {
},
'MainWANObjectCache' => function ( MediaWikiServices $services ) : WANObjectCache {
@@
-338,7
+333,7
@@
return [
}
$params['store'] = $mainConfig->get( 'ObjectCaches' )[$objectCacheId];
}
$params['store'] = $mainConfig->get( 'ObjectCaches' )[$objectCacheId];
- return
\
ObjectCache::newWANCacheFromParams( $params );
+ return ObjectCache::newWANCacheFromParams( $params );
},
'MediaHandlerFactory' => function ( MediaWikiServices $services ) : MediaHandlerFactory {
},
'MediaHandlerFactory' => function ( MediaWikiServices $services ) : MediaHandlerFactory {
@@
-362,6
+357,7
@@
return [
'MessageFormatterFactory' =>
function ( MediaWikiServices $services ) : IMessageFormatterFactory {
'MessageFormatterFactory' =>
function ( MediaWikiServices $services ) : IMessageFormatterFactory {
+ // @phan-suppress-next-line PhanAccessMethodInternal
return new MessageFormatterFactory();
},
return new MessageFormatterFactory();
},
@@
-493,8
+489,7
@@
return [
// 'class' and 'preprocessorClass'
$services->getMainConfig()->get( 'ParserConf' ),
// Make sure to have defaults in case someone overrode ParserConf with something silly
// 'class' and 'preprocessorClass'
$services->getMainConfig()->get( 'ParserConf' ),
// Make sure to have defaults in case someone overrode ParserConf with something silly
- [ 'class' => Parser::class,
- 'preprocessorClass' => Parser::getDefaultPreprocessorClass() ],
+ [ 'class' => Parser::class, 'preprocessorClass' => Preprocessor_Hash::class ],
// Plus a buch of actual config options
$services->getMainConfig()
);
// Plus a buch of actual config options
$services->getMainConfig()
);
@@
-547,7
+542,8
@@
return [
$services->getContentLanguage(),
AuthManager::singleton(),
$services->getLinkRendererFactory()->create(),
$services->getContentLanguage(),
AuthManager::singleton(),
$services->getLinkRendererFactory()->create(),
- $services->getNamespaceInfo()
+ $services->getNamespaceInfo(),
+ $services->getPermissionManager()
);
$factory->setLogger( LoggerFactory::getInstance( 'preferences' ) );
);
$factory->setLogger( LoggerFactory::getInstance( 'preferences' ) );
@@
-734,7
+730,8
@@
return [
return new SpecialPageFactory(
new ServiceOptions(
SpecialPageFactory::$constructorOptions, $services->getMainConfig() ),
return new SpecialPageFactory(
new ServiceOptions(
SpecialPageFactory::$constructorOptions, $services->getMainConfig() ),
- $services->getContentLanguage()
+ $services->getContentLanguage(),
+ $services->getObjectFactory()
);
},
);
},
@@
-830,6
+827,7
@@
return [
},
'_SqlBlobStore' => function ( MediaWikiServices $services ) : SqlBlobStore {
},
'_SqlBlobStore' => function ( MediaWikiServices $services ) : SqlBlobStore {
+ // @phan-suppress-next-line PhanAccessMethodInternal
return $services->getBlobStoreFactory()->newSqlBlobStore();
},
return $services->getBlobStoreFactory()->newSqlBlobStore();
},