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 "Update documentation of getPageviewToken"
[lhc/web/wiklou.git]
/
includes
/
ServiceWiring.php
diff --git
a/includes/ServiceWiring.php
b/includes/ServiceWiring.php
index
e5ebe2d
..
59cdec9
100644
(file)
--- a/
includes/ServiceWiring.php
+++ b/
includes/ServiceWiring.php
@@
-37,6
+37,7
@@
* MediaWiki code base.
*/
* MediaWiki code base.
*/
+use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
use MediaWiki\Auth\AuthManager;
use MediaWiki\Config\ConfigRepository;
use MediaWiki\Interwiki\ClassicInterwikiLookup;
use MediaWiki\Auth\AuthManager;
use MediaWiki\Config\ConfigRepository;
use MediaWiki\Interwiki\ClassicInterwikiLookup;
@@
-48,7
+49,9
@@
use MediaWiki\MediaWikiServices;
use MediaWiki\Preferences\PreferencesFactory;
use MediaWiki\Preferences\DefaultPreferencesFactory;
use MediaWiki\Shell\CommandFactory;
use MediaWiki\Preferences\PreferencesFactory;
use MediaWiki\Preferences\DefaultPreferencesFactory;
use MediaWiki\Shell\CommandFactory;
+use MediaWiki\Special\SpecialPageFactory;
use MediaWiki\Storage\BlobStore;
use MediaWiki\Storage\BlobStore;
+use MediaWiki\Revision\RevisionRenderer;
use MediaWiki\Storage\BlobStoreFactory;
use MediaWiki\Storage\NameTableStore;
use MediaWiki\Storage\RevisionFactory;
use MediaWiki\Storage\BlobStoreFactory;
use MediaWiki\Storage\NameTableStore;
use MediaWiki\Storage\RevisionFactory;
@@
-70,7
+73,7
@@
return [
'BlobStoreFactory' => function ( MediaWikiServices $services ) : BlobStoreFactory {
return new BlobStoreFactory(
'BlobStoreFactory' => function ( MediaWikiServices $services ) : BlobStoreFactory {
return new BlobStoreFactory(
- $services->getDBLoadBalancer(),
+ $services->getDBLoadBalancer
Factory
(),
$services->getMainWANObjectCache(),
$services->getMainConfig(),
$services->getContentLanguage()
$services->getMainWANObjectCache(),
$services->getMainConfig(),
$services->getContentLanguage()
@@
-385,7
+388,8
@@
return [
$services->getMainConfig()->get( 'ParserConf' ),
$services->getMagicWordFactory(),
$services->getContentLanguage(),
$services->getMainConfig()->get( 'ParserConf' ),
$services->getMagicWordFactory(),
$services->getContentLanguage(),
- wfUrlProtocols()
+ wfUrlProtocols(),
+ $services->getSpecialPageFactory()
);
},
);
},
@@
-398,11
+402,12
@@
return [
},
'PerDbNameStatsdDataFactory' =>
},
'PerDbNameStatsdDataFactory' =>
- function ( MediaWikiServices $services ) :
IBufferingStatsdDataFactory
{
+ function ( MediaWikiServices $services ) :
StatsdDataFactoryInterface
{
$config = $services->getMainConfig();
$wiki = $config->get( 'DBname' );
$config = $services->getMainConfig();
$wiki = $config->get( 'DBname' );
- return new BufferingStatsdDataFactory(
- rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ), '.' ) . '.' . $wiki
+ return new PrefixingStatsdDataFactoryProxy(
+ $services->getStatsdDataFactory(),
+ $wiki
);
},
);
},
@@
-441,6
+446,10
@@
return [
return $services->getRevisionStore();
},
return $services->getRevisionStore();
},
+ 'RevisionRenderer' => function ( MediaWikiServices $services ) : RevisionRenderer {
+ return new RevisionRenderer( $services->getDBLoadBalancer() );
+ },
+
'RevisionStore' => function ( MediaWikiServices $services ) : RevisionStore {
return $services->getRevisionStoreFactory()->getRevisionStore();
},
'RevisionStore' => function ( MediaWikiServices $services ) : RevisionStore {
return $services->getRevisionStoreFactory()->getRevisionStore();
},
@@
-545,6
+554,13
@@
return [
);
},
);
},
+ 'SpecialPageFactory' => function ( MediaWikiServices $services ) : SpecialPageFactory {
+ return new SpecialPageFactory(
+ $services->getMainConfig(),
+ $services->getContentLanguage()
+ );
+ },
+
'StatsdDataFactory' => function ( MediaWikiServices $services ) : IBufferingStatsdDataFactory {
return new BufferingStatsdDataFactory(
rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ), '.' )
'StatsdDataFactory' => function ( MediaWikiServices $services ) : IBufferingStatsdDataFactory {
return new BufferingStatsdDataFactory(
rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ), '.' )
@@
-621,7
+637,8
@@
return [
return new MediaWikiTitleCodec(
$services->getContentLanguage(),
$services->getGenderCache(),
return new MediaWikiTitleCodec(
$services->getContentLanguage(),
$services->getGenderCache(),
- $services->getMainConfig()->get( 'LocalInterwikis' )
+ $services->getMainConfig()->get( 'LocalInterwikis' ),
+ $services->getInterwikiLookup()
);
},
);
},