[MediaWiki-commits] [Gerrit] Don't abbreviate WikibaseRepo with $repo - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/185841

Change subject: Don't abbreviate WikibaseRepo with $repo
......................................................................

Don't abbreviate WikibaseRepo with $repo

$repo does have to many different meanings in our code base.

This is split from I04767f2.

Change-Id: I1ad6cbd1f2b8e87ea4d45ad5609a2c54a0793aee
---
M repo/tests/phpunit/includes/content/EntityHandlerTest.php
M repo/tests/phpunit/includes/content/ItemHandlerTest.php
M repo/tests/phpunit/includes/content/PropertyHandlerTest.php
3 files changed, 4 insertions(+), 6 deletions(-)


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

diff --git a/repo/tests/phpunit/includes/content/EntityHandlerTest.php 
b/repo/tests/phpunit/includes/content/EntityHandlerTest.php
index 11c94f1..f990086 100644
--- a/repo/tests/phpunit/includes/content/EntityHandlerTest.php
+++ b/repo/tests/phpunit/includes/content/EntityHandlerTest.php
@@ -52,7 +52,7 @@
         *
         * @return WikibaseRepo
         */
-       protected function getRepo( SettingsArray $settings = null ) {
+       protected function getWikibaseRepo( SettingsArray $settings = null ) {
                $repoSettings = 
WikibaseRepo::getDefaultInstance()->getSettings()->getArrayCopy();
 
                if ( $settings ) {
@@ -416,7 +416,7 @@
                $settings->setSetting( 'internalEntitySerializerClass', null );
 
                $entity = $this->newEntity();
-               $currentSerializer = $this->getRepo( $settings 
)->getInternalEntitySerializer();
+               $currentSerializer = $this->getWikibaseRepo( $settings 
)->getInternalEntitySerializer();
                $expected = json_encode( $currentSerializer->serialize( $entity 
) );
 
                $handler = $this->getHandler( $settings, $codec );
diff --git a/repo/tests/phpunit/includes/content/ItemHandlerTest.php 
b/repo/tests/phpunit/includes/content/ItemHandlerTest.php
index b9458c4..08bec64 100644
--- a/repo/tests/phpunit/includes/content/ItemHandlerTest.php
+++ b/repo/tests/phpunit/includes/content/ItemHandlerTest.php
@@ -150,8 +150,7 @@
         * @return ItemHandler
         */
        protected function getHandler( SettingsArray $settings = null ) {
-               $repo = $this->getRepo( $settings );
-               return $repo->newItemHandler();
+               return $this->getWikibaseRepo( $settings )->newItemHandler();
        }
 
 }
diff --git a/repo/tests/phpunit/includes/content/PropertyHandlerTest.php 
b/repo/tests/phpunit/includes/content/PropertyHandlerTest.php
index aa80779..c05f53f 100644
--- a/repo/tests/phpunit/includes/content/PropertyHandlerTest.php
+++ b/repo/tests/phpunit/includes/content/PropertyHandlerTest.php
@@ -94,8 +94,7 @@
         * @return PropertyHandler
         */
        protected function getHandler( SettingsArray $settings = null ) {
-               $repo = $this->getRepo( $settings );
-               return $repo->newPropertyHandler();
+               return $this->getWikibaseRepo( $settings 
)->newPropertyHandler();
        }
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ad6cbd1f2b8e87ea4d45ad5609a2c54a0793aee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>

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