jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/372091 )
Change subject: Release 1.0.0 with all backwards-compatibility dropped ...................................................................... Release 1.0.0 with all backwards-compatibility dropped My reason to touch this is the awkward, outdated version number. I believe the .php entry point is not needed any more. The extension.json already contains the same "MessagesDirs" setting. I had a look at the mentioned mergeMessageFileList.php and believe it does not need the global $wgMessagesDirs variable any more. But I'm not 100% sure about this. Depends-On: Iebbc3849b638c16daa6fe8debb5fa9d81a811c1a Change-Id: I6b407bf9cc73d9d2ac3db04f23b9759a7510536c --- D README.md D RELEASE-NOTES.md D WikimediaBadges.php M composer.json M extension.json M includes/BeforePageDisplayHookHandler.php M includes/OtherProjectsSidebarHookHandler.php M phpcs.xml M tests/phpunit/includes/BeforePageDisplayHookHandlerTest.php M tests/phpunit/includes/OtherProjectsSidebarHookHandlerTest.php 10 files changed, 23 insertions(+), 75 deletions(-) Approvals: WMDE-leszek: Looks good to me, approved Legoktm: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/README.md b/README.md deleted file mode 100644 index b03c676..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -WikimediaBadges -=============== - -Extension which contains default themes to display badges on Wikimedia projects. diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md deleted file mode 100644 index 44b6e55..0000000 --- a/RELEASE-NOTES.md +++ /dev/null @@ -1,7 +0,0 @@ -These are the release notes for the [WikimediaBadges extension](README.md). - -## Version 0.1 (dev) - -Initial release with these features: - -* New default theme to display badges on Wikimedia wikis diff --git a/WikimediaBadges.php b/WikimediaBadges.php deleted file mode 100644 index 42415fc..0000000 --- a/WikimediaBadges.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php - -/** - * Extension which contains different themes - * to display badges on Wikimedia projects - */ - -/** - * Entry point for for the WikimediaBadges extension. - * - * @see README.md - * @see https://github.com/wmde/WikimediaBadges - * @license GNU GPL v2+ - */ - -if ( function_exists( 'wfLoadExtension' ) ) { - wfLoadExtension( 'WikimediaBadges', __DIR__ . '/extension.json' ); - // Keep i18n globals so mergeMessageFileList.php doesn't break - $wgMessagesDirs['WikimediaBadges'] = __DIR__ . '/i18n'; - /*wfWarn( - 'Deprecated PHP entry point used for WikimediaBadges extension. Please use wfLoadExtension instead, ' . - 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' - );*/ - return; -} else { - die( 'This version of the WikimediaBadges extension requires MediaWiki 1.25+' ); -} diff --git a/composer.json b/composer.json index c838078..13291b9 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "wikibase/wikimedia-badges", "description": "Extension which contains default themes to display badges on Wikimedia projects", "type": "mediawiki-extension", - "version": "0.1-alpha", + "version": "1.0.0", "keywords": [ "Wikidata", "Wikibase" @@ -36,6 +36,7 @@ "scripts": { "fix": "phpcbf", "test": [ + "@validate --no-interaction", "parallel-lint . --exclude vendor", "phpcs -p -s" ] diff --git a/extension.json b/extension.json index 14baa10..ef51b71 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "WikimediaBadges", - "version": "0.1 alpha", + "version": "1.0.0", "author": [ "[https://www.mediawiki.org/wiki/User:Bene* Bene*]", "Marius Hoch" diff --git a/includes/BeforePageDisplayHookHandler.php b/includes/BeforePageDisplayHookHandler.php index adda0f1..5ec1a6c 100644 --- a/includes/BeforePageDisplayHookHandler.php +++ b/includes/BeforePageDisplayHookHandler.php @@ -18,16 +18,11 @@ /** * Handler for the BeforePageDisplay hook * - * @since 0.1 - * * @param OutputPage $out * @param Skin $skin - * - * @return bool */ public static function onBeforePageDisplay( OutputPage &$out, Skin &$skin ) { $out->addModuleStyles( 'ext.wikimediaBadges' ); - return true; } } diff --git a/includes/OtherProjectsSidebarHookHandler.php b/includes/OtherProjectsSidebarHookHandler.php index 1c53478..0f3ad2c 100644 --- a/includes/OtherProjectsSidebarHookHandler.php +++ b/includes/OtherProjectsSidebarHookHandler.php @@ -11,6 +11,7 @@ use Wikibase\DataModel\Services\Lookup\EntityLookupException; use Wikibase\DataModel\Snak\PropertyValueSnak; use Wikibase\Client\WikibaseClient; +use Wikibase\DataModel\Snak\Snak; use Wikimedia\Assert\Assert; use Wikimedia\Assert\ParameterTypeException; @@ -54,33 +55,29 @@ * @throws ParameterTypeException */ public function __construct( EntityLookup $entityLookup, $commonsCategoryPropertySetting ) { - Assert::parameterType( 'string|null', $commonsCategoryPropertySetting, '$commonsCategoryPropertySetting' ); + Assert::parameterType( + 'string|null', + $commonsCategoryPropertySetting, + '$commonsCategoryPropertySetting' + ); $this->entityLookup = $entityLookup; $this->commonsCategoryPropertySetting = $commonsCategoryPropertySetting; } /** - * @since 0.1 - * * @param ItemId $itemId * @param array &$sidebar - * - * @return bool */ public static function addToSidebar( ItemId $itemId, array &$sidebar ) { $self = self::newFromGlobalState(); - return $self->doAddToSidebar( $itemId, $sidebar ); + $self->doAddToSidebar( $itemId, $sidebar ); } /** - * @since 0.1 - * * @param ItemId $itemId * @param array &$sidebar - * - * @return bool */ public function doAddToSidebar( ItemId $itemId, array &$sidebar ) { if ( $this->commonsCategoryPropertySetting !== null @@ -90,8 +87,6 @@ $this->handleCategoryName( $categoryName, $sidebar ); } } - - return true; } /** diff --git a/phpcs.xml b/phpcs.xml index 4e2a656..108e2ed 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,14 +1,6 @@ <?xml version="1.0"?> -<ruleset name="WikibaseMediaInfo"> - <rule ref="vendor/wikibase/wikibase-codesniffer/Wikibase" /> - - <!-- Exceptions --> - - <rule ref="Generic.Files.LineLength"> - <properties> - <property name="lineLimit" value="113" /> - </properties> - </rule> +<ruleset name="WikimediaBadges"> + <rule ref="./vendor/wikibase/wikibase-codesniffer/Wikibase" /> <file>.</file> </ruleset> diff --git a/tests/phpunit/includes/BeforePageDisplayHookHandlerTest.php b/tests/phpunit/includes/BeforePageDisplayHookHandlerTest.php index ba10619..4a90821 100644 --- a/tests/phpunit/includes/BeforePageDisplayHookHandlerTest.php +++ b/tests/phpunit/includes/BeforePageDisplayHookHandlerTest.php @@ -26,7 +26,7 @@ ->method( 'addModuleStyles' ) ->with( 'ext.wikimediaBadges' ); - $this->assertTrue( BeforePageDisplayHookHandler::onBeforePageDisplay( $out, $skin ) ); + BeforePageDisplayHookHandler::onBeforePageDisplay( $out, $skin ); } } diff --git a/tests/phpunit/includes/OtherProjectsSidebarHookHandlerTest.php b/tests/phpunit/includes/OtherProjectsSidebarHookHandlerTest.php index d8020be..da73e90 100644 --- a/tests/phpunit/includes/OtherProjectsSidebarHookHandlerTest.php +++ b/tests/phpunit/includes/OtherProjectsSidebarHookHandlerTest.php @@ -29,7 +29,12 @@ /** * @dataProvider doAddToSidebarProvider */ - public function testDoAddToSidebar( array $expected, array $sidebar, ItemId $itemId, $suppressErrors = false ) { + public function testDoAddToSidebar( + array $expected, + array $sidebar, + ItemId $itemId, + $suppressErrors = false + ) { $handler = new OtherProjectsSidebarHookHandler( $this->getEntityLookup(), 'P373' @@ -38,7 +43,7 @@ if ( $suppressErrors === 'suppress' ) { \MediaWiki\suppressWarnings(); } - $this->assertTrue( $handler->doAddToSidebar( $itemId, $sidebar ) ); + $handler->doAddToSidebar( $itemId, $sidebar ); if ( $suppressErrors === 'suppress' ) { \MediaWiki\restoreWarnings(); } @@ -132,7 +137,7 @@ $sidebar = [ 101010 => [ 'blah' ] ]; $origSidebar = $sidebar; - $this->assertTrue( $handler->doAddToSidebar( new ItemId( 'Q42' ), $sidebar ) ); + $handler->doAddToSidebar( new ItemId( 'Q42' ), $sidebar ); $this->assertSame( $origSidebar, $sidebar ); } @@ -175,7 +180,7 @@ $origSidebar = $sidebar; \MediaWiki\suppressWarnings(); - $this->assertTrue( $handler->doAddToSidebar( new ItemId( 'Q123' ), $sidebar ) ); + $handler->doAddToSidebar( new ItemId( 'Q123' ), $sidebar ); \MediaWiki\restoreWarnings(); $this->assertSame( $origSidebar, $sidebar ); @@ -186,9 +191,7 @@ $this->setMwGlobals( 'wgWikimediaBadgesCommonsCategoryProperty', null ); $sidebar = []; - $this->assertTrue( - OtherProjectsSidebarHookHandler::addToSidebar( new ItemId( 'Q38434234' ), $sidebar ) - ); + OtherProjectsSidebarHookHandler::addToSidebar( new ItemId( 'Q38434234' ), $sidebar ); } private function getEntityLookup() { -- To view, visit https://gerrit.wikimedia.org/r/372091 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b407bf9cc73d9d2ac3db04f23b9759a7510536c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/WikimediaBadges Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]> Gerrit-Reviewer: Aude <[email protected]> Gerrit-Reviewer: Bene <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: Nemo bis <[email protected]> Gerrit-Reviewer: Nikerabbit <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]> Gerrit-Reviewer: WMDE-leszek <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
