jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/360169 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.FunctionComment.Missing.Public
Change-Id: I2ce318ceb061a0cc63b9a46bcc8ee21f2b740741
---
M composer.json
M phpcs.xml
M src/Data/FileRevision.php
M src/Data/TextRevision.php
M src/Exceptions/ImportException.php
M src/Exceptions/InvalidArgumentException.php
M src/Exceptions/LocalizedImportException.php
M src/Exceptions/SourceUrlException.php
M src/MediaWiki/ApiDetailRetriever.php
M src/MediaWiki/FileImporterUploadBase.php
M src/MediaWiki/HttpApiLookup.php
M src/ServiceWiring.php
M src/Services/HttpRequestFileChunkSaver.php
13 files changed, 20 insertions(+), 20 deletions(-)
Approvals:
WMDE-Fisch: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 664b9b4..7a306bc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.7.2",
+ "mediawiki/mediawiki-codesniffer": "0.9.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/phpcs.xml b/phpcs.xml
index a8d70d0..6233a07 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -4,6 +4,9 @@
<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
<exclude
name="MediaWiki.ControlStructures.AssignmentInControlStructures" />
<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
+ <exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
+ <exclude name="MediaWiki.FunctionComment.Missing.Public" />
</rule>
<rule ref="Generic.Files.InlineHTML" />
diff --git a/src/Data/FileRevision.php b/src/Data/FileRevision.php
index 0b9e406..098e02e 100644
--- a/src/Data/FileRevision.php
+++ b/src/Data/FileRevision.php
@@ -57,7 +57,6 @@
throw new InvalidArgumentException( __CLASS__ . ':
Unrecognized field requested' );
}
return $this->fields[$name];
-
}
}
diff --git a/src/Data/TextRevision.php b/src/Data/TextRevision.php
index 85df1f3..899bab8 100644
--- a/src/Data/TextRevision.php
+++ b/src/Data/TextRevision.php
@@ -58,7 +58,6 @@
throw new InvalidArgumentException( __CLASS__ . ':
Unrecognized field requested' );
}
return $this->fields[$name];
-
}
}
diff --git a/src/Exceptions/ImportException.php
b/src/Exceptions/ImportException.php
index b59155f..dc3014e 100644
--- a/src/Exceptions/ImportException.php
+++ b/src/Exceptions/ImportException.php
@@ -7,6 +7,6 @@
/**
* Generic Import exception.
*/
-class ImportException extends RuntimeException{
+class ImportException extends RuntimeException {
}
diff --git a/src/Exceptions/InvalidArgumentException.php
b/src/Exceptions/InvalidArgumentException.php
index 21c57fc..c376bd8 100644
--- a/src/Exceptions/InvalidArgumentException.php
+++ b/src/Exceptions/InvalidArgumentException.php
@@ -2,6 +2,6 @@
namespace FileImporter\Exceptions;
-class InvalidArgumentException extends \InvalidArgumentException{
+class InvalidArgumentException extends \InvalidArgumentException {
}
diff --git a/src/Exceptions/LocalizedImportException.php
b/src/Exceptions/LocalizedImportException.php
index d026bbb..a32262a 100644
--- a/src/Exceptions/LocalizedImportException.php
+++ b/src/Exceptions/LocalizedImportException.php
@@ -12,7 +12,7 @@
* Logic has been taken form core class LocalizedException
* @todo move logic to a trait in core and use it from there?
*/
-class LocalizedImportException extends ImportException implements
ILocalizedException{
+class LocalizedImportException extends ImportException implements
ILocalizedException {
/** @var string|array|MessageSpecifier */
protected $messageSpec;
diff --git a/src/Exceptions/SourceUrlException.php
b/src/Exceptions/SourceUrlException.php
index a81a521..a510d81 100644
--- a/src/Exceptions/SourceUrlException.php
+++ b/src/Exceptions/SourceUrlException.php
@@ -7,6 +7,6 @@
/**
* Thrown in cases that the SourceUrl is not deemed to be acceptable.
*/
-class SourceUrlException extends ImportException{
+class SourceUrlException extends ImportException {
}
diff --git a/src/MediaWiki/ApiDetailRetriever.php
b/src/MediaWiki/ApiDetailRetriever.php
index 6dfe004..2d90bb4 100644
--- a/src/MediaWiki/ApiDetailRetriever.php
+++ b/src/MediaWiki/ApiDetailRetriever.php
@@ -197,7 +197,6 @@
private function getTextRevisionsFromRevisionsInfo( array
$revisionsInfo, $pageTitle ) {
$revisions = [];
foreach ( $revisionsInfo as $revisionInfo ) {
-
if ( array_key_exists( 'userhidden', $revisionInfo ) ) {
$revisionInfo['user'] = '0.0.0.0';
}
diff --git a/src/MediaWiki/FileImporterUploadBase.php
b/src/MediaWiki/FileImporterUploadBase.php
index b06037f..376126e 100644
--- a/src/MediaWiki/FileImporterUploadBase.php
+++ b/src/MediaWiki/FileImporterUploadBase.php
@@ -9,7 +9,7 @@
use Psr\Log\NullLogger;
use UploadBase;
-class FileImporterUploadBase extends UploadBase implements
LoggerAwareInterface{
+class FileImporterUploadBase extends UploadBase implements
LoggerAwareInterface {
/**
* @var LoggerInterface
diff --git a/src/MediaWiki/HttpApiLookup.php b/src/MediaWiki/HttpApiLookup.php
index bb69cf2..a929ea4 100644
--- a/src/MediaWiki/HttpApiLookup.php
+++ b/src/MediaWiki/HttpApiLookup.php
@@ -16,7 +16,7 @@
* Lookup that can take a MediaWiki site URL and return the URL of the action
API.
* This service caches APIs that have been found for the lifetime of the
object.
*/
-class HttpApiLookup implements LoggerAwareInterface{
+class HttpApiLookup implements LoggerAwareInterface {
/**
* @var LoggerInterface
diff --git a/src/ServiceWiring.php b/src/ServiceWiring.php
index dc232d4..fabe5f8 100644
--- a/src/ServiceWiring.php
+++ b/src/ServiceWiring.php
@@ -22,7 +22,7 @@
// Generic
- 'FileImporterSourceSiteLocator' => function( MediaWikiServices
$services ) {
+ 'FileImporterSourceSiteLocator' => function ( MediaWikiServices
$services ) {
$config = $services->getMainConfig();
$sourceSites = [];
@@ -33,18 +33,18 @@
return new SourceSiteLocator( $sourceSites );
},
- 'FileImporterHttpRequestExecutor' => function( MediaWikiServices
$services ) {
+ 'FileImporterHttpRequestExecutor' => function ( MediaWikiServices
$services ) {
$service = new HttpRequestExecutor();
$service->setLogger( LoggerFactory::getInstance( 'FileImporter'
) );
return $service;
},
- 'FileImporterDuplicateFileRevisionChecker' => function(
MediaWikiServices $services ) {
+ 'FileImporterDuplicateFileRevisionChecker' => function (
MediaWikiServices $services ) {
$localRepo = RepoGroup::singleton()->getLocalRepo();
return new DuplicateFileRevisionChecker( $localRepo );
},
- 'FileImporterImporter' => function( MediaWikiServices $services ) {
+ 'FileImporterImporter' => function ( MediaWikiServices $services ) {
/** @var WikiRevisionFactory $wikiRevisionFactory */
$wikiRevisionFactory = $services->getService(
'FileImporterWikiRevisionFactory' );
/** @var NullRevisionCreator $nullRevisionCreator */
@@ -59,17 +59,17 @@
return $importer;
},
- 'FileImporterNullRevisionCreator' => function( MediaWikiServices
$services ) {
+ 'FileImporterNullRevisionCreator' => function ( MediaWikiServices
$services ) {
return new NullRevisionCreator( $services->getDBLoadBalancer()
);
},
- 'FileImporterWikiRevisionFactory' => function( MediaWikiServices
$services ) {
+ 'FileImporterWikiRevisionFactory' => function ( MediaWikiServices
$services ) {
return new WikiRevisionFactory( $services->getMainConfig() );
},
// MediaWiki
- 'FileImporterMediaWikiHttpApiLookup' => function( MediaWikiServices
$services ) {
+ 'FileImporterMediaWikiHttpApiLookup' => function ( MediaWikiServices
$services ) {
/** @var HttpRequestExecutor $httpRequestExecutor */
$httpRequestExecutor = $services->getService(
'FileImporterHttpRequestExecutor' );
@@ -80,13 +80,13 @@
return $service;
},
- 'FileImporterMediaWikiSiteTableSiteLookup' => function(
MediaWikiServices $services ) {
+ 'FileImporterMediaWikiSiteTableSiteLookup' => function (
MediaWikiServices $services ) {
return new \FileImporter\MediaWiki\SiteTableSiteLookup(
$services->getSiteLookup() );
},
// Importers
- 'FileImporterSitesTableMediaWikiSite' => function( MediaWikiServices
$services ) {
+ 'FileImporterSitesTableMediaWikiSite' => function ( MediaWikiServices
$services ) {
/**
* @var SiteTableSiteLookup $siteTableLookup
* @var HttpApiLookup $httpApiLookup
diff --git a/src/Services/HttpRequestFileChunkSaver.php
b/src/Services/HttpRequestFileChunkSaver.php
index db8b9cf..0fc0e9f 100644
--- a/src/Services/HttpRequestFileChunkSaver.php
+++ b/src/Services/HttpRequestFileChunkSaver.php
@@ -10,7 +10,7 @@
/**
* TODO this could end up in core? and used by UploadFromUrl?
*/
-class HttpRequestFileChunkSaver implements LoggerAwareInterface{
+class HttpRequestFileChunkSaver implements LoggerAwareInterface {
/**
* @var string
--
To view, visit https://gerrit.wikimedia.org/r/360169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ce318ceb061a0cc63b9a46bcc8ee21f2b740741
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FileImporter
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Andrew-WMDE <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
