[MediaWiki-commits] [Gerrit] Trim site name on Special:SetSiteLink - change (mediawiki...Wikibase)

[WMDE]

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

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

Change subject: Trim site name on Special:SetSiteLink
......................................................................

Trim site name on Special:SetSiteLink

... plus a bit of code clean-up.

Change-Id: Ia1d5b4a63bba83b39a085725e8c4cbcdd4cc3d85
---
M repo/includes/specials/SpecialSetSiteLink.php
M repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php
2 files changed, 12 insertions(+), 27 deletions(-)


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

diff --git a/repo/includes/specials/SpecialSetSiteLink.php 
b/repo/includes/specials/SpecialSetSiteLink.php
index 629fe6b..60c9c97 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -109,8 +109,7 @@
                        $this->entityRevision = null;
                }
 
-               // site
-               $this->site = $request->getVal( 'site', isset( $parts[1] ) ? 
$parts[1] : '' );
+               $this->site = trim( $request->getVal( 'site', isset( $parts[1] 
) ? $parts[1] : '' ) );
 
                if ( $this->site === '' ) {
                        $this->site = null;
@@ -120,10 +119,8 @@
                        $this->showErrorHTML( $this->msg( 
'wikibase-setsitelink-invalid-site', $this->site )->parse() );
                }
 
-               // title
                $this->page = $request->getVal( 'page' );
 
-               // badges
                $this->badges = $request->getArray( 'badges', array() );
        }
 
@@ -367,18 +364,12 @@
         * @throws OutOfBoundsException
         * @return string
         */
-       protected function getSiteLink( $entity, $siteId ) {
-               if ( $entity === null || !( $entity instanceof Item ) ) {
+       protected function getSiteLink( Item $entity = null, $siteId ) {
+               if ( $entity === null || !$entity->hasLinkToSite( $siteId ) ) {
                        return '';
                }
 
-               /* @var Item $entity */
-
-               if ( $entity->hasLinkToSite( $siteId ) ) {
-                       return $entity->getSitelink( $siteId )->getPageName();
-               }
-
-               return '';
+               return $entity->getSitelink( $siteId )->getPageName();
        }
 
        /**
@@ -392,22 +383,16 @@
         * @throws OutOfBoundsException
         * @return string[]
         */
-       protected function getBadges( $entity, $siteId ) {
-               if ( $entity === null || !( $entity instanceof Item ) ) {
+       protected function getBadges( Item $entity = null, $siteId ) {
+               if ( $entity === null || !$entity->hasLinkToSite( $siteId ) ) {
                        return array();
                }
 
-               /* @var Item $entity */
-
-               if ( $entity->hasLinkToSite( $siteId ) ) {
-                       $badges = array();
-                       foreach ( $entity->getSitelink( $siteId )->getBadges() 
as $badge ) {
-                               $badges[] = $badge->getPrefixedId();
-                       }
-                       return $badges;
+               $badges = array();
+               foreach ( $entity->getSitelink( $siteId )->getBadges() as 
$badge ) {
+                       $badges[] = $badge->getPrefixedId();
                }
-
-               return array();
+               return $badges;
        }
 
        /**
diff --git a/repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php 
b/repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php
index c1dc8b9..1f93c3d 100644
--- a/repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialSetSitelinkTest.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Test;
 
-use TestSites;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\SiteLink;
 use Wikibase\Repo\Specials\SpecialSetSiteLink;
@@ -85,7 +84,7 @@
                if ( !self::$badgeId ) {
                        $sitesTable = 
WikibaseRepo::getDefaultInstance()->getSiteStore();
                        $sitesTable->clear();
-                       $sitesTable->saveSites( TestSites::getSites() );
+                       $sitesTable->saveSites( \TestSites::getSites() );
 
                        $this->createItems();
                        $this->addBadgeMatcher();
@@ -196,4 +195,5 @@
                        $this->assertTag( $matcher, $output, "Failed to match 
html output with tag '{$key}' passing two subpage values" );
                }
        }
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1d5b4a63bba83b39a085725e8c4cbcdd4cc3d85
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