jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401106 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 ...................................................................... build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 Change-Id: Ib373e3c21dde5f04b758f79f7a2018d67537e36a --- M ApiFileAnnotations.php M composer.json M includes/FileAnnotationsContent.php 3 files changed, 9 insertions(+), 10 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/ApiFileAnnotations.php b/ApiFileAnnotations.php index b67b83b..8318239 100644 --- a/ApiFileAnnotations.php +++ b/ApiFileAnnotations.php @@ -418,12 +418,11 @@ $page = $pages[0]; // There's only one page. Add HTML here. $info = $page['imageinfo'][0]; - return - '<div class="wikidata-image">' . - '<a class="commons-image" href="' . htmlspecialchars( $info['descriptionurl'] ) . '">' . - '<img src="' . htmlspecialchars( $info['thumburl'] ) . '" />' . - '</a>' . - '</div>'; + return '<div class="wikidata-image">' . + '<a class="commons-image" href="' . htmlspecialchars( $info['descriptionurl'] ) . '">' . + '<img src="' . htmlspecialchars( $info['thumburl'] ) . '" />' . + '</a>' . + '</div>'; } // Oops, there's no image. Bail. diff --git a/composer.json b/composer.json index df9b39a..5e6bd27 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "14.1.0", + "mediawiki/mediawiki-codesniffer": "15.0.0", "jakub-onderka/php-console-highlighter": "0.3.2", "mediawiki/minus-x": "0.2.0" }, diff --git a/includes/FileAnnotationsContent.php b/includes/FileAnnotationsContent.php index 7edd239..10cc5e1 100644 --- a/includes/FileAnnotationsContent.php +++ b/includes/FileAnnotationsContent.php @@ -20,11 +20,11 @@ * Represents file annotations for a file. */ class FileAnnotationsContent extends JsonContent { - function __construct( $text ) { + public function __construct( $text ) { parent::__construct( $text, 'FileAnnotations' ); } - function validate() { + public function validate() { $annotationsStatus = $this->getData(); $annotations = $annotationsStatus->getValue(); @@ -49,7 +49,7 @@ return EventLogging::schemaValidate( $arrayAnnotations, $schema ); } - function isValid() { + public function isValid() { try { return parent::isValid() && $this->validate(); } catch ( JsonSchemaException $e ) { -- To view, visit https://gerrit.wikimedia.org/r/401106 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib373e3c21dde5f04b758f79f7a2018d67537e36a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FileAnnotations Gerrit-Branch: master Gerrit-Owner: Umherirrender <umherirrender_de...@web.de> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits