EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/165883
Change subject: Hygiene: Update incorrect class annotations ...................................................................... Hygiene: Update incorrect class annotations Change-Id: I1ef94a1bdab10b11024d5e974b045dcaecf9f47c --- M includes/Data/Listener/ReferenceRecorder.php M includes/Model/UserTuple.php M includes/api/ApiParsoidUtilsFlow.php 3 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/83/165883/1 diff --git a/includes/Data/Listener/ReferenceRecorder.php b/includes/Data/Listener/ReferenceRecorder.php index 9bfd077..554f953 100644 --- a/includes/Data/Listener/ReferenceRecorder.php +++ b/includes/Data/Listener/ReferenceRecorder.php @@ -25,7 +25,7 @@ protected $referenceExtractor; /** - * @var MangerGroup + * @var ManagerGroup */ protected $storage; diff --git a/includes/Model/UserTuple.php b/includes/Model/UserTuple.php index 7bdb763..3cd89f7 100644 --- a/includes/Model/UserTuple.php +++ b/includes/Model/UserTuple.php @@ -3,6 +3,7 @@ namespace Flow\Model; use Flow\Exception\CrossWikiException; +use Flow\Exception\FlowException; use User; class UserTuple { diff --git a/includes/api/ApiParsoidUtilsFlow.php b/includes/api/ApiParsoidUtilsFlow.php index 81f6f00..48a970f 100644 --- a/includes/api/ApiParsoidUtilsFlow.php +++ b/includes/api/ApiParsoidUtilsFlow.php @@ -1,7 +1,7 @@ <?php use Flow\Container; -use Flow\Parsoid\Controller; +use Flow\Parsoid\ContentFixer; use Flow\Parsoid\Utils; use Flow\Exception\WikitextException; @@ -16,10 +16,11 @@ } catch ( WikitextException $e ) { $code = $e->getErrorCode(); $this->dieUsage( $this->msg( $code )->inContentLanguage()->useDatabase( false )->plain(), $code ); + return; // helps static analysis know execution does not continue past self::dieUsage } if ( $params['to'] === 'html' ) { - /** @var Controller $contentFixer */ + /** @var ContentFixer $contentFixer */ $contentFixer = Container::get( 'content_fixer' ); $content = $contentFixer->apply( $content, $page->getTitle() ); } -- To view, visit https://gerrit.wikimedia.org/r/165883 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ef94a1bdab10b11024d5e974b045dcaecf9f47c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits