Thiemo Kreuz (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/400567 )
Change subject: Add more strict type hints to hook handlers ...................................................................... Add more strict type hints to hook handlers Thi spatch also contains a few other minor cleanups that are closely related, but not purely documentation. Change-Id: I56b2b20771bf993ec387f972c42b4f67327b51a3 --- M src/CognateHooks.php M src/CognateStore.php M src/CognateUpdater.php M src/hooks/CognatePageHookHandler.php M tests/phpunit/hooks/CognatePageHookHandlerTest.php 5 files changed, 32 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cognate refs/changes/67/400567/1 diff --git a/src/CognateHooks.php b/src/CognateHooks.php index b0dd233..10b8c38 100644 --- a/src/CognateHooks.php +++ b/src/CognateHooks.php @@ -4,10 +4,14 @@ use Content; use DatabaseUpdater; +use DataUpdate; +use DeferrableUpdate; use MediaWiki\MediaWikiServices; +use Page; use ParserOutput; use Title; use Wikimedia\Rdbms\LoadBalancer; +use WikiPage; /** * @license GNU GPL v2+ @@ -27,7 +31,18 @@ return true; } - public static function onWikiPageDeletionUpdates( $page, $content, &$updates ) { + /** + * @param WikiPage $page + * @param Content|null $content + * @param DeferrableUpdate[] $updates + * + * @return bool + */ + public static function onWikiPageDeletionUpdates( + WikiPage $page, + Content $content = null, + array &$updates + ) { MediaWikiServices::getInstance() ->getService( 'CognatePageHookHandler' ) ->onWikiPageDeletionUpdates( $page, $content, $updates ); diff --git a/src/CognateStore.php b/src/CognateStore.php index 926d274..2d1a8ab 100644 --- a/src/CognateStore.php +++ b/src/CognateStore.php @@ -79,10 +79,7 @@ $dbr = $this->connectionManager->getReadConnection(); - list( $pagesToInsert, $titlesToInsert ) = $this->buildRows( - $linkTarget, - $dbName - ); + list( $pagesToInsert, $titlesToInsert ) = $this->buildRows( $linkTarget, $dbName ); $row = $dbr->selectRow( self::TITLES_TABLE_NAME, diff --git a/src/CognateUpdater.php b/src/CognateUpdater.php index 797b51a..4ea82cb 100644 --- a/src/CognateUpdater.php +++ b/src/CognateUpdater.php @@ -43,7 +43,7 @@ Database $mainDb, Database $cognateDb, $shared = false, - $maintenance = null + Maintenance $maintenance = null ) { $updater = parent::newForDB( $mainDb, diff --git a/src/hooks/CognatePageHookHandler.php b/src/hooks/CognatePageHookHandler.php index 96065c7..f6f6986 100644 --- a/src/hooks/CognatePageHookHandler.php +++ b/src/hooks/CognatePageHookHandler.php @@ -6,6 +6,7 @@ use DeferrableUpdate; use MediaWiki\Linker\LinkTarget; use MediaWiki\MediaWikiServices; +use MediaWiki\Storage\RevisionRecord; use MWCallableUpdate; use MWException; use Revision; @@ -77,8 +78,9 @@ * @param null $section No longer used * @param int &$flags * @param Revision|null $revision - * @param Status $status - * @param integer $baseRevId + * @param Status &$status + * @param int|bool $baseRevId + * @param int $undidRevId */ public function onPageContentSaveComplete( WikiPage $page, @@ -89,9 +91,10 @@ $isWatch, $section, $flags, - $revision, + Revision $revision = null, Status $status, - $baseRevId + $baseRevId, + $undidRevId ) { // A null revision means a null edit / no-op edit was made, no need to process that. if ( $revision === null ) { @@ -103,10 +106,9 @@ } $previousRevision = $revision->getPrevious(); - $previousContent = - $previousRevision ? - $previousRevision->getContent( Revision::RAW ) : - null; + $previousContent = $previousRevision + ? $previousRevision->getContent( RevisionRecord::RAW ) + : null; $this->onContentChange( $page->getTitle()->getTitleValue(), @@ -173,7 +175,7 @@ $this->onContentChange( $title->getTitleValue(), true, - $revision->getContent( Revision::RAW )->isRedirect(), + $revision->getContent( RevisionRecord::RAW )->isRedirect(), false ); } @@ -199,7 +201,7 @@ * @param int $oldid * @param int $newid * @param string $reason - * @param Revision $revision + * @param Revision $nullRevision */ public function onTitleMoveComplete( Title $title, @@ -208,7 +210,7 @@ $oldid, $newid, $reason, - Revision $revision + Revision $nullRevision ) { $oldTitleValue = $title->getTitleValue(); $newTitleValue = $newTitle->getTitleValue(); diff --git a/tests/phpunit/hooks/CognatePageHookHandlerTest.php b/tests/phpunit/hooks/CognatePageHookHandlerTest.php index 93d69d2..9c78044 100644 --- a/tests/phpunit/hooks/CognatePageHookHandlerTest.php +++ b/tests/phpunit/hooks/CognatePageHookHandlerTest.php @@ -141,7 +141,7 @@ array $namespaces, $dbName, LinkTarget $linkTarget, - $options = [] + array $options = [] ) { /** @var WikiPage|PHPUnit_Framework_MockObject_MockObject $mockWikiPage */ $mockWikiPage = $this->getMockBuilder( 'WikiPage' ) -- To view, visit https://gerrit.wikimedia.org/r/400567 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56b2b20771bf993ec387f972c42b4f67327b51a3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cognate Gerrit-Branch: master Gerrit-Owner: Thiemo Kreuz (WMDE) <thiemo.kr...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits