[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Inject SpecialMyLanguageFallbackChain dependencies

2017-01-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332013 )

Change subject: Inject SpecialMyLanguageFallbackChain dependencies
..


Inject SpecialMyLanguageFallbackChain dependencies

Bug: T155286
Change-Id: I4c51a2eb8e620ce89963259b596cfaa0799c67df
---
M repo/Wikibase.php
M repo/includes/Specials/SpecialMyLanguageFallbackChain.php
M repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php
3 files changed, 18 insertions(+), 8 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index a056e5d..2772e83 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -307,8 +307,11 @@
$wgSpecialPages['ListProperties'] = 
Wikibase\Repo\Specials\SpecialListProperties::class;
$wgSpecialPages['DispatchStats'] = 
Wikibase\Repo\Specials\SpecialDispatchStats::class;
$wgSpecialPages['EntityData'] = 
Wikibase\Repo\Specials\SpecialEntityData::class;
-   $wgSpecialPages['MyLanguageFallbackChain']
-   = Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain::class;
+   $wgSpecialPages['MyLanguageFallbackChain'] = function() {
+   return new 
Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain(
+   
\Wikibase\Repo\WikibaseRepo::getDefaultInstance()->getLanguageFallbackChainFactory()
+   );
+   };
$wgSpecialPages['MergeItems'] = 
Wikibase\Repo\Specials\SpecialMergeItems::class;
$wgSpecialPages['RedirectEntity'] = 
Wikibase\Repo\Specials\SpecialRedirectEntity::class;
 
diff --git a/repo/includes/Specials/SpecialMyLanguageFallbackChain.php 
b/repo/includes/Specials/SpecialMyLanguageFallbackChain.php
index a48bc9a..f3ea890 100644
--- a/repo/includes/Specials/SpecialMyLanguageFallbackChain.php
+++ b/repo/includes/Specials/SpecialMyLanguageFallbackChain.php
@@ -29,15 +29,17 @@
/**
 * @var LanguageFallbackChainFactory
 */
-   private $factory;
+   private $languageFallbackChainFactory;
 
/**
-* @since 0.4
+* @param LanguageFallbackChainFactory $languageFallbackChainFactory
 */
