jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395865 )
Change subject: Re-enable
"MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" sniff
......................................................................
Re-enable "MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"
sniff
Bug: T170583
Change-Id: Ib55d299da9c52da02246037fd8be899372758f11
---
M .phpcs.xml
M includes/ApiQueryPageImages.php
M includes/LinksUpdateHookHandler.php
3 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/.phpcs.xml b/.phpcs.xml
index 18d84eb..2851e8d 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -8,7 +8,6 @@
<exclude name="MediaWiki.Files.OneClassPerFile.MultipleFound" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
<exclude
name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
- <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
</rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc" />
diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php
index 6c3a94b..405767b 100644
--- a/includes/ApiQueryPageImages.php
+++ b/includes/ApiQueryPageImages.php
@@ -142,8 +142,8 @@
$fileName = $row->pp_value;
$this->setResultValues( $prop, $pageId,
$fileName, $size );
}
-
- } // End page props image extraction
+ // End page props image extraction
+ }
// Extract images from file namespace pages. In this case we
just use
// the file itself rather than searching for a page_image. (Bug
50252)
diff --git a/includes/LinksUpdateHookHandler.php
b/includes/LinksUpdateHookHandler.php
index a14e7ae..ec776db 100644
--- a/includes/LinksUpdateHookHandler.php
+++ b/includes/LinksUpdateHookHandler.php
@@ -191,8 +191,10 @@
protected function fetchFileMetadata( $file ) {
$format = new FormatMetadata;
$context = new DerivativeContext( $format->getContext() );
- $format->setSingleLanguage( true ); // we don't care and it's
slightly faster
- $context->setLanguage( 'en' ); // we don't care so avoid
splitting the cache
+ // we don't care about the language, and specifying
singleLanguage is slightly faster
+ $format->setSingleLanguage( true );
+ // we don't care about the language, so avoid splitting the
cache by selecting English
+ $context->setLanguage( 'en' );
$format->setContext( $context );
return $format->fetchExtendedMetadata( $file );
}
--
To view, visit https://gerrit.wikimedia.org/r/395865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib55d299da9c52da02246037fd8be899372758f11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Pppery <maprea...@olum.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
