jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/400962 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..
build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
The following sniff is failing and was disabled:
* Squiz.Scope.MethodScope.Missing
The following sniff now pass and was enabled:
* MediaWiki.Files.ClassMatchesFilename.WrongCase
The following sniff is renamed:
* MediaWiki.Files.OneClassPerFile.MultipleFound
-> Generic.Files.OneObjectStructurePerFile.MultipleFound
Change-Id: I5d4b9d113cb2a5218fe592a71c716515d2dfbc7e
---
M .phpcs.xml
M composer.json
M includes/specials/SpecialUploadWizard.php
3 files changed, 22 insertions(+), 25 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.phpcs.xml b/.phpcs.xml
index 618c98d..5595999 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,14 +1,14 @@
+
-
-
+
.
diff --git a/composer.json b/composer.json
index 0d46d2f..35cfa63 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.1"
},
diff --git a/includes/specials/SpecialUploadWizard.php
b/includes/specials/SpecialUploadWizard.php
index 9c9bf29..cc34855 100644
--- a/includes/specials/SpecialUploadWizard.php
+++ b/includes/specials/SpecialUploadWizard.php
@@ -331,16 +331,15 @@
);
}
- return
+ return Html::rawElement(
+ 'div',
+ [],
Html::rawElement(
- 'div',
- [],
- Html::rawElement(
- 'p',
- [ 'style' => 'text-align:
center' ],
- wfMessage(
'mwe-upwiz-extension-disabled' )->text()
- ) . $linkHtml
- );
+ 'p',
+ [ 'style' => 'text-align: center' ],
+ wfMessage(
'mwe-upwiz-extension-disabled' )->text()
+ ) . $linkHtml
+ );
}
// always load the html: even if the tutorial is skipped, users
can
@@ -349,20 +348,18 @@
// TODO move this into UploadWizard.js or some other javascript
resource so the upload wizard
// can be dynamically included ( for example the add media
wizard )
- return
// @codingStandardsIgnoreStart
- '' .
- '' .
- $tutorialHtml .
- '' .
-
- // if loading takes > 2 seconds display
spinner. Note we are evading Resource Loader here, and linking directly.
Because we want an image to appear if RL's package is late.
- // using some 's which is a bit of
superstition, to make sure jQuery will hide this (it seems that it doesn't
sometimes, when it has no content)
- // the min-width & max-width is copied from the
#uploadWizard properties, so in nice browsers the spinner is right where the
button will go.
- '' .
- '' .
- '' .
- '';
+ return '' .
+ '' .
+ $tutorialHtml .
+ '' .
+ // if loading takes > 2 seconds display spinner. Note
we are evading Resource Loader here, and linking directly. Because we want an
image to appear if RL's package is late.
+ // using some 's which is a bit of superstition,
to make sure jQuery will hide this (it seems that it doesn't sometimes, when it
has no content)
+ // the min-width & max-width is copied from the
#uploadWizard properties, so in nice browsers the spinner is right where the
button will go.
+ '' .
+ '' .
+ '' .
+