-   public function __construct() {
+   public function __construct(
+   LanguageFallbackChainFactory $languageFallbackChainFactory
+   ) {
parent::__construct( 'MyLanguageFallbackChain' );
 
-   $this->factory = 
WikibaseRepo::getDefaultInstance()->getLanguageFallbackChainFactory();
+   $this->languageFallbackChainFactory = 
$languageFallbackChainFactory;
}
 
/**
@@ -77,7 +79,9 @@
 */
public function getLanguageFallbackChain() {
if ( $this->chain === null ) {
-   $this->setLanguageFallbackChain( 
$this->factory->newFromContext( $this->getContext() ) );
+   $this->setLanguageFallbackChain(
+   
$this->languageFallbackChainFactory->newFromContext( $this->getContext() )
+   );
}
return $this->chain;
}
diff --git 
a/repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php 
b/repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php
index ef5075a..b0baa79 100644
--- 
a/repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php
+++ 
b/repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php
@@ -4,6 +4,7 @@
 
 use SpecialPageTestBase;
 use Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain;
+use Wikibase\Repo\WikibaseRepo;
 
 /**
  * @covers Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain
@@ -19,7 +20,9 @@
 class SpecialMyLanguageFallbackChainTest extends SpecialPageTestBase {
 
protected function newSpecialPage() {
-   return new SpecialMyLanguageFallbackChain();
+   return new SpecialMyLanguageFallbackChain(
+   
WikibaseRepo::getDefaultInstance()->getLanguageFallbackChainFactory()
+   );
}
 
public function testExecute() {

-- 
To view, visit https://gerrit.wikimedia.org/r/332013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c51a2eb8e620ce89963259b596cfaa0799c67df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Inject SpecialMyLanguageFallbackChain dependencies

2017-01-13 Thread Ladsgroup (Code Review) 
Ladsgroup has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/332013 )

Change subject: Inject SpecialMyLanguageFallbackChain dependencies
..

Inject SpecialMyLanguageFallbackChain dependencies

Bug: T155286
Change-Id: I4c51a2eb8e620ce89963259b596cfaa0799c67df
---
M repo/Wikibase.php
M repo/includes/Specials/SpecialMyLanguageFallbackChain.php
M repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php
3 files changed, 18 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/13/332013/1

diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index a056e5d..2772e83 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -307,8 +307,11 @@
$wgSpecialPages['ListProperties'] = 
Wikibase\Repo\Specials\SpecialListProperties::class;
$wgSpecialPages['DispatchStats'] = 
Wikibase\Repo\Specials\SpecialDispatchStats::class;
$wgSpecialPages['EntityData'] = 
Wikibase\Repo\Specials\SpecialEntityData::class;
-   $wgSpecialPages['MyLanguageFallbackChain']
-   = Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain::class;
+   $wgSpecialPages['MyLanguageFallbackChain'] = function() {
+   return new 
Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain(
+   
\Wikibase\Repo\WikibaseRepo::getDefaultInstance()->getLanguageFallbackChainFactory()
+   );
+   };
$wgSpecialPages['MergeItems'] = 
Wikibase\Repo\Specials\SpecialMergeItems::class;
$wgSpecialPages['RedirectEntity'] = 
Wikibase\Repo\Specials\SpecialRedirectEntity::class;
 
diff --git a/repo/includes/Specials/SpecialMyLanguageFallbackChain.php 
b/repo/includes/Specials/SpecialMyLanguageFallbackChain.php
index a48bc9a..f3ea890 100644
--- a/repo/includes/Specials/SpecialMyLanguageFallbackChain.php
+++ b/repo/includes/Specials/SpecialMyLanguageFallbackChain.php
@@ -29,15 +29,17 @@
/**
 * @var LanguageFallbackChainFactory
 */
-   private $factory;
+   private $languageFallbackChainFactory;
 
/**
-* @since 0.4
+* @param LanguageFallbackChainFactory $languageFallbackChainFactory
 */
-   public function __construct() {
+   public function __construct(
+   LanguageFallbackChainFactory $languageFallbackChainFactory
+   ) {
parent::__construct( 'MyLanguageFallbackChain' );
 
-   $this->factory = 
WikibaseRepo::getDefaultInstance()->getLanguageFallbackChainFactory();
+   $this->languageFallbackChainFactory = 
$languageFallbackChainFactory;
}
 
/**
@@ -77,7 +79,9 @@
 */
public function getLanguageFallbackChain() {
if ( $this->chain === null ) {
-   $this->setLanguageFallbackChain( 
$this->factory->newFromContext( $this->getContext() ) );
+   $this->setLanguageFallbackChain(
+   
$this->languageFallbackChainFactory->newFromContext( $this->getContext() )
+   );
}
return $this->chain;
}
diff --git 
a/repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php 
b/repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php
index ef5075a..b0baa79 100644
--- 
a/repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php
+++ 
b/repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php
@@ -4,6 +4,7 @@
 
 use SpecialPageTestBase;
 use Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain;
+use Wikibase\Repo\WikibaseRepo;
 
 /**
  * @covers Wikibase\Repo\Specials\SpecialMyLanguageFallbackChain
@@ -19,7 +20,9 @@
 class SpecialMyLanguageFallbackChainTest extends SpecialPageTestBase {
 
protected function newSpecialPage() {
-   return new SpecialMyLanguageFallbackChain();
+   return new SpecialMyLanguageFallbackChain(
+   
WikibaseRepo::getDefaultInstance()->getLanguageFallbackChainFactory()
+   );
}
 
public function testExecute() {

-- 
To view, visit https://gerrit.wikimedia.org/r/332013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c51a2eb8e620ce89963259b596cfaa0799c67df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits