[MediaWiki-commits] [Gerrit] pywikibot/core[master]: comms.http: Include HttpRequest.kwargs in session.request call

[Rafidaslam (Code Review)]

Rafidaslam has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401116 )

Change subject: comms.http: Include HttpRequest.kwargs in session.request call
..

comms.http: Include HttpRequest.kwargs in session.request call

Include threadedhttp.HttpRequest.kwargs in session.request call in
`_http_process()`.

Before this HttpRequest.kwargs didn't get into session.request call
so if we call a function like `pywikibot.comms.http.fetch()` with
parameter like `stream=True`, the `stream` param would be ignored.

Bug: T183830
Change-Id: I02d71a933bc1ef0073a0ec34534b4fc10e91
---
M pywikibot/comms/http.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/16/401116/1

diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py
index b6fb20d..6855195 100644
--- a/pywikibot/comms/http.py
+++ b/pywikibot/comms/http.py
@@ -374,7 +374,8 @@
 # verify=True, when a request with verify=False happened before
 response = session.request(method, uri, params=params, data=body,
headers=headers, auth=auth, timeout=timeout,
-   verify=not ignore_validation)
+   verify=not ignore_validation,
+   **http_request.kwargs)
 except Exception as e:
 http_request.data = e
 else:

-- 
To view, visit https://gerrit.wikimedia.org/r/401116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02d71a933bc1ef0073a0ec34534b4fc10e91
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add unit test for creation of newsletters via API

[Pppery (Code Review)]

Pppery has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401115 )

Change subject: Add unit test for creation of newsletters via API
..

Add unit test for creation of newsletters via API

Bug: T183817
Bug: T183818
Change-Id: If26b408efb9c443f5fe4edb14e1d30652b03c974
---
A tests/content/NewsletterAPIEditTest.php
1 file changed, 52 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/15/401115/1

diff --git a/tests/content/NewsletterAPIEditTest.php 
b/tests/content/NewsletterAPIEditTest.php
new file mode 100644
index 000..b8ad42a
--- /dev/null
+++ b/tests/content/NewsletterAPIEditTest.php
@@ -0,0 +1,52 @@
+doLogin();
+   }
+   public function testCreation() {
+   $description = "A description that is at least 30 characters 
long";
+   $newsletterTitle = "Newsletter:Test";
+   $mainPage = "UTPage";
+   $text = "{
+   \"description\": \"$description\",
+   \"mainpage\": \"$mainPage\",
+   \"publishers\": [
+   \"UTSysop\"
+   ]
+   }";
+
+   # Create the newsletter
+   $this->doApiRequestWithToken(
+   [
+   'action' => 'edit',
+   'title' => $newsletterTitle,
+   'text' => $text,
+   ]
+   );
+
+   $page = new WikiPage( Title::newFromText( $newsletterTitle ) );
+   $content = $page->getContent();
+   $newsletter = 
NewsletterStore::getDefaultInstance()->getNewsletterFromName( "Test" );
+   $this->assertNotNull( $newsletter );
+
+   # Check description
+   $this->assertEquals( $newsletter->getDescription(), 
$description );
+   $this->assertEquals( $content->getDescription(), $description );
+
+   # Check main page
+   $expectedPageId = Title::newFromText( $mainPage 
)->getArticleId();
+   $this->assertEquals( $newsletter->getPageId(), $expectedPageId 
);
+   $this->assertEquals( $content->getMainPage(), $mainPage );
+
+   # Check publishers and subsrcibers
+   $expectedUsers = [ User::newFromname( "UTSysop" )->getId() ];
+   $this->assertEquals( $newsletter->getPublishers(), 
$expectedUsers );
+   $this->assertEquals( $newsletter->getSubscribers(), 
$expectedUsers );
+   }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/401115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If26b408efb9c443f5fe4edb14e1d30652b03c974
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Fix bug that causes newsletter names in database to contain ...

[Pppery (Code Review)]

Pppery has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401114 )

Change subject: Fix bug that causes newsletter names in database to contain 
namespace name
..

Fix bug that causes newsletter names in database to contain namespace name

This was introduced by mistake in 39eac922ee889f67d8ba0de97d2c80fc09e41db2

Bug: T183752
Change-Id: I544a3034c7f25132d9916fe99bde0791a7c1a6fa
---
M includes/content/NewsletterDataUpdate.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/14/401114/1

diff --git a/includes/content/NewsletterDataUpdate.php 
b/includes/content/NewsletterDataUpdate.php
index 4df676d..ee5dc86 100644
--- a/includes/content/NewsletterDataUpdate.php
+++ b/includes/content/NewsletterDataUpdate.php
@@ -81,7 +81,7 @@
$newsletter = Newsletter::newFromName( $this->title->getText() 
);
 
$formData = [
-   'Name' => $this->title->getFullText(),
+   'Name' => $this->title->getText(),
'Description' => $this->content->getDescription(),
'MainPage' => $this->content->getMainPage()
];

-- 
To view, visit https://gerrit.wikimedia.org/r/401114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I544a3034c7f25132d9916fe99bde0791a7c1a6fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: [WIP] Generalize wording of audio formats in Score.php

[Divadsn (Code Review)]

Divadsn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401113 )

Change subject: [WIP] Generalize wording of audio formats in Score.php
..

[WIP] Generalize wording of audio formats in Score.php

Bug: T183753
Change-Id: Iba98dd7281e3910f4dcde1d40b4361fc372f8c1f
---
M i18n/en.json
M i18n/qqq.json
M includes/Score.php
3 files changed, 37 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score 
refs/changes/13/401113/1

diff --git a/i18n/en.json b/i18n/en.json
index b42c585..326a26d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,7 +15,7 @@
"score-error-category-desc": "There was an error while rendering the 
score.",
"score-getcwderr": "Unable to obtain current working directory",
"score-invalidlang": "Invalid score language 
lang=\"$1\". Currently recognized languages are 
lang=\"lilypond\" (the default) and lang=\"ABC\".",
-   "score-invalidoggoverride": "The file \"$1\" you 
specified with override_ogg is invalid. Please specify the file name only, omit 
[[…]] and the \"{{ns:file}}:\" prefix.",
+   "score-invalidaudiooverride": "The file \"$1\" you 
specified with override_audio is invalid. Please specify the file name only, 
omit [[…]] and the \"{{ns:file}}:\" prefix.",
"score-midioverridenotfound": "The file \"$1\" you 
specified with override_midi could not be found. Please specify the file name 
only, omit [[…]] and the \"{{ns:file}}:\" prefix.",
"score-noabcinput": "ABC source file $1 could not be created.",
"score-noimages": "No score images were generated. Please check your 
score code.",
@@ -26,7 +26,7 @@
"score-notexecutable": "Could not execute LilyPond: $1 is not an 
executable file. Make sure $wgScoreLilyPond is set correctly.",
"score-nocontent": "Could not load file $1 from server.",
"score-oggconversionerr": "Unable to convert MIDI to Ogg/Vorbis:\n$1",
-   "score-oggoverridenotfound": "The file \"$1\" you 
specified with override_ogg does not exist.",
+   "score-audiooverridenotfound": "The file \"$1\" you 
specified with override_audio does not exist.",
"score-page": "Page $1",
"score-pregreplaceerr": "PCRE regular expression replacement failed",
"score-readerr": "Unable to read file $1.",
@@ -49,5 +49,5 @@
"score-visualeditor-mwscoreinspector-raw": "This is a complete LilyPond 
file",
"score-visualeditor-mwscoreinspector-title": "Musical notation",
"score-visualeditor-mwscoreinspector-vorbis": "Include an audio file 
(auto-generated by default)",
-   "score-vorbisoverrideogg": "You cannot request Ogg/Vorbis rendering and 
specify override_ogg at the same time."
+   "score-vorbisoverrideaudio": "You cannot request Ogg/Vorbis rendering 
and specify override_audio at the same time."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7fb2a39..4b647ec 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -21,7 +21,7 @@
"score-error-category-desc": "Description on 
[[Special:TrackingCategories]] for the {{msg-mw|score-error-category}} tracking 
category.",
"score-getcwderr": "Displayed if the extension cannot obtain the 
current working directory.",
"score-invalidlang": "Displayed if the lang=\"…\" attribute contains an 
unrecognized score language. $1 is the unrecognized language.",
-   "score-invalidoggoverride": "Displayed if the file specified with the 
override_ogg=\"…\" attribute is invalid. $1 is the value of the override_ogg 
attribute.",
+   "score-invalidaudiooverride": "Displayed if the file specified with the 
override_audio=\"…\" attribute is invalid. $1 is the value of the 
override_audio attribute.",
"score-midioverridenotfound": "Displayed if the file specified with the 
override_midi=\"…\" attribute could not be found. $1 is the value of the 
override_midi attribute.",
"score-noabcinput": "Displayed if an ABC source file could not be 
created for lang=\"ABC\". $1 is the path to the file that could not be 
created.",
"score-noimages": "Displayed if no score images were rendered.",
@@ -32,7 +32,7 @@
"score-notexecutable": "Displayed if LilyPond binary cannot be 
executed. $1 is the path to the LilyPond binary.",
"score-nocontent": "Parameters:\n* $1 - filename",
"score-oggconversionerr": "Displayed if the MIDI to Ogg/Vorbis 
conversion failed. $1 is the error (generally big block of text in a pre tag)",
-   "score-oggoverridenotfound": "Displayed if the file specified with the 
override_ogg=\"…\" attribute could not be found. $1 is the value of the 
override_ogg attribute.",
+   "score-audiooverridenotfound": "Displayed if the file specified with 
the override_audio=\"…\" attribute could not be found. $1 is the value of the 
override_ogg attribute.",
"score-page": "The word \"Page\" as used in 

[MediaWiki-commits] [Gerrit] mediawiki...SphinxSearch[master]: Fix path error in sphinxapi.php loading

[Notartom (Code Review)]

Notartom has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401112 )

Change subject: Fix path error in sphinxapi.php loading
..

Fix path error in sphinxapi.php loading

Commit 3837675 introduced falling back on loading sphinxapi.php
from the extension directory if the extension wasn't installed with
composer. However, it missed a necessary / in the path. This patch
fixes this.

Change-Id: I09bec64b1a3cae05982dec9901e8ad719152835d
---
M SphinxSearch.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SphinxSearch 
refs/changes/12/401112/1

diff --git a/SphinxSearch.php b/SphinxSearch.php
index 0e812e5..c22796a 100644
--- a/SphinxSearch.php
+++ b/SphinxSearch.php
@@ -50,7 +50,7 @@
 # installation folder to your SphinxSearch extension folder
 # not needed if you install http://pecl.php.net/package/sphinx
 if ( !class_exists( 'SphinxClient' ) ) {
-   require_once ( __DIR__. 'sphinxapi.php' );
+   require_once ( __DIR__ . '/sphinxapi.php' );
 }
 
 # Host and port on which searchd deamon is running

-- 
To view, visit https://gerrit.wikimedia.org/r/401112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09bec64b1a3cae05982dec9901e8ad719152835d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SphinxSearch
Gerrit-Branch: master
Gerrit-Owner: Notartom 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix travis and tests caused by using CommentStore class in rc

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/40 )

Change subject: Fix travis and tests caused by using CommentStore class in rc
..

Fix travis and tests caused by using CommentStore class in rc

Change-Id: Id84e1f5c5015203f5c827fba7f4a59716ab2ca66
---
M repo/tests/phpunit/includes/Store/Sql/SqlChangeStoreTest.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/11/40/1

diff --git a/repo/tests/phpunit/includes/Store/Sql/SqlChangeStoreTest.php 
b/repo/tests/phpunit/includes/Store/Sql/SqlChangeStoreTest.php
index 13021f3..9c2a9ec 100644
--- a/repo/tests/phpunit/includes/Store/Sql/SqlChangeStoreTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/SqlChangeStoreTest.php
@@ -44,7 +44,8 @@
'rc_cur_id' => 2354,
'rc_this_oldid' => 343,
'rc_last_oldid' => 897,
-   'rc_comment' => 'Fake data!'
+   'rc_comment_text' => 'Fake data!',
+   'rc_comment_data' => null
] );
 
$changeWithDataFromRC = $factory->newForEntity( 
EntityChange::REMOVE, new ItemId( 'Q123' ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/40
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id84e1f5c5015203f5c827fba7f4a59716ab2ca66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Split off profile form and tab styles from UserProfile.css i...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401109 )

Change subject: Split off profile form and tab styles from UserProfile.css into 
their own modules
..


Split off profile form and tab styles from UserProfile.css into their own 
modules

This introduces 2 new ResourceLoader modules, representing styles for
profile forms and special profile tab styles respectively. This helps reduces
the overhead on UserProfile.css.

Module names:
 - ext.socialprofile.special.updateprofile.css
 - ext.socialprofile.userprofile.tabs.css

The profile form styles are also loaded on Special:EditProfile (despite
the slightly different name of the special page). The name isn't much to
worry about right now since there'll be a future refactoring patch to merge
the functionality of Special:EditProfile into Special:UpdateProfile anyways.

Change-Id: Iad1b5203697a0c8353ad67c0c9a87f0f63247a8d
---
A UserProfile/ProfileTabs.css
M UserProfile/SpecialEditProfile.php
A UserProfile/SpecialUpdateProfile.css
M UserProfile/SpecialUpdateProfile.php
M UserProfile/SpecialUploadAvatar.php
M UserProfile/UserProfile.css
M UserProfile/UserProfile.php
7 files changed, 267 insertions(+), 248 deletions(-)

Approvals:
  Jack Phoenix: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/UserProfile/ProfileTabs.css b/UserProfile/ProfileTabs.css
new file mode 100644
index 000..a241d22
--- /dev/null
+++ b/UserProfile/ProfileTabs.css
@@ -0,0 +1,45 @@
+.profile-tab-bar {
+   margin-top: 20px;
+}
+
+.profile-tab {
+   background-color: #68bd46;
+   text-align: center;
+   height: 22px;
+   min-width: 72px;
+   float: left;
+   padding: 6px 5px 0 5px;
+   margin: 0 5px 0 0;
+}
+
+.profile-tab-on {
+   background-color: #466c2c;
+   float: left;
+   height: 22px;
+   color: #fff;
+   font-size: 12px;
+   min-width: 72px;
+   font-weight: 700;
+   padding: 6px 5px 0 5px;
+   margin: 0 5px 0 0;
+   text-align: center;
+}
+
+.profile-tab-on a,
+.profile-tab a {
+   color: #fff;
+   font-weight: 400;
+   text-decoration: none;
+}
+
+.profile-tab a:hover {
+   color: #466C2C;
+}
+
+.profile-tab a:visited {
+   color: #fff !important;
+}
+
+.profile-tab-on a:visited {
+   color: #fff !important;
+}
\ No newline at end of file
diff --git a/UserProfile/SpecialEditProfile.php 
b/UserProfile/SpecialEditProfile.php
index b4d68a2..c407cf8 100644
--- a/UserProfile/SpecialEditProfile.php
+++ b/UserProfile/SpecialEditProfile.php
@@ -55,9 +55,10 @@
}
 
// Add CSS & JS
-   $out->addModuleStyles( array(
-   'ext.socialprofile.userprofile.css'
-   ) );
+   $out->addModuleStyles( [
+   'ext.socialprofile.userprofile.tabs.css',
+   'ext.socialprofile.special.updateprofile.css'
+   ] );
$out->addModules( 'ext.userProfile.updateProfile' );
 
// Get the user's name from the wpUser URL parameter
diff --git a/UserProfile/SpecialUpdateProfile.css 
b/UserProfile/SpecialUpdateProfile.css
new file mode 100644
index 000..6b84d5a
--- /dev/null
+++ b/UserProfile/SpecialUpdateProfile.css
@@ -0,0 +1,186 @@
+.firstHeading {
+   border-bottom: none;
+   margin: 0 !important;
+   display: none;
+}
+
+.profile-info {
+   padding: 25px 0;
+}
+
+.profile-update {
+   padding: 0;
+}
+
+.profile-update-button {
+   background-color: #78ba5d;
+   border: 1px solid #6b6b6b;
+   color: #fff;
+   font-size: 13px;
+   padding: 3px;
+}
+
+.profile-update-title {
+   color: #333;
+   font-size: 16px;
+   font-weight: 700;
+   margin: 0 0 5px 0 !important;
+}
+
+.profile-update-title img {
+   vertical-align: middle;
+   margin: -3px 0 0 5px;
+}
+
+.profile-update-unit-left {
+   color: #797979;
+   font-size: 12px;
+   font-weight: 700;
+   float: left;
+   width: 150px;
+}
+
+.profile-update-unit {
+   float: left;
+   width: 450px;
+}
+
+.profile-update-unit-small {
+   color: #797979;
+   font-size: 10px;
+   float: left;
+   width: 450px;
+}
+
+.profile-update-row {
+   color: #797979;
+   font-weight: 700;
+   font-size: 12px;
+}
+
+.profile-update-links {
+   margin: 0 0 10px 0;
+   font-weight: 700;
+}
+
+.profile-update-links a {
+   text-decoration: none;
+}
+
+.profile-status {
+   background-color: #fffb9b;
+   font-weight: 700;
+   padding: 0 5px 0 5px;
+}
+
+.profile-on {
+   background-color: #fffb9b;
+   border: 1px solid #fdc745;
+   font-weight: 700;
+   padding: 1px 5px 1px 5px;
+}
+
+/* The text "Message type" on the left side of the message type selector on 
profile page */
+.profile-board-message-type {
+   color: #797979;
+}
+

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Add source DL link to popup, fix $needMidi cond

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401093 )

Change subject: Add source DL link to popup, fix $needMidi cond
..


Add source DL link to popup, fix $needMidi cond

Add storing LilyPond source file and add ability
to download by creating a DL link in score's popup.

Also, fixed condition of setting $needMidi, previous
one was invalid and was giving true when it shouldn't.
It's correct now.

Bug: T183736
Change-Id: Ie80bda1f30d1b7046669ffa6353fc7f5328e7be0
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/Score.php
M modules/ext.score.popup.css
M modules/ext.score.popup.js
6 files changed, 69 insertions(+), 17 deletions(-)

Approvals:
  Ebe123: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 29b7755..a64d03f 100644
--- a/extension.json
+++ b/extension.json
@@ -64,7 +64,8 @@
"mediawiki.api"
],
"messages": [
-   "score-download-midi-file"
+   "score-download-midi-file",
+   "score-download-source-file"
]
}
},
diff --git a/i18n/en.json b/i18n/en.json
index 0129a0b..b42c585 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -10,6 +10,7 @@
"score-backend-error": "Unable to copy the generated files to their 
final location:\n$1",
"score-desc": "Adds a tag for rendering musical scores with LilyPond",
"score-download-midi-file": "Download MIDI file",
+   "score-download-source-file": "Download lilypond file",
"score-error-category": "Pages with score rendering errors",
"score-error-category-desc": "There was an error while rendering the 
score.",
"score-getcwderr": "Unable to obtain current working directory",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b2fb0bc..7fb2a39 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -16,6 +16,7 @@
"score-backend-error": "Parameters:\n* $1 - result message which was 
returned",
"score-desc": 
"{{desc|name=Score|url=https://www.mediawiki.org/wiki/Extension:Score}};,
"score-download-midi-file": "Content of link to download MIDI file of 
score shown in score popup",
+   "score-download-source-file": "Content of link to download the lilypond 
file of score shown in score popup",
"score-error-category": "Name of [[mw:Help:Tracking categories|tracking 
category]] to list pages where there was an error rendering the 
 tag.",
"score-error-category-desc": "Description on 
[[Special:TrackingCategories]] for the {{msg-mw|score-error-category}} tracking 
category.",
"score-getcwderr": "Displayed if the extension cannot obtain the 
current working directory.",
diff --git a/includes/Score.php b/includes/Score.php
index 854deb1..de9d970 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -472,19 +472,29 @@
 
self::eraseFactory( $options['factory_directory'] );
 
-   // Wrap score in div container.
-   $link = HTML::rawElement( 'div', [
-   'class' => 'mw-ext-score',
-   'data-midi' => $options['override_midi'] ?
+   $attributes = [
+   'class' => 'mw-ext-score'
+   ];
+
+   if ( $options['override_midi']
+   || isset( 
$existingFiles["{$options['file_name_prefix']}.midi"] ) ) {
+   $attributes['data-midi'] = $options['override_midi'] ?
$options['midi_file']->getUrl()
-   : 
"{$options['dest_url']}/{$options['file_name_prefix']}.midi"
-   ], $link );
+   : 
"{$options['dest_url']}/{$options['file_name_prefix']}.midi";
+   }
+
+   if ( isset( $existingFiles["{$options['file_name_prefix']}.ly"] 
) ) {
+   $attributes['data-source'] = 
"{$options['dest_url']}/{$options['file_name_prefix']}.ly";
+   }
+
+   // Wrap score in div container.
+   $link = HTML::rawElement( 'div', $attributes, $link );
 
return $link;
}
 
/**
-* Generates score PNG file(s) and a MIDI file.
+* Generates score PNG file(s) and a MIDI file. Stores lilypond file.
 *
 * @param string $code Score code.
 * @param array $options Rendering options. They are the same as for
@@ -567,9 +577,7 @@
$options['factory_directory'] );
}
$needMidi = false;
-   if ( !$options['raw'] ||
-   ( $options['generate_ogg'] || 
!$options['override_midi'] )
-   ) {
+   if ( !$options['raw'] || 

[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Add Form extension

[Umherirrender (Code Review)]

Umherirrender has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401110 )

Change subject: Add Form extension
..


Add Form extension

Change-Id: I89ebc2e687bdefcd8e87a80b16bbcc716b292b97
---
M .gitmodules
A Form
2 files changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Umherirrender: Verified; Looks good to me, approved



diff --git a/.gitmodules b/.gitmodules
index ca44177..a564b10 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -926,6 +926,10 @@
path = ForcePreview
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ForcePreview
branch = .
+[submodule "Form"]
+   path = Form
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Form
+   branch = .
 [submodule "FormPreloadPostCache"]
path = FormPreloadPostCache
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/FormPreloadPostCache
diff --git a/Form b/Form
new file mode 16
index 000..891edcc
--- /dev/null
+++ b/Form
@@ -0,0 +1 @@
+Subproject commit 891edccc4385b3c8d08ca7efb7955cca84fefe24

-- 
To view, visit https://gerrit.wikimedia.org/r/401110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I89ebc2e687bdefcd8e87a80b16bbcc716b292b97
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Add Form extension

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401110 )

Change subject: Add Form extension
..

Add Form extension

Change-Id: I89ebc2e687bdefcd8e87a80b16bbcc716b292b97
---
M .gitmodules
A Form
2 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/10/401110/1

diff --git a/.gitmodules b/.gitmodules
index 3ed794a..3d35498 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -926,6 +926,10 @@
path = ForcePreview
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ForcePreview
branch = .
+[submodule "Form"]
+   path = Form
+   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Form
+   branch = .
 [submodule "FormPreloadPostCache"]
path = FormPreloadPostCache
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/FormPreloadPostCache
@@ -3123,9 +3127,6 @@
 [submodule "DataTypes"]
path = DataTypes
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/DataTypes
-[submodule "Form"]
-   path = Form
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Form
 [submodule "GitGadgets"]
path = GitGadgets
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/GitGadgets
diff --git a/Form b/Form
new file mode 16
index 000..891edcc
--- /dev/null
+++ b/Form
@@ -0,0 +1 @@
+Subproject commit 891edccc4385b3c8d08ca7efb7955cca84fefe24

-- 
To view, visit https://gerrit.wikimedia.org/r/401110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89ebc2e687bdefcd8e87a80b16bbcc716b292b97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Split off profile form and tab styles from UserProfile.css i...

[SamanthaNguyen (Code Review)]

SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401109 )

Change subject: Split off profile form and tab styles from UserProfile.css into 
their own modules
..

Split off profile form and tab styles from UserProfile.css into their own 
modules

This introduces 2 new ResourceLoader modules, representing styles for
profile forms and special profile tab styles respectively. This helps reduces
the overhead on UserProfile.css.

Module names:
 - ext.socialprofile.special.updateprofile.css
 - ext.socialprofile.userprofile.tabs.css

The profile form styles are also loaded on Special:EditProfile (despite
the slightly different name of the special page). The name isn't much to
worry about right now since there'll be a future refactoring patch to merge
the functionality of Special:EditProfile into Special:UpdateProfile anyways.

Change-Id: Iad1b5203697a0c8353ad67c0c9a87f0f63247a8d
---
A UserProfile/ProfileTabs.css
M UserProfile/SpecialEditProfile.php
A UserProfile/SpecialUpdateProfile.css
M UserProfile/SpecialUpdateProfile.php
M UserProfile/SpecialUploadAvatar.php
M UserProfile/UserProfile.css
M UserProfile/UserProfile.php
7 files changed, 267 insertions(+), 248 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/09/401109/1

diff --git a/UserProfile/ProfileTabs.css b/UserProfile/ProfileTabs.css
new file mode 100644
index 000..a241d22
--- /dev/null
+++ b/UserProfile/ProfileTabs.css
@@ -0,0 +1,45 @@
+.profile-tab-bar {
+   margin-top: 20px;
+}
+
+.profile-tab {
+   background-color: #68bd46;
+   text-align: center;
+   height: 22px;
+   min-width: 72px;
+   float: left;
+   padding: 6px 5px 0 5px;
+   margin: 0 5px 0 0;
+}
+
+.profile-tab-on {
+   background-color: #466c2c;
+   float: left;
+   height: 22px;
+   color: #fff;
+   font-size: 12px;
+   min-width: 72px;
+   font-weight: 700;
+   padding: 6px 5px 0 5px;
+   margin: 0 5px 0 0;
+   text-align: center;
+}
+
+.profile-tab-on a,
+.profile-tab a {
+   color: #fff;
+   font-weight: 400;
+   text-decoration: none;
+}
+
+.profile-tab a:hover {
+   color: #466C2C;
+}
+
+.profile-tab a:visited {
+   color: #fff !important;
+}
+
+.profile-tab-on a:visited {
+   color: #fff !important;
+}
\ No newline at end of file
diff --git a/UserProfile/SpecialEditProfile.php 
b/UserProfile/SpecialEditProfile.php
index b4d68a2..c407cf8 100644
--- a/UserProfile/SpecialEditProfile.php
+++ b/UserProfile/SpecialEditProfile.php
@@ -55,9 +55,10 @@
}
 
// Add CSS & JS
-   $out->addModuleStyles( array(
-   'ext.socialprofile.userprofile.css'
-   ) );
+   $out->addModuleStyles( [
+   'ext.socialprofile.userprofile.tabs.css',
+   'ext.socialprofile.special.updateprofile.css'
+   ] );
$out->addModules( 'ext.userProfile.updateProfile' );
 
// Get the user's name from the wpUser URL parameter
diff --git a/UserProfile/SpecialUpdateProfile.css 
b/UserProfile/SpecialUpdateProfile.css
new file mode 100644
index 000..6b84d5a
--- /dev/null
+++ b/UserProfile/SpecialUpdateProfile.css
@@ -0,0 +1,186 @@
+.firstHeading {
+   border-bottom: none;
+   margin: 0 !important;
+   display: none;
+}
+
+.profile-info {
+   padding: 25px 0;
+}
+
+.profile-update {
+   padding: 0;
+}
+
+.profile-update-button {
+   background-color: #78ba5d;
+   border: 1px solid #6b6b6b;
+   color: #fff;
+   font-size: 13px;
+   padding: 3px;
+}
+
+.profile-update-title {
+   color: #333;
+   font-size: 16px;
+   font-weight: 700;
+   margin: 0 0 5px 0 !important;
+}
+
+.profile-update-title img {
+   vertical-align: middle;
+   margin: -3px 0 0 5px;
+}
+
+.profile-update-unit-left {
+   color: #797979;
+   font-size: 12px;
+   font-weight: 700;
+   float: left;
+   width: 150px;
+}
+
+.profile-update-unit {
+   float: left;
+   width: 450px;
+}
+
+.profile-update-unit-small {
+   color: #797979;
+   font-size: 10px;
+   float: left;
+   width: 450px;
+}
+
+.profile-update-row {
+   color: #797979;
+   font-weight: 700;
+   font-size: 12px;
+}
+
+.profile-update-links {
+   margin: 0 0 10px 0;
+   font-weight: 700;
+}
+
+.profile-update-links a {
+   text-decoration: none;
+}
+
+.profile-status {
+   background-color: #fffb9b;
+   font-weight: 700;
+   padding: 0 5px 0 5px;
+}
+
+.profile-on {
+   background-color: #fffb9b;
+   border: 1px solid #fdc745;
+   font-weight: 700;
+   padding: 1px 5px 1px 5px;
+}
+
+/* The text "Message type" on the left side of the message type selector on 
profile page */
+.profile-board-message-type {
+   

[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Revert some parts of "Add BlueSpiceAbout"

[Umherirrender (Code Review)]

Umherirrender has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401108 )

Change subject: Revert some parts of "Add BlueSpiceAbout"
..


Revert some parts of "Add BlueSpiceAbout"

.gitmodules contains more submodules as added commit ids,
this leasves the repo in an unclean state

This reverts parts of commit 385dbb885075a76df45d3d6bb8298947e353cc93.

Change-Id: Ia0de7f5a15ba8ab31e4598ae4c56d4da0259f649
---
M .gitmodules
1 file changed, 0 insertions(+), 87 deletions(-)

Approvals:
  Umherirrender: Verified; Looks good to me, approved



diff --git a/.gitmodules b/.gitmodules
index 3ed794a..ca44177 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3078,90 +3078,3 @@
path = wikihiero
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/wikihiero
branch = .
-[submodule "BSSMWConnector"]
-   path = BSSMWConnector
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BSSMWConnector
-[submodule "BlueSpiceAbout"]
-   path = BlueSpiceAbout
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceAbout
-[submodule "BlueSpiceHideTitle"]
-   path = BlueSpiceHideTitle
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceHideTitle
-[submodule "BlueSpiceInsertCategory"]
-   path = BlueSpiceInsertCategory
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertCategory
-[submodule "BlueSpiceInsertFile"]
-   path = BlueSpiceInsertFile
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertFile
-[submodule "BlueSpiceInsertLink"]
-   path = BlueSpiceInsertLink
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertLink
-[submodule "BlueSpiceInsertMagic"]
-   path = BlueSpiceInsertMagic
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertMagic
-[submodule "BlueSpiceNamespaceCSS"]
-   path = BlueSpiceNamespaceCSS
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceNamespaceCSS
-[submodule "BlueSpicePageAccess"]
-   path = BlueSpicePageAccess
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpicePageAccess
-[submodule "BlueSpiceRSSFeeder"]
-   path = BlueSpiceRSSFeeder
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceRSSFeeder
-[submodule "BlueSpiceSaferEdit"]
-   path = BlueSpiceSaferEdit
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceSaferEdit
-[submodule "BlueSpiceUEModulePDF"]
-   path = BlueSpiceUEModulePDF
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceUEModulePDF
-[submodule "BlueSpiceUniversalExport"]
-   path = BlueSpiceUniversalExport
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceUniversalExport
-[submodule "BlueSpiceUsageTracker"]
-   path = BlueSpiceUsageTracker
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceUsageTracker
-[submodule "DataTypes"]
-   path = DataTypes
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/DataTypes
-[submodule "Form"]
-   path = Form
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Form
-[submodule "GitGadgets"]
-   path = GitGadgets
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/GitGadgets
-[submodule "GitHub"]
-   path = GitHub
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/GitHub
-[submodule "MoveToCommons"]
-   path = MoveToCommons
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/MoveToCommons
-[submodule "MoveToCommonsClient"]
-   path = MoveToCommonsClient
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/MoveToCommonsClient
-[submodule "NumberOfComments"]
-   path = NumberOfComments
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/NumberOfComments
-[submodule "Parsoid"]
-   path = Parsoid
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Parsoid
-[submodule "PreferencesList"]
-   path = PreferencesList
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/PreferencesList
-[submodule "PreferencesMaster"]
-   path = PreferencesMaster
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/PreferencesMaster
-[submodule "Recoin"]
-   path = Recoin
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Recoin
-[submodule "RelationLinks"]
-   path = RelationLinks
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/RelationLinks
-[submodule "ThumbParser"]
-   path = ThumbParser
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ThumbParser
-[submodule "Vine"]
-   path = Vine
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Vine
-[submodule "WikidataEntitySuggester"]
-   path = 

[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Revert "Add BlueSpiceAbout"

[Umherirrender (Code Review)]

Hello Legoktm,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/401108

to review the following change.


Change subject: Revert "Add BlueSpiceAbout"
..

Revert "Add BlueSpiceAbout"

.gitmodules contains more submodules as added commit ids,
this leasves the repo in an unclean state

This reverts commit 385dbb885075a76df45d3d6bb8298947e353cc93.

Change-Id: Ia0de7f5a15ba8ab31e4598ae4c56d4da0259f649
---
M .gitmodules
D BlueSpiceAbout
2 files changed, 0 insertions(+), 92 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/08/401108/1

diff --git a/.gitmodules b/.gitmodules
index 3ed794a..4bf1fc4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -178,10 +178,6 @@
path = BlogPage
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlogPage
branch = .
-[submodule "BlueSpiceAbout"]
-   path = BlueSpiceAbout
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceAbout
-   branch = .
 [submodule "BlueSpiceArticleInfo"]
path = BlueSpiceArticleInfo
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceArticleInfo
@@ -3078,90 +3074,3 @@
path = wikihiero
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/wikihiero
branch = .
-[submodule "BSSMWConnector"]
-   path = BSSMWConnector
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BSSMWConnector
-[submodule "BlueSpiceAbout"]
-   path = BlueSpiceAbout
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceAbout
-[submodule "BlueSpiceHideTitle"]
-   path = BlueSpiceHideTitle
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceHideTitle
-[submodule "BlueSpiceInsertCategory"]
-   path = BlueSpiceInsertCategory
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertCategory
-[submodule "BlueSpiceInsertFile"]
-   path = BlueSpiceInsertFile
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertFile
-[submodule "BlueSpiceInsertLink"]
-   path = BlueSpiceInsertLink
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertLink
-[submodule "BlueSpiceInsertMagic"]
-   path = BlueSpiceInsertMagic
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertMagic
-[submodule "BlueSpiceNamespaceCSS"]
-   path = BlueSpiceNamespaceCSS
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceNamespaceCSS
-[submodule "BlueSpicePageAccess"]
-   path = BlueSpicePageAccess
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpicePageAccess
-[submodule "BlueSpiceRSSFeeder"]
-   path = BlueSpiceRSSFeeder
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceRSSFeeder
-[submodule "BlueSpiceSaferEdit"]
-   path = BlueSpiceSaferEdit
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceSaferEdit
-[submodule "BlueSpiceUEModulePDF"]
-   path = BlueSpiceUEModulePDF
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceUEModulePDF
-[submodule "BlueSpiceUniversalExport"]
-   path = BlueSpiceUniversalExport
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceUniversalExport
-[submodule "BlueSpiceUsageTracker"]
-   path = BlueSpiceUsageTracker
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceUsageTracker
-[submodule "DataTypes"]
-   path = DataTypes
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/DataTypes
-[submodule "Form"]
-   path = Form
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Form
-[submodule "GitGadgets"]
-   path = GitGadgets
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/GitGadgets
-[submodule "GitHub"]
-   path = GitHub
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/GitHub
-[submodule "MoveToCommons"]
-   path = MoveToCommons
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/MoveToCommons
-[submodule "MoveToCommonsClient"]
-   path = MoveToCommonsClient
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/MoveToCommonsClient
-[submodule "NumberOfComments"]
-   path = NumberOfComments
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/NumberOfComments
-[submodule "Parsoid"]
-   path = Parsoid
-   url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Parsoid
-[submodule "PreferencesList"]
-   path = PreferencesList
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/PreferencesList
-[submodule "PreferencesMaster"]
-   path = PreferencesMaster
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/PreferencesMaster
-[submodule "Recoin"]
-   path = Recoin
-   url = 

[MediaWiki-commits] [Gerrit] mediawiki...cldr[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401107 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..

build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: I3d954b80cf3b3196454ebc6cd7def2dcec1b44f2
---
M .phpcs.xml
M composer.json
M rebuild.php
3 files changed, 16 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/cldr 
refs/changes/07/401107/1

diff --git a/.phpcs.xml b/.phpcs.xml
index a181996..52ddae2 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -3,11 +3,16 @@



-   
+   




+   
+   
+   
+   
+   
.


diff --git a/composer.json b/composer.json
index 94edc26..50eda74 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,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/rebuild.php b/rebuild.php
index 784cfaa..0c59612 100644
--- a/rebuild.php
+++ b/rebuild.php
@@ -462,29 +462,28 @@
  * @param string $code
  * @return string
  */
-// @codingStandardsIgnoreStart
 function getRealCode( $code ) {
$realCode = $code;
-   if ( !strcmp( $code, 'kk' ) )
+   if ( !strcmp( $code, 'kk' ) ) {
$realCode = 'kk-cyrl';
-   elseif ( !strcmp( $code, 'ku' ) )
+   } elseif ( !strcmp( $code, 'ku' ) ) {
$realCode = 'ku-arab';
-   elseif ( !strcmp( $code, 'sr' ) )
+   } elseif ( !strcmp( $code, 'sr' ) ) {
$realCode = 'sr-ec';
-   elseif ( !strcmp( $code, 'tg' ) )
+   } elseif ( !strcmp( $code, 'tg' ) ) {
$realCode = 'tg-cyrl';
-   elseif ( !strcmp( $code, 'zh' ) )
+   } elseif ( !strcmp( $code, 'zh' ) ) {
$realCode = 'zh-hans';
-   elseif ( !strcmp( $code, 'pt' ) )
+   } elseif ( !strcmp( $code, 'pt' ) ) {
$realCode = 'pt-br';
-   elseif ( !strcmp( $code, 'pt-pt' ) )
+   } elseif ( !strcmp( $code, 'pt-pt' ) ) {
$realCode = 'pt';
-   elseif ( !strcmp( $code, 'az-arab' ) )
+   } elseif ( !strcmp( $code, 'az-arab' ) ) {
$realCode = 'azb';
+   }
 
return $realCode;
 }
-// @codingStandardsIgnoreEnd
 
 $maintClass = 'CLDRRebuild';
 require_once RUN_MAINTENANCE_IF_MAIN;

-- 
To view, visit https://gerrit.wikimedia.org/r/401107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d954b80cf3b3196454ebc6cd7def2dcec1b44f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/cldr
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Use relative path in require_once

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401098 )

Change subject: Use relative path in require_once
..


Use relative path in require_once

No need for absolute path with $IP
There is no need to install SocialProfile inside a folder called
extensions

Change-Id: I903ce4a3f1a1716e72c8ccec8419bb22d51f1798
---
M SocialProfile.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  SamanthaNguyen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/SocialProfile.php b/SocialProfile.php
index 92d2498..5046af6 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -94,7 +94,7 @@
 $wgAutoloadClasses['SocialProfileHooks'] = __DIR__ . '/SocialProfileHooks.php';
 
 // Loader files
-require_once( "$IP/extensions/SocialProfile/UserProfile/UserProfile.php" ); // 
Profile page configuration loader file
+require_once __DIR__ . '/UserProfile/UserProfile.php'; // Profile page 
configuration loader file
 wfLoadExtensions( [
'SocialProfile/SystemGifts', // SystemGifts (awards functionality)
'SocialProfile/UserActivity', // UserActivity - recent social changes

-- 
To view, visit https://gerrit.wikimedia.org/r/401098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I903ce4a3f1a1716e72c8ccec8419bb22d51f1798
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: SamanthaNguyen 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Uses PSR-4 autoloader

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401082 )

Change subject: Uses PSR-4 autoloader
..


Uses PSR-4 autoloader

Bug: T182943
Change-Id: I9758d20d0ef9df40c188574004d5df45968c2417
---
M extension.json
R includes/Index/CustomIndexField.php
R includes/Index/CustomIndexFieldsParser.php
R includes/Index/DatabaseIndexContentLookup.php
R includes/Index/EditIndexPage.php
R includes/Index/IndexContent.php
R includes/Index/IndexContentHandler.php
R includes/Index/IndexContentLookup.php
R includes/Index/IndexDifferenceEngine.php
R includes/Index/IndexEditAction.php
R includes/Index/IndexRedirectContent.php
R includes/Index/IndexSubmitAction.php
R includes/Index/ParserHelper.php
R includes/Index/ProofreadIndexDbConnector.php
R includes/Page/DatabaseIndexForPageLookup.php
R includes/Page/EditPagePage.php
R includes/Page/IndexForPageLookup.php
R includes/Page/PageContent.php
R includes/Page/PageContentBuilder.php
R includes/Page/PageContentHandler.php
R includes/Page/PageDifferenceEngine.php
R includes/Page/PageDisplayHandler.php
R includes/Page/PageEditAction.php
R includes/Page/PageLevel.php
R includes/Page/PageSubmitAction.php
R includes/Page/PageViewAction.php
R includes/Page/ProofreadPageDbConnector.php
R tests/phpunit/Index/CustomIndexFieldsParserTest.php
R tests/phpunit/Index/IndexContentHandlerTest.php
R tests/phpunit/Index/IndexContentLookupMock.php
R tests/phpunit/Index/IndexContentTest.php
R tests/phpunit/Index/IndexRedirectContentTest.php
R tests/phpunit/Index/ParserHelperTest.php
R tests/phpunit/Page/DatabaseIndexForPageLookupTest.php
R tests/phpunit/Page/IndexForPageLookupMock.php
R tests/phpunit/Page/PageContentBuilderTest.php
R tests/phpunit/Page/PageContentHandlerTest.php
R tests/phpunit/Page/PageContentTest.php
R tests/phpunit/Page/PageDisplayHandlerTest.php
R tests/phpunit/Page/PageLevelTest.php
40 files changed, 10 insertions(+), 47 deletions(-)

Approvals:
  Ladsgroup: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 2de9048..e52a9e5 100644
--- a/extension.json
+++ b/extension.json
@@ -8,6 +8,9 @@
"descriptionmsg": "proofreadpage_desc",
"license-name": "GPL-2.0+",
"type": "other",
+   "requires": {
+   "MediaWiki": ">= 1.31.0"
+   },
"@GroupPermissions": [
"Group allowed to modify pagequality",
"Group allowed to use pagequality-admin privilege"
@@ -43,60 +46,20 @@
"ExtensionMessagesFiles": {
"ProofreadPageAlias": "ProofreadPage.alias.php"
},
+   "AutoloadNamespaces": {
+   "ProofreadPage\\": "includes/"
+   },
"AutoloadClasses": {
"ProofreadPage": "ProofreadPage.body.php",
-   "ProofreadPage\\Context": "includes/Context.php",
-   "ProofreadPage\\ProofreadPageInit": 
"includes/ProofreadPageInit.php",
-   "ProofreadPage\\DiffFormatterUtils": 
"includes/DiffFormatterUtils.php",
-   "ProofreadPage\\FileNotFoundException": 
"includes/FileNotFoundException.php",
-   "ProofreadPage\\PageNumberNotFoundException": 
"includes/PageNumberNotFoundException.php",
-   "ProofreadPage\\FileProvider": "includes/FileProvider.php",
-   "ProofreadPage\\Link": "includes/Link.php",
-   "ProofreadPage\\Index\\CustomIndexField": 
"includes/index/CustomIndexField.php",
-   "ProofreadPage\\Index\\CustomIndexFieldsParser": 
"includes/index/CustomIndexFieldsParser.php",
-   "ProofreadPage\\Index\\IndexContentLookup": 
"includes/index/IndexContentLookup.php",
-   "ProofreadPage\\Index\\DatabaseIndexContentLookup": 
"includes/index/DatabaseIndexContentLookup.php",
-   "ProofreadPage\\Index\\IndexContent": 
"includes/index/IndexContent.php",
-   "ProofreadPage\\Index\\IndexRedirectContent": 
"includes/index/IndexRedirectContent.php",
-   "ProofreadPage\\Index\\IndexContentHandler": 
"includes/index/IndexContentHandler.php",
-   "ProofreadPage\\Index\\IndexDifferenceEngine": 
"includes/index/IndexDifferenceEngine.php",
-   "ProofreadPage\\Index\\IndexEditAction": 
"includes/index/IndexEditAction.php",
-   "ProofreadPage\\Index\\IndexSubmitAction": 
"includes/index/IndexSubmitAction.php",
-   "ProofreadPage\\Index\\ParserHelper": 
"includes/index/ParserHelper.php",
-   "ProofreadPage\\Index\\EditIndexPage": 
"includes/index/EditIndexPage.php",
-   "ProofreadIndexDbConnector": 
"includes/index/ProofreadIndexDbConnector.php",
-   "ProofreadPage\\Pagination\\PaginationFactory": 
"includes/Pagination/PaginationFactory.php",
-   "ProofreadPage\\Pagination\\PageNumber": 
"includes/Pagination/PageNumber.php",
-   

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Made download_dump.py download process atomic

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400616 )

Change subject: Made download_dump.py download process atomic
..


Made download_dump.py download process atomic

Bug: T183675
Change-Id: I142629bb89ffc1c810adcf8f1417ecc824594e41
---
M scripts/maintenance/download_dump.py
1 file changed, 66 insertions(+), 22 deletions(-)

Approvals:
  Zhuyifei1999: Looks good to me, but someone else must approve
  Framawiki: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scripts/maintenance/download_dump.py 
b/scripts/maintenance/download_dump.py
index d3a5123..c55940b 100644
--- a/scripts/maintenance/download_dump.py
+++ b/scripts/maintenance/download_dump.py
@@ -18,10 +18,27 @@
 #
 from __future__ import absolute_import, division, unicode_literals
 
+import binascii
+
 import os.path
 import sys
 
-from os import remove, symlink
+from os import remove, symlink, urandom
+
+try:
+from os import replace
+except ImportError:   # py2
+if sys.platform == 'win32':
+import os
+
+def replace(src, dst):
+try:
+os.rename(src, dst)
+except OSError:
+remove(dst)
+os.rename(src, dst)
+else:
+from os import rename as replace
 
 import pywikibot
 
@@ -63,36 +80,63 @@
 
 download_filename = self.getOption('wikiname') + \
 '-latest-' + self.getOption('filename')
-file_storepath = os.path.join(
+temp_filename = download_filename + '-' + \
+binascii.b2a_hex(urandom(8)).decode('ascii') + '.part'
+
+file_final_storepath = os.path.join(
 self.getOption('storepath'), download_filename)
+file_current_storepath = os.path.join(
+self.getOption('storepath'), temp_filename)
 
 # https://wikitech.wikimedia.org/wiki/Help:Toolforge#Dumps
 toolforge_dump_filepath = self.get_dump_name(
 self.getOption('wikiname'), self.getOption('filename'))
-if toolforge_dump_filepath:
-pywikibot.output('Symlinking file from ' + toolforge_dump_filepath)
-if os.path.exists(file_storepath):
-remove(file_storepath)
 
-symlink(toolforge_dump_filepath, file_storepath)
-else:
-url = 'https://dumps.wikimedia.org/' + \
-os.path.join(self.getOption('wikiname'),
- 'latest', download_filename)
-pywikibot.output('Downloading file from ' + url)
-response = fetch(url, stream=True)
-if response.status == 200:
+# First iteration for atomic download with temporary file
+# Second iteration for fallback non-atomic download
+for non_atomic in range(2):
+try:
+if toolforge_dump_filepath:
+pywikibot.output('Symlinking file from ' +
+ toolforge_dump_filepath)
+if non_atomic:
+if os.path.exists(file_final_storepath):
+remove(file_final_storepath)
+symlink(toolforge_dump_filepath, file_current_storepath)
+else:
+url = 'https://dumps.wikimedia.org/{0}/latest/{1}'.format(
+self.getOption('wikiname'), download_filename)
+pywikibot.output('Downloading file from ' + url)
+response = fetch(url, stream=True)
+if response.status == 200:
+with open(file_current_storepath, 'wb') as result_file:
+for data in response.data.iter_content(100 * 1024):
+result_file.write(data)
+else:
+return
+# Rename the temporary file to the target file
+# if the download completes successfully
+if not non_atomic:
+replace(file_current_storepath, file_final_storepath)
+break
+except (OSError, IOError):
+pywikibot.exception()
+
 try:
-with open(file_storepath, 'wb') as result_file:
-for chunk in response.data.iter_content(100 * 1024):
-result_file.write(chunk)
-except IOError:
+remove(file_current_storepath)
+except (OSError, IOError):
 pywikibot.exception()
-return False
-else:
-return
 
-pywikibot.output('Done! File stored as ' + file_storepath)
+# If the atomic download fails, try without a temporary file
+# If the non-atomic download also fails, exit the script
+if not non_atomic:
+   

[MediaWiki-commits] [Gerrit] mediawiki...FileAnnotations[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review. ( 
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(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FileAnnotations 
refs/changes/06/401106/1

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
-   '' .
-   '' .
-   '' .
-   '' .
-   '';
+   return '' .
+   '' .
+   '' .
+   '' .
+   '';
}
 
// 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: newchange
Gerrit-Change-Id: Ib373e3c21dde5f04b758f79f7a2018d67537e36a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FileAnnotations
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401105 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..

build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: I801c7f79af38f5ecf4e1ed07841386e9fab36f6b
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/05/401105/1

diff --git a/composer.json b/composer.json
index 6c45e79..f3cbcc4 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"mediawiki/minus-x": "0.2.1"
},
"scripts": {

-- 
To view, visit https://gerrit.wikimedia.org/r/401105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I801c7f79af38f5ecf4e1ed07841386e9fab36f6b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401104 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..

build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: Ia6a7cb062c782f11b1b10cdb6302f9ed378ab8eb
---
M .phpcs.xml
M composer.json
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/04/401104/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 76446a7..4764e29 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -3,7 +3,7 @@



-   
+   



@@ -14,6 +14,7 @@



+   



diff --git a/composer.json b/composer.json
index a3f054b..000caa0 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"mediawiki/minus-x": "0.2.1"
},
"scripts": {

-- 
To view, visit https://gerrit.wikimedia.org/r/401104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6a7cb062c782f11b1b10cdb6302f9ed378ab8eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...AdminLinks[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401103 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..

build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: I8e271513e8d5daf4e0b1a90bf92c11c305d223ca
---
M .phpcs.xml
M composer.json
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdminLinks 
refs/changes/03/401103/1

diff --git a/.phpcs.xml b/.phpcs.xml
index b957e41..e38ac01 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -3,8 +3,9 @@



-   
+   

+   



diff --git a/composer.json b/composer.json
index 79b6d3d..6393815 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,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"
},

-- 
To view, visit https://gerrit.wikimedia.org/r/401103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e271513e8d5daf4e0b1a90bf92c11c305d223ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdminLinks
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401102 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..

build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: I515dc1003bd5ee2352c85ac49e19f54e7036bd5d
---
M ApiVisualEditor.php
M composer.json
M modules/ve-mw-collab/SpecialCollabPad.php
3 files changed, 6 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/02/401102/1

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 3878598..dd94163 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -672,9 +672,8 @@
ExtensionRegistry::getInstance()->getAttribute( 
'VisualEditorAvailableContentModels' ),
$config->get( 'VisualEditorAvailableContentModels' )
);
-   return
-   isset( $availableContentModels[ $contentModel ] ) &&
-   $availableContentModels[ $contentModel ];
+   return isset( $availableContentModels[$contentModel] ) &&
+   $availableContentModels[$contentModel];
}
 
/**
diff --git a/composer.json b/composer.json
index 78b5e96..7f42a6e 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"mediawiki/minus-x": "0.2.1"
},
"scripts": {
diff --git a/modules/ve-mw-collab/SpecialCollabPad.php 
b/modules/ve-mw-collab/SpecialCollabPad.php
index 14ad803..06d14af 100644
--- a/modules/ve-mw-collab/SpecialCollabPad.php
+++ b/modules/ve-mw-collab/SpecialCollabPad.php
@@ -12,7 +12,7 @@
 */
private $output = null;
 
-   function __construct() {
+   public function __construct() {
parent::__construct( 'CollabPad' );
}
 
@@ -25,12 +25,12 @@
return !!$wgVisualEditorRebaserURL && parent::userCanExecute( 
$user );
}
 
-   function isListed() {
+   protected function isListed() {
global $wgVisualEditorRebaserURL;
return !!$wgVisualEditorRebaserURL;
}
 
-   function execute( $par ) {
+   public function execute( $par ) {
$this->setHeaders();
$this->checkPermissions();
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I515dc1003bd5ee2352c85ac49e19f54e7036bd5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceArticleInfo[master]: Use always tabs in composer.json

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401101 )

Change subject: Use always tabs in composer.json
..

Use always tabs in composer.json

Change-Id: I6d825cc3d2f18ccc5b043aa8918c716fc646107a
---
M composer.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceArticleInfo 
refs/changes/01/401101/1

diff --git a/composer.json b/composer.json
index 2a8e6d1..2f76760 100644
--- a/composer.json
+++ b/composer.json
@@ -13,12 +13,12 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-"mediawiki/minus-x": "0.2.1"
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor --exclude 
node_modules",
- "minus-x check ."
+   "minus-x check ."
],
"fix": [
"minus-x fix ."

-- 
To view, visit https://gerrit.wikimedia.org/r/401101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d825cc3d2f18ccc5b043aa8918c716fc646107a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceArticleInfo
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceAuthors[master]: Use always tabs in composer.json

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401100 )

Change subject: Use always tabs in composer.json
..

Use always tabs in composer.json

Change-Id: I8fe53f0449ac0362888f4ddd18ccc741e59eda2e
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceAuthors 
refs/changes/00/401100/1

diff --git a/composer.json b/composer.json
index 867ac62..b3ad822 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
- "mediawiki/minus-x": "0.2.1"
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fe53f0449ac0362888f4ddd18ccc741e59eda2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceAuthors
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

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.
+   '' .
+   '' .
+   '' .
+  

[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401099 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: I4e5f3311af0f11905b8748be71b5fa8e5e5690a7
---
M .phpcs.xml
M composer.json
2 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index 3797dd8..9d8c0d6 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,6 +2,8 @@
 


+   
+   

.

diff --git a/composer.json b/composer.json
index 4756a8a..e450f2e 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"
},

-- 
To view, visit https://gerrit.wikimedia.org/r/401099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e5f3311af0f11905b8748be71b5fa8e5e5690a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceAbout[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401049 )

Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
..


Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files
php-lint will test for valid php files

Change-Id: I6b78637b5d6b4a35ed958cf105d4dd2902dc3773
---
A Gruntfile.js
M composer.json
A package.json
3 files changed, 44 insertions(+), 0 deletions(-)

Approvals:
  Umherirrender: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ea67e84
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,19 @@
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   var conf = grunt.file.readJSON( 'extension.json' );
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/composer.json b/composer.json
index c7d127c..6a975ff 100644
--- a/composer.json
+++ b/composer.json
@@ -6,8 +6,22 @@
"require": {
"composer/installers": "~1.0"
},
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
+   },
"autoload": {
"psr-4": {
}
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
+   ]
}
 }
diff --git a/package.json b/package.json
new file mode 100644
index 000..10fa9bc
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/401049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b78637b5d6b4a35ed958cf105d4dd2902dc3773
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/BlueSpiceAbout
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401099 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..

build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: I4e5f3311af0f11905b8748be71b5fa8e5e5690a7
---
M .phpcs.xml
M composer.json
2 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless 
refs/changes/99/401099/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 3797dd8..9d8c0d6 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,6 +2,8 @@
 


+   
+   

.

diff --git a/composer.json b/composer.json
index 4756a8a..e450f2e 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"
},

-- 
To view, visit https://gerrit.wikimedia.org/r/401099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e5f3311af0f11905b8748be71b5fa8e5e5690a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Use relative path in require_once

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401098 )

Change subject: Use relative path in require_once
..

Use relative path in require_once

No need for absolute path with $IP
There is no need to install SocialProfile inside a folder called
extensions

Change-Id: I903ce4a3f1a1716e72c8ccec8419bb22d51f1798
---
M SocialProfile.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/98/401098/1

diff --git a/SocialProfile.php b/SocialProfile.php
index 92d2498..5046af6 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -94,7 +94,7 @@
 $wgAutoloadClasses['SocialProfileHooks'] = __DIR__ . '/SocialProfileHooks.php';
 
 // Loader files
-require_once( "$IP/extensions/SocialProfile/UserProfile/UserProfile.php" ); // 
Profile page configuration loader file
+require_once __DIR__ . '/UserProfile/UserProfile.php'; // Profile page 
configuration loader file
 wfLoadExtensions( [
'SocialProfile/SystemGifts', // SystemGifts (awards functionality)
'SocialProfile/UserActivity', // UserActivity - recent social changes

-- 
To view, visit https://gerrit.wikimedia.org/r/401098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I903ce4a3f1a1716e72c8ccec8419bb22d51f1798
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...EducationProgram[master]: Slightly improve some type hints in PHPDoc blocks

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400573 )

Change subject: Slightly improve some type hints in PHPDoc blocks
..


Slightly improve some type hints in PHPDoc blocks

Change-Id: I2b0962e293fe9e00a8b3f5933c22f8509d85039a
---
M includes/Extension.php
M includes/rows/RevisionedObject.php
M includes/specials/SpecialEducationProgram.php
M includes/tables/IORMTable.php
M tests/phpunit/Events/RecentPageEventGrouperTest.php
5 files changed, 14 insertions(+), 17 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Extension.php b/includes/Extension.php
index 8a9f08a..b4f1677 100644
--- a/includes/Extension.php
+++ b/includes/Extension.php
@@ -104,7 +104,6 @@
}
 
/**
-*
 * Get the singleton NotificationsManager. If it doesn't exist yet, we
 * create it and set it up.
 *
diff --git a/includes/rows/RevisionedObject.php 
b/includes/rows/RevisionedObject.php
index 4250866..d698696 100644
--- a/includes/rows/RevisionedObject.php
+++ b/includes/rows/RevisionedObject.php
@@ -32,7 +32,6 @@
protected $storeRevisions = true;
 
/**
-*
 * @since 0.1
 * @var RevisionAction|bool false
 */
@@ -498,7 +497,6 @@
 
/**
 * Set a field to the value of the corresponding field in the provided 
object.
-*
 *
 * @since 0.1
 * @param string $fieldName
diff --git a/includes/specials/SpecialEducationProgram.php 
b/includes/specials/SpecialEducationProgram.php
index d5ebdc9..762e019 100644
--- a/includes/specials/SpecialEducationProgram.php
+++ b/includes/specials/SpecialEducationProgram.php
@@ -211,7 +211,7 @@
 *
 * @since 0.1
 *
-* @param array $terms
+* @param array[] $terms
 *
 * @return string
 */
@@ -252,7 +252,7 @@
 *
 * @since 0.1
 *
-* @return array
+* @return array[]
 */
protected function getTermData() {
$termNames = Courses::singleton()->selectFields( 'term', [], [ 
'DISTINCT' ] );
@@ -313,12 +313,12 @@
 *
 * @since 0.1
 *
-* @param array $students
-* @param array $oas
-* @param array $cas
-* @param array $instructors
+* @param int[] $students
+* @param int[] $oas
+* @param int[] $cas
+* @param int[] $instructors
 *
-* @return array
+* @return float[]
 */
protected function getByGender( array $students, array $oas, array 
$cas, array $instructors ) {
$genders = $this->getGenders(
@@ -340,10 +340,10 @@
 *
 * @since 0.1
 *
-* @param array $users The users
-* @param array $genders An array mapping user id to gender
+* @param int[] $users User IDs
+* @param string[] $genders An array mapping user id to gender
 *
-* @return array
+* @return float[]
 */
protected function getGenderDistribution( array $users, array $genders 
) {
$distribution = [ 'unknown' => 0, 'male' => 0, 'female' => 0 ];
@@ -366,9 +366,9 @@
 *
 * @since 0.1
 *
-* @param array $userIds
+* @param int[] $userIds
 *
-* @return array
+* @return string[]
 */
protected function getGenders( array $userIds ) {
$dbr = wfGetDB( DB_REPLICA );
diff --git a/includes/tables/IORMTable.php b/includes/tables/IORMTable.php
index e904b1a..94783ca 100644
--- a/includes/tables/IORMTable.php
+++ b/includes/tables/IORMTable.php
@@ -380,7 +380,7 @@
 *
 * @see LoadBalancer::reuseConnection
 *
-* @param Database $db The database
+* @param Database $db
 *
 * @since 1.20
 */
diff --git a/tests/phpunit/Events/RecentPageEventGrouperTest.php 
b/tests/phpunit/Events/RecentPageEventGrouperTest.php
index 3904497..e8307d8 100644
--- a/tests/phpunit/Events/RecentPageEventGrouperTest.php
+++ b/tests/phpunit/Events/RecentPageEventGrouperTest.php
@@ -42,7 +42,7 @@
$groupedEvents = $grouper->groupEvents( [] );
 
$this->assertInternalType( 'array', $groupedEvents );
-   $this->assertCount( 0, $groupedEvents );
+   $this->assertEmpty( $groupedEvents );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/400573
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b0962e293fe9e00a8b3f5933c22f8509d85039a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: AndyRussG 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Remove PHPDoc block repeating the file name

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400410 )

Change subject: Remove PHPDoc block repeating the file name
..


Remove PHPDoc block repeating the file name

I can see these have been added in a commit that aimed to improve the
PHPDoc comments in this code base back in 2014, see Ib5a9507. However,
I do not see the point in literally repeating the name of the file that
contains a comment. I assume this was to work around a bug in a specific
documentation generation tool.

Change-Id: I821845436d8a4cf62a95707d8662e205602c8ff0
---
M includes/BaseDomainExtractorInterface.php
M includes/MobileContext.php
M includes/MobileFormatter.php
M includes/MobileFrontend.body.php
M includes/MobileFrontend.hooks.php
M includes/MobileUI.php
M includes/WMFBaseDomainExtractor.php
M includes/api/ApiMobileView.php
M includes/api/ApiParseExtender.php
M includes/api/ApiWebappManifest.php
M includes/diff/InlineDiffFormatter.php
M includes/diff/InlineDifferenceEngine.php
M includes/models/MobileCollection.php
M includes/models/MobilePage.php
M includes/modules/MobileSiteModule.php
M includes/specials/MobileSpecialPage.php
M includes/specials/MobileSpecialPageFeed.php
M includes/specials/SpecialMobileCite.php
M includes/specials/SpecialMobileContributions.php
M includes/specials/SpecialMobileDiff.php
M includes/specials/SpecialMobileEditWatchlist.php
M includes/specials/SpecialMobileHistory.php
M includes/specials/SpecialMobileLanguages.php
M includes/specials/SpecialMobileMenu.php
M includes/specials/SpecialMobileOptions.php
M includes/specials/SpecialMobileWatchlist.php
M includes/specials/SpecialNearby.php
M includes/specials/SpecialUploads.php
28 files changed, 2 insertions(+), 87 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/BaseDomainExtractorInterface.php 
b/includes/BaseDomainExtractorInterface.php
index 3b323e6..1ae7930 100644
--- a/includes/BaseDomainExtractorInterface.php
+++ b/includes/BaseDomainExtractorInterface.php
@@ -1,7 +1,5 @@
 https://gerrit.wikimedia.org/r/400410
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I821845436d8a4cf62a95707d8662e205602c8ff0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove self-explaining "section heading" comments from classes

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400583 )

Change subject: Remove self-explaining "section heading" comments from classes
..


Remove self-explaining "section heading" comments from classes

I can see that "parent::__construct" literally calls the parent
constructor. I can see that stuff preceeded by the keyword "protected"
is protected. I really (really) don't need comments explaining such.

Change-Id: I7458e714976a6acd3ba6a7c93fdc27d03903df83
---
M includes/Linker.php
M includes/actions/WatchAction.php
M includes/context/RequestContext.php
M includes/htmlform/HTMLFormElement.php
M includes/libs/CSSMin.php
M includes/libs/JavaScriptMinifier.php
M includes/resourceloader/ResourceLoader.php
M includes/resourceloader/ResourceLoaderFileModule.php
M includes/resourceloader/ResourceLoaderFilePath.php
M includes/resourceloader/ResourceLoaderModule.php
M includes/resourceloader/ResourceLoaderUserTokensModule.php
M includes/specials/pagers/ProtectedPagesPager.php
M includes/widget/ComplexNamespaceInputWidget.php
M includes/widget/ComplexTitleInputWidget.php
M includes/widget/DateInputWidget.php
M includes/widget/DateTimeInputWidget.php
M includes/widget/NamespaceInputWidget.php
M includes/widget/SearchInputWidget.php
M includes/widget/SelectWithInputWidget.php
M includes/widget/TitleInputWidget.php
M includes/widget/UserInputWidget.php
21 files changed, 4 insertions(+), 50 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Linker.php b/includes/Linker.php
index 84e3103..c0255ac 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -2124,8 +2124,6 @@
return Xml::tags( 'span', [ 'class' => 'mw-revdelundel-link' ], 
$htmlParentheses );
}
 
-   /* Deprecated methods */
-
/**
 * Returns the attributes for the tooltip and access key.
 *
diff --git a/includes/actions/WatchAction.php b/includes/actions/WatchAction.php
index e12a727..528e0e2 100644
--- a/includes/actions/WatchAction.php
+++ b/includes/actions/WatchAction.php
@@ -80,8 +80,6 @@
$this->getOutput()->addWikiMsg( $msgKey, 
$this->getTitle()->getPrefixedText() );
}
 
-   /* Static utility methods */
-
/**
 * Watch or unwatch a page
 * @since 1.22
diff --git a/includes/context/RequestContext.php 
b/includes/context/RequestContext.php
index c2d0de1..652f068 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -441,8 +441,6 @@
return $this->skin;
}
 
-   /** Helpful methods **/
-
/**
 * Get a Message object with context set
 * Parameters are the same as wfMessage()
@@ -457,8 +455,6 @@
 
return call_user_func_array( 'wfMessage', $args )->setContext( 
$this );
}
-
-   /** Static methods **/
 
/**
 * Get the RequestContext object associated with the main request
diff --git a/includes/htmlform/HTMLFormElement.php 
b/includes/htmlform/HTMLFormElement.php
index 10db90c..66d6143 100644
--- a/includes/htmlform/HTMLFormElement.php
+++ b/includes/htmlform/HTMLFormElement.php
@@ -38,8 +38,8 @@
use HTMLFormElement;
 
public function __construct( $fieldWidget, array $config = [] ) {
-   // Parent constructor
parent::__construct( $fieldWidget, $config );
+
// Traits
$this->initializeHTMLFormElement( $config );
}
@@ -53,8 +53,8 @@
use HTMLFormElement;
 
public function __construct( $fieldWidget, $buttonWidget = false, array 
$config = [] ) {
-   // Parent constructor
parent::__construct( $fieldWidget, $buttonWidget, $config );
+
// Traits
$this->initializeHTMLFormElement( $config );
}
diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index ee88d0d..a9cbba2 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -29,8 +29,6 @@
  */
 class CSSMin {
 
-   /* Constants */
-
/** @var string Strip marker for comments. **/
const PLACEHOLDER = "\x7fPLACEHOLDER\x7f";
 
@@ -41,8 +39,6 @@
 
const EMBED_REGEX = '\/\*\s*\@embed\s*\*\/';
const COMMENT_REGEX = '\/\*.*?\*\/';
-
-   /* Protected Static Members */
 
/** @var array List of common image files extensions and MIME-types */
protected static $mimeTypes = [
@@ -56,8 +52,6 @@
'xbm' => 'image/x-xbitmap',
'svg' => 'image/svg+xml',
];
-
-   /* Static Methods */
 
/**
 * Get a list of local files referenced in a stylesheet (includes 
non-existent files).
diff --git a/includes/libs/JavaScriptMinifier.php 
b/includes/libs/JavaScriptMinifier.php
index bbba33a..ea4755e 100644
--- 

[MediaWiki-commits] [Gerrit] mediawiki...apex[master]: Avoid PHP 7.1 warning of &$this usage

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401095 )

Change subject: Avoid PHP 7.1 warning of &$this usage
..


Avoid PHP 7.1 warning of &$this usage

Bug: T153505
Change-Id: I2a410bdfb0dc063d2c27ee79cc4d67f2d4f603f8
---
M ApexTemplate.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ApexTemplate.php b/ApexTemplate.php
index 46a0a19..14f8b32 100644
--- a/ApexTemplate.php
+++ b/ApexTemplate.php
@@ -224,7 +224,9 @@
 


-- 
To view, visit https://gerrit.wikimedia.org/r/401095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a410bdfb0dc063d2c27ee79cc4d67f2d4f603f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...DeskMessMirrored[master]: Avoid PHP 7.1 warning of &$this usage

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401097 )

Change subject: Avoid PHP 7.1 warning of &$this usage
..


Avoid PHP 7.1 warning of &$this usage

Bug: T153505
Change-Id: If3ae877790536fcd55b79bb98716ca20ded9d50e
---
M includes/DeskMessMirroredTemplate.php
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/DeskMessMirroredTemplate.php 
b/includes/DeskMessMirroredTemplate.php
index 6a8a181..a0fd137 100644
--- a/includes/DeskMessMirroredTemplate.php
+++ b/includes/DeskMessMirroredTemplate.php
@@ -254,8 +254,9 @@
foreach ( $this->getToolbox() as $key => $tbitem ) {
echo $this->makeListItem( $key, $tbitem );
}
-
-   Hooks::run( 'SkinTemplateToolboxEnd', array( &$this, true ) );
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $template = $this;
+   Hooks::run( 'SkinTemplateToolboxEnd', array( &$template, true ) 
);
echo '';
} // toolbox()
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401097
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If3ae877790536fcd55b79bb98716ca20ded9d50e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DeskMessMirrored
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Truglass[master]: Avoid PHP 7.1 warning of &$this usage

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401096 )

Change subject: Avoid PHP 7.1 warning of &$this usage
..


Avoid PHP 7.1 warning of &$this usage

Bug: T153505
Change-Id: Ic9834566e1346fbc91e44ed9fab8a694b2763a25
---
M includes/TruglassTemplate.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/TruglassTemplate.php b/includes/TruglassTemplate.php
index 7c9b9a5..a9b534a 100644
--- a/includes/TruglassTemplate.php
+++ b/includes/TruglassTemplate.php
@@ -284,7 +284,9 @@
echo $this->makeListItem( $key, $tbitem );
}
 
-   Hooks::run( 'SkinTemplateToolboxEnd', array( &$this, true ) );
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $template = $this;
+   Hooks::run( 'SkinTemplateToolboxEnd', array( &$template, true ) 
);
 ?>



-- 
To view, visit https://gerrit.wikimedia.org/r/401096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9834566e1346fbc91e44ed9fab8a694b2763a25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Truglass
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...DeskMessMirrored[master]: Avoid PHP 7.1 warning of &$this usage

[LukBukkit (Code Review)]

LukBukkit has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401097 )

Change subject: Avoid PHP 7.1 warning of &$this usage
..

Avoid PHP 7.1 warning of &$this usage

Bug: T153505
Change-Id: If3ae877790536fcd55b79bb98716ca20ded9d50e
---
M includes/DeskMessMirroredTemplate.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DeskMessMirrored 
refs/changes/97/401097/1

diff --git a/includes/DeskMessMirroredTemplate.php 
b/includes/DeskMessMirroredTemplate.php
index 6a8a181..a0fd137 100644
--- a/includes/DeskMessMirroredTemplate.php
+++ b/includes/DeskMessMirroredTemplate.php
@@ -254,8 +254,9 @@
foreach ( $this->getToolbox() as $key => $tbitem ) {
echo $this->makeListItem( $key, $tbitem );
}
-
-   Hooks::run( 'SkinTemplateToolboxEnd', array( &$this, true ) );
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $template = $this;
+   Hooks::run( 'SkinTemplateToolboxEnd', array( &$template, true ) 
);
echo '';
} // toolbox()
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401097
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3ae877790536fcd55b79bb98716ca20ded9d50e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DeskMessMirrored
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Truglass[master]: Avoid PHP 7.1 warning of &$this usage

[LukBukkit (Code Review)]

LukBukkit has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401096 )

Change subject: Avoid PHP 7.1 warning of &$this usage
..

Avoid PHP 7.1 warning of &$this usage

Bug: T153505
Change-Id: Ic9834566e1346fbc91e44ed9fab8a694b2763a25
---
M includes/TruglassTemplate.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Truglass 
refs/changes/96/401096/1

diff --git a/includes/TruglassTemplate.php b/includes/TruglassTemplate.php
index 7c9b9a5..a9b534a 100644
--- a/includes/TruglassTemplate.php
+++ b/includes/TruglassTemplate.php
@@ -284,7 +284,9 @@
echo $this->makeListItem( $key, $tbitem );
}
 
-   Hooks::run( 'SkinTemplateToolboxEnd', array( &$this, true ) );
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $template = $this;
+   Hooks::run( 'SkinTemplateToolboxEnd', array( &$template, true ) 
);
 ?>



-- 
To view, visit https://gerrit.wikimedia.org/r/401096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9834566e1346fbc91e44ed9fab8a694b2763a25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Truglass
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...apex[master]: Avoid PHP 7.1 warning of &$this usage

[LukBukkit (Code Review)]

LukBukkit has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401095 )

Change subject: Avoid PHP 7.1 warning of &$this usage
..

Avoid PHP 7.1 warning of &$this usage

Bug: T153505
Change-Id: I2a410bdfb0dc063d2c27ee79cc4d67f2d4f603f8
---
M ApexTemplate.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex 
refs/changes/95/401095/1

diff --git a/ApexTemplate.php b/ApexTemplate.php
index 46a0a19..14f8b32 100644
--- a/ApexTemplate.php
+++ b/ApexTemplate.php
@@ -224,7 +224,9 @@
 


-- 
To view, visit https://gerrit.wikimedia.org/r/401095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a410bdfb0dc063d2c27ee79cc4d67f2d4f603f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Specials: Add LibraryInfoHook

[NikiWiki (Code Review)]

NikiWiki has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401094 )

Change subject: Specials: Add LibraryInfoHook
..

Specials: Add LibraryInfoHook

I would like to extend Extension:ControlSpecialVersion to be able to
hide the versions of the installed libraries. It already does so for
php, extensions, etc.

To accomplish this, a hook in SpecialVersions::getExternalLibraries is
needed.

Similar hooks already exist for softwareInformation, getExtensionTypes
and other information about versions.

I considered adding the hook to ComposerInstalled, however I prefer to
keep that as a source of truth and only allow changing the presentation.

Change-Id: I3b0f31f2a9b9ee379781d13555cd186739f02a6f
---
M docs/hooks.txt
M includes/specials/SpecialVersion.php
2 files changed, 11 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/401094/1

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 45387a3..75f1e8a 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1538,6 +1538,12 @@
 change the tables headers.
 &$extTypes: associative array of extensions types
 
+'ExternalLibraryInfo': Called by Special:Version for returning information 
about the
+installed external libraries.
+&$software: The array of software in format 'name' => ['version', 'type', 
'licenses'
+, 'authors', 'description']. See
+  ComposerInstalled::getInstalledDependencies().
+
 'FetchChangesList': When fetching the ChangesList derivative for a particular
 user.
 $user: User the list is being fetched for
diff --git a/includes/specials/SpecialVersion.php 
b/includes/specials/SpecialVersion.php
index f176b40..b2530c9 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -488,7 +488,10 @@
return '';
}
 
-   $installed = new ComposerInstalled( $path );
+   $composerInstalled = new ComposerInstalled( $path );
+   $installed = $composerInstalled->getInstalledDependencies();
+   Hooks::run( 'ExternalLibraryInfo', [ &$installed ] );
+
$out = Html::element(
'h2',
[ 'id' => 'mw-version-libraries' ],
@@ -506,7 +509,7 @@
. Html::element( 'th', [], $this->msg( 
'version-libraries-authors' )->text() )
. Html::closeElement( 'tr' );
 
-   foreach ( $installed->getInstalledDependencies() as $name => 
$info ) {
+   foreach ( $installed as $name => $info ) {
if ( strpos( $info['type'], 'mediawiki-' ) === 0 ) {
// Skip any extensions or skins since they'll 
be listed
// in their proper section

-- 
To view, visit https://gerrit.wikimedia.org/r/401094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b0f31f2a9b9ee379781d13555cd186739f02a6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: NikiWiki 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TemplateSandbox[master]: Add missing visibility declarations

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401089 )

Change subject: Add missing visibility declarations
..


Add missing visibility declarations

And re-enable Squiz.Scope.MethodScope.Missing

Change-Id: Ibafb0608942d195630355b4e6b69329a1f3b54ea
---
M .phpcs.xml
M SpecialTemplateSandbox.php
2 files changed, 5 insertions(+), 6 deletions(-)

Approvals:
  Umherirrender: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index bcfe27a..198c91b 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -6,7 +6,6 @@



-   

.

diff --git a/SpecialTemplateSandbox.php b/SpecialTemplateSandbox.php
index ee20ab7..43f8e5e 100644
--- a/SpecialTemplateSandbox.php
+++ b/SpecialTemplateSandbox.php
@@ -12,7 +12,7 @@
 */
private $output = null;
 
-   function __construct() {
+   public function __construct() {
parent::__construct( 'TemplateSandbox' );
}
 
@@ -20,7 +20,7 @@
return 'wiki';
}
 
-   function execute( $par ) {
+   public function execute( $par ) {
$this->setHeaders();
$this->checkPermissions();
 
@@ -115,7 +115,7 @@
 * @param array $allData
 * @return bool|String
 */
-   function validatePageParam( $value, $allData ) {
+   public function validatePageParam( $value, $allData ) {
if ( $value === '' || $value === null ) {
return true;
}
@@ -134,7 +134,7 @@
 * @param array $allData
 * @return bool|String
 */
-   function validateRevidParam( $value, $allData ) {
+   public function validateRevidParam( $value, $allData ) {
if ( $value === '' || $value === null ) {
return true;
}
@@ -150,7 +150,7 @@
 * @param array $allData
 * @return bool|String
 */
-   function validatePrefixParam( $value, $allData ) {
+   public function validatePrefixParam( $value, $allData ) {
if ( $value === '' || $value === null ) {
return true;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/401089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibafb0608942d195630355b4e6b69329a1f3b54ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateSandbox
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ApiFeatureUsage[master]: Add missing visibility declarations

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401088 )

Change subject: Add missing visibility declarations
..


Add missing visibility declarations

And re-enable Squiz.Scope.MethodScope.Missing

Change-Id: Ied209262eb592f80fe37b4ba684cf5844d7808d9
---
M .phpcs.xml
M ApiQueryFeatureUsage.php
M SpecialApiFeatureUsage.php
3 files changed, 3 insertions(+), 4 deletions(-)

Approvals:
  Umherirrender: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index 28c8136..d87bc24 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -6,7 +6,6 @@



-   

.

diff --git a/ApiQueryFeatureUsage.php b/ApiQueryFeatureUsage.php
index a3a32c6..edbac7e 100644
--- a/ApiQueryFeatureUsage.php
+++ b/ApiQueryFeatureUsage.php
@@ -5,7 +5,7 @@
parent::__construct( $query, $moduleName, 'afu' );
}
 
-   function execute() {
+   public function execute() {
$params = $this->extractRequestParams();
 
$agent = $params['agent'] === null
diff --git a/SpecialApiFeatureUsage.php b/SpecialApiFeatureUsage.php
index d965053..28f11b9 100644
--- a/SpecialApiFeatureUsage.php
+++ b/SpecialApiFeatureUsage.php
@@ -2,11 +2,11 @@
 class SpecialApiFeatureUsage extends SpecialPage {
private $engine = null;
 
-   function __construct() {
+   public function __construct() {
parent::__construct( 'ApiFeatureUsage' );
}
 
-   function execute( $par ) {
+   public function execute( $par ) {
$this->setHeaders();
$this->checkPermissions();
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied209262eb592f80fe37b4ba684cf5844d7808d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiFeatureUsage
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Add source DL link to popup

[Albert221 (Code Review)]

Albert221 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401093 )

Change subject: Add source DL link to popup
..

Add source DL link to popup

Add storing .ly source file and add ability
to download by creating a DL link in score's popup.

Bug: T183736
Change-Id: Ie80bda1f30d1b7046669ffa6353fc7f5328e7be0
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/Score.php
M modules/ext.score.popup.css
M modules/ext.score.popup.js
6 files changed, 29 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score 
refs/changes/93/401093/1

diff --git a/extension.json b/extension.json
index 29b7755..a64d03f 100644
--- a/extension.json
+++ b/extension.json
@@ -64,7 +64,8 @@
"mediawiki.api"
],
"messages": [
-   "score-download-midi-file"
+   "score-download-midi-file",
+   "score-download-source-file"
]
}
},
diff --git a/i18n/en.json b/i18n/en.json
index 0129a0b..2e41273 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -10,6 +10,7 @@
"score-backend-error": "Unable to copy the generated files to their 
final location:\n$1",
"score-desc": "Adds a tag for rendering musical scores with LilyPond",
"score-download-midi-file": "Download MIDI file",
+   "score-download-source-file": "Download source file",
"score-error-category": "Pages with score rendering errors",
"score-error-category-desc": "There was an error while rendering the 
score.",
"score-getcwderr": "Unable to obtain current working directory",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b2fb0bc..52941cc 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -16,6 +16,7 @@
"score-backend-error": "Parameters:\n* $1 - result message which was 
returned",
"score-desc": 
"{{desc|name=Score|url=https://www.mediawiki.org/wiki/Extension:Score}};,
"score-download-midi-file": "Content of link to download MIDI file of 
score shown in score popup",
+   "score-download-source-file": "Content of link to download source .ly 
file of score shown in score popup",
"score-error-category": "Name of [[mw:Help:Tracking categories|tracking 
category]] to list pages where there was an error rendering the 
 tag.",
"score-error-category-desc": "Description on 
[[Special:TrackingCategories]] for the {{msg-mw|score-error-category}} tracking 
category.",
"score-getcwderr": "Displayed if the extension cannot obtain the 
current working directory.",
diff --git a/includes/Score.php b/includes/Score.php
index 854deb1..ece621e 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -477,14 +477,15 @@
'class' => 'mw-ext-score',
'data-midi' => $options['override_midi'] ?
$options['midi_file']->getUrl()
-   : 
"{$options['dest_url']}/{$options['file_name_prefix']}.midi"
+   : 
"{$options['dest_url']}/{$options['file_name_prefix']}.midi",
+   'data-source' => 
"{$options['dest_url']}/{$options['file_name_prefix']}.ly"
], $link );
 
return $link;
}
 
/**
-* Generates score PNG file(s) and a MIDI file.
+* Generates score PNG file(s), LY source and a MIDI file.
 *
 * @param string $code Score code.
 * @param array $options Rendering options. They are the same as for
@@ -604,6 +605,14 @@
// Backend operation batch
$ops = [];
 
+   // Add LY source to its file
+   $ops[] = [
+   'op' => 'store',
+   'src' => $factoryLy,
+   'dst' => 
"{$options['dest_storage_path']}/{$options['file_name_prefix']}.ly"
+   ];
+   $newFiles["{$options['file_name_prefix']}.ly"] = true;
+
if ( $needMidi ) {
// Add the MIDI file to the batch
$ops[] = [
diff --git a/modules/ext.score.popup.css b/modules/ext.score.popup.css
index 61802b7..9d8bd1d 100644
--- a/modules/ext.score.popup.css
+++ b/modules/ext.score.popup.css
@@ -42,3 +42,9 @@
background: #fff;
transform: rotate( 45deg );
 }
+
+.mw-ext-score-popup a:last-child:before {
+   content: "•";
+   display: inline-block;
+   margin: 0 0.5em;
+}
diff --git a/modules/ext.score.popup.js b/modules/ext.score.popup.js
index ab81595..d3c32ab 100644
--- a/modules/ext.score.popup.js
+++ b/modules/ext.score.popup.js
@@ -2,14 +2,17 @@
var popupShown = false;
 
function showPopup( $score ) {
-   var $popup, midi = $score.data( 'midi' );

[MediaWiki-commits] [Gerrit] mediawiki...LifeWeb[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400846 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs are failing and were disabled:
* Generic.Files.OneObjectStructurePerFile.MultipleFound
* Squiz.Scope.MethodScope.Missing

The following sniffs now pass and were enabled:
* MediaWiki.Files.OneClassPerFile.MultipleFound

Change-Id: Ib3f1128dfb9cf44a18ab0ab9cdb23513ce935e3a
---
M .phpcs.xml
M composer.json
M lib/LifeWeb/LWItem.php
3 files changed, 7 insertions(+), 6 deletions(-)

Approvals:
  Umherirrender: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index cf1aa43..4259c51 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,13 +2,14 @@
 


+   




-   


+   

.

diff --git a/composer.json b/composer.json
index 1eb1853..ef88b49 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/lib/LifeWeb/LWItem.php b/lib/LifeWeb/LWItem.php
index 6ccb6ea..5d3ac40 100644
--- a/lib/LifeWeb/LWItem.php
+++ b/lib/LifeWeb/LWItem.php
@@ -48,10 +48,10 @@
$this->itemId = $itemId;
 
/*
-if (!\Wikibase\EntityLookup::hasEntity($itemId)) {
-throw new Exception('Invalid ID.');
-}
-*/
+   if (!\Wikibase\EntityLookup::hasEntity($itemId)) {
+   throw new Exception('Invalid ID.');
+   }
+   */
 
if ( !self::instanceOfCheck( $itemId, $pidInstanceType, 
EntityIDs::pid( 'pInstanceOf' ) ) ) {
throw new \MWException( 'Is not an instance.' );

-- 
To view, visit https://gerrit.wikimedia.org/r/400846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3f1128dfb9cf44a18ab0ab9cdb23513ce935e3a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LifeWeb
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PoolCounter[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[Umherirrender (Code Review)]

Umherirrender has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400896 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs are failing and were disabled:
* Squiz.Scope.MethodScope.Missing

Change-Id: Id81fa79cfc06807a2d87fdec45b901f682ad709e
---
M .phpcs.xml
M composer.json
2 files changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Umherirrender: Verified
  Libraryupgrader: Looks good to me, approved



diff --git a/.phpcs.xml b/.phpcs.xml
index 94c9b66..f199774 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,7 +2,8 @@
 


-   
+   
+   


.
diff --git a/composer.json b/composer.json
index 6c45e79..f3cbcc4 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"mediawiki/minus-x": "0.2.1"
},
"scripts": {

-- 
To view, visit https://gerrit.wikimedia.org/r/400896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id81fa79cfc06807a2d87fdec45b901f682ad709e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PoolCounter
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Libraryupgrader 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...GlobalUsage[master]: Create Special:GloballyUnusedFiles

[Phantom42 (Code Review)]

Phantom42 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401092 )

Change subject: Create Special:GloballyUnusedFiles
..

Create Special:GloballyUnusedFiles

This special page shows unused files at all wikis
So in fact this special page is global equivalent to
Special:UnusedFiles

Bug: T183673
Change-Id: I47a591622ae5955757810ef1995e916a810bc506
---
M GlobalUsage.alias.php
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/GlobalUsageHooks.php
A includes/SpecialGloballyUnusedFiles.php
6 files changed, 144 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUsage 
refs/changes/92/401092/1

diff --git a/GlobalUsage.alias.php b/GlobalUsage.alias.php
index a0ddb61..3b6e2c4 100644
--- a/GlobalUsage.alias.php
+++ b/GlobalUsage.alias.php
@@ -13,6 +13,7 @@
'GlobalUsage' => [ 'GlobalUsage' ],
'MostGloballyLinkedFiles' => [ 'MostGloballyLinkedFiles' ],
'GloballyWantedFiles' => [ 'GloballyWantedFiles' ],
+   'GloballyUnusedFiles' => [ 'GloballyUnusedFiles' ]
 ];
 
 /** Arabic (العربية) */
diff --git a/extension.json b/extension.json
index f2aba51..84acdd7 100644
--- a/extension.json
+++ b/extension.json
@@ -12,6 +12,7 @@
"SpecialPages": {
"MostGloballyLinkedFiles": "SpecialMostGloballyLinkedFiles",
"GloballyWantedFiles": "SpecialGloballyWantedFiles",
+   "GloballyUnusedFiles": "SpecialGloballyUnusedFiles",
"GlobalUsage": "SpecialGlobalUsage"
},
"JobClasses": {
@@ -37,7 +38,8 @@
"ApiQueryGlobalUsage": "includes/ApiQueryGlobalUsage.php",
"GlobalUsageCachePurgeJob": 
"includes/GlobalUsageCachePurgeJob.php",
"SpecialMostGloballyLinkedFiles": 
"includes/SpecialMostGloballyLinkedFiles.php",
-   "SpecialGloballyWantedFiles": 
"includes/SpecialGloballyWantedFiles.php"
+   "SpecialGloballyWantedFiles": 
"includes/SpecialGloballyWantedFiles.php",
+   "SpecialGloballyUnusedFiles": 
"includes/SpecialGloballyUnusedFiles.php"
},
"@doc": [
"Things that can cause link updates:",
diff --git a/i18n/en.json b/i18n/en.json
index 31733a6..86d473b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -27,5 +27,7 @@
"apihelp-query+globalusage-param-filterlocal": "Filter local usage of 
the file.",
"apihelp-query+globalusage-example-1": "Get usage of 
[[:File:Example.jpg]]",
"globalusage-header": "This page shows where a file is used on other 
wikis. You can also find that information at the bottom of the file description 
page.",
-   "globalusage-header-image": ""
+   "globalusage-header-image": "",
+   "globallyunusedfilestext": "The following files exist but are not 
embedded in any page on any wiki.",
+   "globallyunusedfiles": "Globally unused files"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1d3db4a..ab0c108 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -39,5 +39,7 @@
"apihelp-query+globalusage-param-filterlocal": 
"{{doc-apihelp-param|query+globalusage|filterlocal}}",
"apihelp-query+globalusage-example-1": 
"{{doc-apihelp-example|query+globalusage}}",
"globalusage-header": "Text message used in [[Special:GlobalUsage]] 
right above the form describing the purpose of special page.",
-   "globalusage-header-image": "{{notranslate}}. Extra header for on-wiki 
customization. $1 - File being looked for."
+   "globalusage-header-image": "{{notranslate}}. Extra header for on-wiki 
customization. $1 - File being looked for.",
+   "globallyunusedfilestext": "Header message of 
[[Special:GloballyUnusedFiles]]",
+   "globallyunusedfiles": "{{doc-special|UnusedImages}}"
 }
diff --git a/includes/GlobalUsageHooks.php b/includes/GlobalUsageHooks.php
index 006abf8..e515a96 100644
--- a/includes/GlobalUsageHooks.php
+++ b/includes/GlobalUsageHooks.php
@@ -223,6 +223,9 @@
public static function onwgQueryPages( &$queryPages ) {
$queryPages[] = [ 'SpecialMostGloballyLinkedFiles', 
'MostGloballyLinkedFiles' ];
$queryPages[] = [ 'SpecialGloballyWantedFiles', 
'GloballyWantedFiles' ];
+   if ( GlobalUsage::onSharedRepo() ) {
+   $queryPages[] = [ 'SpecialGloballyUnusedFiles', 
'GloballyUnusedFiles' ];
+   }
return true;
}
 }
diff --git a/includes/SpecialGloballyUnusedFiles.php 
b/includes/SpecialGloballyUnusedFiles.php
new file mode 100644
index 000..d706e55
--- /dev/null
+++ b/includes/SpecialGloballyUnusedFiles.php
@@ -0,0 +1,131 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
+ */
+
+/**
+ * A special page that lists globally unused images
+ *
+ * @ingroup SpecialPage
+ */
+class SpecialGloballyUnusedFiles extends ImageQueryPage {
+   function 

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Add popup showing midi DL link on score click

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400834 )

Change subject: Add popup showing midi DL link on score click
..


Add popup showing midi DL link on score click

Remove `link_midi` from $options passed to
Score::generateHTML.
Add `ext.score.popup.css` file with styles
for score popup and its container and add
`ext.score.popup.js` file with event handlers
and functions handling showing and
hiding score popup.

Bug: T183736
Change-Id: Id9b213d073ba9ea7cc4c753a714f0b3aafbb0f63
---
M README
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/Score.php
A modules/ext.score.popup.css
A modules/ext.score.popup.js
7 files changed, 155 insertions(+), 17 deletions(-)

Approvals:
  Ebe123: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/README b/README
index fdd7a12..a06ab1f 100644
--- a/README
+++ b/README
@@ -19,6 +19,9 @@
 
 for more information.
 
+The extension also provides a way to download MIDI file generated from the 
score
+from the popup that is shown on score click.
+
 This extension was tested with LilyPond 2.12.3 through 2.18.2.
 
 
@@ -81,10 +84,6 @@
   C, D, E, F,|G, A, B, C|D E F G|A B c d|
   e f g a|b c' d' e'|f' g' a' b'|]
   .
-
-* Attribute: midi
-  Effect: If included in the tag, the rendered image(s) will be embedded into a
-  hyperlink to an appropriate MIDI file.
 
 * Attribute: override_midi
   Allowed values: Known file name, that is, if override_midi="name" is given,
diff --git a/extension.json b/extension.json
index 64d1677..29b7755 100644
--- a/extension.json
+++ b/extension.json
@@ -55,6 +55,17 @@
"desktop",
"mobile"
]
+   },
+   "ext.score.popup": {
+   "scripts": "ext.score.popup.js",
+   "styles": "ext.score.popup.css",
+   "position": "bottom",
+   "dependencies": [
+   "mediawiki.api"
+   ],
+   "messages": [
+   "score-download-midi-file"
+   ]
}
},
"ResourceFileModulePaths": {
diff --git a/i18n/en.json b/i18n/en.json
index f454639..0129a0b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -9,6 +9,7 @@
"score-compilererr": "Unable to compile LilyPond input file:\n$1",
"score-backend-error": "Unable to copy the generated files to their 
final location:\n$1",
"score-desc": "Adds a tag for rendering musical scores with LilyPond",
+   "score-download-midi-file": "Download MIDI file",
"score-error-category": "Pages with score rendering errors",
"score-error-category-desc": "There was an error while rendering the 
score.",
"score-getcwderr": "Unable to obtain current working directory",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c87c392..b2fb0bc 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -15,6 +15,7 @@
"score-compilererr": "Displayed if the LilyPond code could not be 
compiled. $1 is the error (generally big block of text in a pre tag)",
"score-backend-error": "Parameters:\n* $1 - result message which was 
returned",
"score-desc": 
"{{desc|name=Score|url=https://www.mediawiki.org/wiki/Extension:Score}};,
+   "score-download-midi-file": "Content of link to download MIDI file of 
score shown in score popup",
"score-error-category": "Name of [[mw:Help:Tracking categories|tracking 
category]] to list pages where there was an error rendering the 
 tag.",
"score-error-category-desc": "Description on 
[[Special:TrackingCategories]] for the {{msg-mw|score-error-category}} tracking 
category.",
"score-getcwderr": "Displayed if the extension cannot obtain the 
current working directory.",
diff --git a/includes/Score.php b/includes/Score.php
index 778467b..740d2e0 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -242,9 +242,6 @@
// Raw rendering?
$options['raw'] = array_key_exists( 'raw', $args );
 
-   /* Midi linking? */
-   $options['link_midi'] = array_key_exists( 'midi', $args 
);
-
/* Override OGG file? */
if ( array_key_exists( 'override_ogg', $args ) ) {
$t = Title::newFromText( $args['override_ogg'], 
NS_FILE );
@@ -324,7 +321,6 @@
 *  - file_name_prefix: The filename prefix used for all files
 *  in the default destination directory. Required.
 *  - lang: string Score language. Required.
-*  - link_midi: bool Whether to link to a MIDI file. Required.
 *  - override_midi: bool Whether to use a user-provided MIDI file.
 *

[MediaWiki-commits] [Gerrit] mediawiki...EducationProgram[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400794 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs are failing and were disabled:
* Generic.Files.OneObjectStructurePerFile.MultipleFound
* Squiz.Scope.MethodScope.Missing

The following sniffs now pass and were enabled:
* MediaWiki.Files.ClassMatchesFilename.WrongCase
* MediaWiki.Files.OneClassPerFile.MultipleFound

Change-Id: I88d36d7ece3bace8ed2e1d2e77d03fe476017e6c
---
M .phpcs.xml
M composer.json
M includes/Events/TimelineGroup.php
M includes/pagers/EPPager.php
M includes/pagers/OrgPager.php
M includes/rows/CA.php
M includes/rows/OA.php
M includes/rows/Student.php
M includes/tables/ORMTable.php
M tests/phpunit/db/ORMRowTest.php
10 files changed, 12 insertions(+), 19 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index ba85c86..63a49ee 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -6,13 +6,13 @@



-   
-   




+   

+   



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/Events/TimelineGroup.php 
b/includes/Events/TimelineGroup.php
index fb7f9da..96d7b27 100644
--- a/includes/Events/TimelineGroup.php
+++ b/includes/Events/TimelineGroup.php
@@ -141,8 +141,7 @@
 * @return string
 */
public function getHTML() {
-   return
-   Html::rawElement(
+   return Html::rawElement(
'span',
$this->getHeaderAttributes(),
$this->getHeaderHTML()
diff --git a/includes/pagers/EPPager.php b/includes/pagers/EPPager.php
index 1758c70..e495f40 100644
--- a/includes/pagers/EPPager.php
+++ b/includes/pagers/EPPager.php
@@ -194,8 +194,7 @@
);
}
 
-   return
-   '' .
+   return '' .
'' . $this->msg( 
'ep-pager-withselected' )->escaped() . '' .
implode( '', $controls ) .
'';
@@ -409,8 +408,7 @@
 
$title = $this->getTitle()->getFullText();
 
-   return
-   '' .
+   return '' .
'' . $this->msg( 'ep-pager-showonly' 
)->escaped() . '' .
'https://gerrit.wikimedia.org/r/400794
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I88d36d7ece3bace8ed2e1d2e77d03fe476017e6c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...EducationProgram[master]: Fix @covers tags

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400807 )

Change subject: Fix @covers tags
..


Fix @covers tags

Change-Id: I6ca30f2c2950321e11432f8d35d84719ff66bd24
---
M tests/phpunit/db/ORMTableTest.php
M tests/phpunit/db/TestORMRowTest.php
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Umherirrender: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/phpunit/db/ORMTableTest.php 
b/tests/phpunit/db/ORMTableTest.php
index 750e2e3..7b8d859 100644
--- a/tests/phpunit/db/ORMTableTest.php
+++ b/tests/phpunit/db/ORMTableTest.php
@@ -32,7 +32,7 @@
  * @group ORM
  * @group Database
  *
- * @covers PageORMTableForTesting
+ * @covers \EducationProgram\ORMTable
  *
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  * @author Daniel Kinzler
diff --git a/tests/phpunit/db/TestORMRowTest.php 
b/tests/phpunit/db/TestORMRowTest.php
index 84b5f48..c328894 100644
--- a/tests/phpunit/db/TestORMRowTest.php
+++ b/tests/phpunit/db/TestORMRowTest.php
@@ -42,7 +42,7 @@
  * @group ORM
  * @group Database
  * @group medium
- * @covers TestORMRow
+ * @covers \EducationProgram\ORMRow
  */
 class TestORMRowTest extends ORMRowTest {
 

-- 
To view, visit https://gerrit.wikimedia.org/r/400807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ca30f2c2950321e11432f8d35d84719ff66bd24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Parser: extract $title, follow-up 3d560be428

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401052 )

Change subject: Parser: extract $title, follow-up 3d560be428
..


Parser: extract $title, follow-up 3d560be428

In the conversion away from extract(), the $title variable was missed. This
broke LabeledSectionTransclusion.

Change-Id: If4c140aedf16fc16a4ae2361f465798055748255
---
M includes/parser/Parser.php
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Umherirrender: Looks good to me, approved
  jenkins-bot: Verified
  Tpt: Looks good to me, but someone else must approve



diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 078de3c..e7e7aa0 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3115,6 +3115,9 @@
}
 
// Extract any forwarded flags
+   if ( isset( $result['title'] ) ) {
+   $title = $result['title'];
+   }
if ( isset( $result['found'] ) ) {
$found = $result['found'];
}

-- 
To view, visit https://gerrit.wikimedia.org/r/401052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If4c140aedf16fc16a4ae2361f465798055748255
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: download_dump: Add -revision parameter

[Rafidaslam (Code Review)]

Rafidaslam has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401091 )

Change subject: download_dump: Add -revision parameter
..

download_dump: Add -revision parameter

Add `-revision` parameter in
`scripts/maintenance/download_dump.py` which used for
specifying the revision of the file dump that wanna be
downloaded.

Bug: T183789
Change-Id: I3e7e22f3f5f35e71e3793f8f5b568c7e97aa4b1c
---
M scripts/maintenance/download_dump.py
1 file changed, 24 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/91/401091/1

diff --git a/scripts/maintenance/download_dump.py 
b/scripts/maintenance/download_dump.py
index d3a5123..05842c1 100644
--- a/scripts/maintenance/download_dump.py
+++ b/scripts/maintenance/download_dump.py
@@ -9,6 +9,8 @@
 
 -storepath:#The stored file's path.
 
+-revision:# The revision date of the dump (default to `latest`)
+
 """
 #
 # (C) Pywikibot team, 2017
@@ -38,6 +40,7 @@
 'wikiname': '',
 'filename': '',
 'storepath': './',
+'revision': 'latest',
 }
 
 def __init__(self, **kwargs):
@@ -61,8 +64,11 @@
 """Run bot."""
 pywikibot.output('Downloading dump from ' + self.getOption('wikiname'))
 
-download_filename = self.getOption('wikiname') + \
-'-latest-' + self.getOption('filename')
+download_filename = '{wiki_name}-{revision}-{filename}'.format(
+wiki_name=self.getOption('wikiname'),
+revision=self.getOption('revision'),
+filename=self.getOption('filename')
+)
 file_storepath = os.path.join(
 self.getOption('storepath'), download_filename)
 
@@ -78,7 +84,8 @@
 else:
 url = 'https://dumps.wikimedia.org/' + \
 os.path.join(self.getOption('wikiname'),
- 'latest', download_filename)
+ self.getOption('revision'),
+ download_filename)
 pywikibot.output('Downloading file from ' + url)
 response = fetch(url, stream=True)
 if response.status == 200:
@@ -89,6 +96,15 @@
 except IOError:
 pywikibot.exception()
 return False
+elif response.status == 404:
+pywikibot.output(('File with wikiname={wikiname}, '
+  'revision={revision}, '
+  'filename={filename} doesn\'t '
+  'available in the Wikimedia Dumps').format(
+  wikiname=self.getOption('wikiname'),
+  revision=self.getOption('revision'),
+  filename=self.getOption('filename')))
+return
 else:
 return
 
@@ -121,6 +137,11 @@
 opts[option] = os.path.abspath(value) or pywikibot.input(
 'Enter the store path: ')
 continue
+elif option == 'revision':
+opts[option] = value or pywikibot.input(
+'Enter the revision of the dump: ')
+continue
+
 unknown_args += [arg]
 
 missing = []

-- 
To view, visit https://gerrit.wikimedia.org/r/401091
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e7e22f3f5f35e71e3793f8f5b568c7e97aa4b1c
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dumps[ariel]: prep-dumps-deploy full pylint and pep8 cleanup

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/280101 )

Change subject: prep-dumps-deploy full pylint and pep8 cleanup
..


prep-dumps-deploy full pylint and pep8 cleanup

Change-Id: I1d80b9d4679e6e51ca2ce9df5e9360a3c8ff04e5
---
M deployment/obsolete/prep-dumps-deploy.py
1 file changed, 106 insertions(+), 76 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/deployment/obsolete/prep-dumps-deploy.py 
b/deployment/obsolete/prep-dumps-deploy.py
index e81edd0..8e393dc 100644
--- a/deployment/obsolete/prep-dumps-deploy.py
+++ b/deployment/obsolete/prep-dumps-deploy.py
@@ -1,56 +1,75 @@
-import os, sys, time, shutil, re
-# this script copies the most recent files into a deployment directory with 
the current date
-# run on fenari/bastion host as root or fail.
+"""
+this script copies the most recent files into
+ a deployment directory with the current date
+run on fenari/bastion host as root or fail.
+"""
 
-basedir = "/home/wikipedia/downloadserver/snapshothosts/dumps"
-deploy = "deploy" # subdir where deployment trees are stored by date
-confs = "confs" # subdir where config files live
+import os
+import sys
+import time
+import shutil
+import re
+
+
+BASEDIR = "/home/wikipedia/downloadserver/snapshothosts/dumps"
+DEPLOY = "deploy"  # subdir where deployment trees are stored by date
+CONFS = "confs"# subdir where config files live
+MONTHNAMES = ["jan", "feb", "mar", "apr", "may", "jun",
+  "jul", "aug", "sep", "oct", "nov", "dec"]
+
 
 class Error(Exception):
 """Base class for exceptions in this module."""
 pass
 
-def dateToDigits(dateString):
-if '-' not in dateString:
+
+def date_to_digits(date_string):
+"""convert date string in form mon-dd- to tuple
+of year, monthnum, day and return it, or None
+on error"""
+if '-' not in date_string:
 return None
-month, day, year  = dateString.split('-', 2)
+month, day, year = date_string.split('-', 2)
 if not month.isdigit():
-if not month in monthNames:
+if month not in MONTHNAMES:
 return None
 else:
-month = int(monthNames.index(month)) + 1
+month = int(MONTHNAMES.index(month)) + 1
 day = int(day)
-return "%s%02d%02d" % ( year, month, day)
+return "%s%02d%02d" % (year, month, day)
 
-def getLatestDeployDate(deploydir):
+
+def get_latest_depl_date(deploydir):
 try:
 subdirs = os.listdir(deploydir)
 except:
 sys.stderr.write("Failed to read contents of %s\n" % deploydir)
 raise
-deployDates = {}
-for d in subdirs:
-if not os.path.isdir(os.path.join(deploydir, d)):
+deploy_dates = {}
+for dname in subdirs:
+if not os.path.isdir(os.path.join(deploydir, dname)):
 continue
 # expect mon-dd-
-canonicalDirName = dateToDigits(d)
-if not canonicalDirName:
+canonical_dirname = date_to_digits(dname)
+if not canonical_dirname:
 continue
-deployDates[canonicalDirName] = d
-if not len(deployDates.keys()):
+deploy_dates[canonical_dirname] = dname
+if not len(deploy_dates.keys()):
 return None
-dates = deployDates.keys()
-dates.sort(reverse = True)
-return deployDates[dates[0]]
+dates = deploy_dates.keys()
+dates.sort(reverse=True)
+return deploy_dates[dates[0]]
+
 
 # modified from the python copytree implementation
-def doCopy(sourcedir, targetdir):
+def do_copy(sourcedir, targetdir):
 """only for regular files, symlinks, dirs:
 will attempt to remove files/symlinks in target dir that
 are to be copied from the source dir, leaving any other contents
 of target dir tree in place"""
 names = os.listdir(sourcedir)
 
+errors = []
 if not os.path.isdir(targetdir):
 # if this fails we want to give up on the spot since
 # there will be no target directory to receive the contents
@@ -58,10 +77,9 @@
 os.makedirs(targetdir)
 # fixme is this the right set of errors?
 except (IOError, os.error), why:
-errors.append((sourcepath, targetpath, str(why)))
+errors.append((sourcedir, targetdir, str(why)))
 raise Error(errors)
-
-errors = []
+
 for name in names:
 sourcepath = os.path.join(sourcedir, name)
 targetpath = os.path.join(targetdir, name)
@@ -79,14 +97,14 @@
 linkto = os.readlink(sourcepath)
 os.symlink(linkto, targetpath)
 elif os.path.isdir(sourcepath):
-doCopy(sourcepath, targetpath)
+do_copy(sourcepath, targetpath)
 elif os.path.isfile(sourcepath):
 shutil.copy2(sourcepath, targetpath)
 else:
 errors.append("refusingto remove %s, 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiComparePages: Add 'fromsection' and 'tosection' parameters

[Anomie (Code Review)]

Anomie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401090 )

Change subject: ApiComparePages: Add 'fromsection' and 'tosection' parameters
..

ApiComparePages: Add 'fromsection' and 'tosection' parameters

The deprecated diffing in prop=revisions and such used a 'rvsection'
parameter. To enable migration of things using that, action=compare
needs corresponding section parameters.

Bug: T183823
Change-Id: If1a0e2df614c083b37640418c69cca367ce0e895
---
M includes/api/ApiComparePages.php
M includes/api/i18n/en.json
M includes/api/i18n/qqq.json
M tests/phpunit/includes/api/ApiComparePagesTest.php
4 files changed, 72 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/90/401090/1

diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php
index eb67bab..5486594 100644
--- a/includes/api/ApiComparePages.php
+++ b/includes/api/ApiComparePages.php
@@ -94,6 +94,26 @@
$this->dieWithError( 'apierror-baddiff' );
}
 
+   // Extract sections, if told to
+   if ( isset( $params['fromsection'] ) ) {
+   $fromContent = $fromContent->getSection( 
$params['fromsection'] );
+   if ( !$fromContent ) {
+   $this->dieWithError(
+   [ 'apierror-compare-nosuchfromsection', 
wfEscapeWikiText( $params['fromsection'] ) ],
+   'nosuchfromsection'
+   );
+   }
+   }
+   if ( isset( $params['tosection'] ) ) {
+   $toContent = $toContent->getSection( 
$params['tosection'] );
+   if ( !$toContent ) {
+   $this->dieWithError(
+   [ 'apierror-compare-nosuchtosection', 
wfEscapeWikiText( $params['tosection'] ) ],
+   'nosuchtosection'
+   );
+   }
+   }
+
// Get the diff
$context = new DerivativeContext( $this->getContext() );
if ( $relRev && $relRev->getTitle() ) {
@@ -444,6 +464,7 @@
'text' => [
ApiBase::PARAM_TYPE => 'text'
],
+   'section' => null,
'pst' => false,
'contentformat' => [
ApiBase::PARAM_TYPE => 
ContentHandler::getAllContentFormats(),
diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index e1360c8..cceed01 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -64,6 +64,7 @@
"apihelp-compare-param-fromid": "First page ID to compare.",
"apihelp-compare-param-fromrev": "First revision to compare.",
"apihelp-compare-param-fromtext": "Use this text instead of the content 
of the revision specified by fromtitle, fromid or 
fromrev.",
+   "apihelp-compare-param-fromsection": "Only use the specified section of 
the specified 'from' content.",
"apihelp-compare-param-frompst": "Do a pre-save transform on 
fromtext.",
"apihelp-compare-param-fromcontentmodel": "Content model of 
fromtext. If not supplied, it will be guessed based on the other 
parameters.",
"apihelp-compare-param-fromcontentformat": "Content serialization 
format of fromtext.",
@@ -72,6 +73,7 @@
"apihelp-compare-param-torev": "Second revision to compare.",
"apihelp-compare-param-torelative": "Use a revision relative to the 
revision determined from fromtitle, fromid or 
fromrev. All of the other 'to' options will be ignored.",
"apihelp-compare-param-totext": "Use this text instead of the content 
of the revision specified by totitle, toid or 
torev.",
+   "apihelp-compare-param-tosection": "Only use the specified section of 
the specified 'to' content.",
"apihelp-compare-param-topst": "Do a pre-save transform on 
totext.",
"apihelp-compare-param-tocontentmodel": "Content model of 
totext. If not supplied, it will be guessed based on the other 
parameters.",
"apihelp-compare-param-tocontentformat": "Content serialization format 
of totext.",
@@ -1675,6 +1677,8 @@
"apierror-chunk-too-small": "Minimum chunk size is $1 
{{PLURAL:$1|byte|bytes}} for non-final chunks.",
"apierror-cidrtoobroad": "$1 CIDR ranges broader than /$2 are not 
accepted.",
"apierror-compare-no-title": "Cannot pre-save transform without a 
title. Try specifying fromtitle or totitle.",
+   "apierror-compare-nosuchfromsection": "There is no section $1 in the 
'from' content.",
+   "apierror-compare-nosuchtosection": "There is no section $1 in the 'to' 
content.",

[MediaWiki-commits] [Gerrit] operations/dumps[ariel]: hackdeploy pylint cleanup: invalid names, indentation, docst...

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/280100 )

Change subject: hackdeploy pylint cleanup: invalid names, indentation, 
docstrings mostly
..


hackdeploy pylint cleanup: invalid names, indentation, docstrings mostly

Change-Id: I408e068831e263779d808e14c622144dfbf5a424
---
M deployment/obsolete/hackdeploy/hack-deploy.py
1 file changed, 286 insertions(+), 188 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/deployment/obsolete/hackdeploy/hack-deploy.py 
b/deployment/obsolete/hackdeploy/hack-deploy.py
index 476b5ff..ac9e1e8 100755
--- a/deployment/obsolete/hackdeploy/hack-deploy.py
+++ b/deployment/obsolete/hackdeploy/hack-deploy.py
@@ -1,15 +1,83 @@
 import os
 import sys
-import salt.client
-import salt.cli.cp
-import salt.utils
 import time
 import hashlib
 import re
-from salt.exceptions import SaltInvocationError
 import runpy
+import salt.client
+import salt.cli.cp
+import salt.utils
+from salt.exceptions import SaltInvocationError
 
 # todo: test salt cmd_expandminions
+
+
+def condition_kwarg(arg, kwarg):
+'''
+Return a single arg structure for caller to use
+'''
+if isinstance(kwarg, dict):
+kw_ = []
+for key, val in kwarg.items():
+kw_.append('{0}={1}'.format(key, val))
+return list(arg) + kw_
+return arg
+
+
+def get_file_md5s(dirname, files, callback=None):
+'''
+given list of filenames in a directory,
+return a list of [md5, base filename]
+'''
+output = []
+for fname in files:
+md5out = None
+try:
+md5out = hashlib.md5(open(os.path.join(
+dirname, fname)).read()).hexdigest().strip()
+except Exception:
+md5out = None
+if not md5out:
+sys.stderr.write("failed to get md5 of %s\n" % fname)
+return None
+if callback is not None:
+output.append([md5out, callback(fname)])
+else:
+output.append([md5out, fname])
+return output
+
+
+def get_md5s_ok_count(text):
+'''
+given output from md5sum -c -w on a list of files,
+return the number of files for which the result is 'OK'
+'''
+return len([line for line in text.split('\n')
+if line.endswith(': OK')])
+
+
+def check_date(date):
+'''
+check format of user specified date (mname-dd-) and return it
+or return today's date in that format if no user date is specified
+'''
+if date is None:
+print "No date specified, using today's date"
+date = time.strftime("%b-%d-%Y", time.gmtime(time.time()))
+return date[0].lower() + date[1:]
+else:
+# check the user's date for sanity
+date_regexp = ('^(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)'
+   '-[0-9][0-9]-20[0-9][0-9]$')
+if not re.match(date, date_regexp):
+usage(None, "Bad format for datestring; expecting mon-dd-,"
+  " example: mar-12-2012")
+return date
+
+
+def get_tmp_filename(filename):
+'''use standard format for name of all temp files'''
+return filename + "_tmp"
 
 
 class LocalClientPlus(salt.client.LocalClient):
@@ -18,17 +86,6 @@
 list of known minions that match the specified expression,
 and for copying file content to a newly created remote file
 '''
-
-def condition_kwarg(self, arg, kwarg):
-'''
-Return a single arg structure for caller to use
-'''
-if isinstance(kwarg, dict):
-kw_ = []
-for key, val in kwarg.items():
-kw_.append('{0}={1}'.format(key, val))
-return list(arg) + kw_
-return arg
 
 def cmd_expandminions(self, tgt, fun, arg=(), timeout=None,
   expr_form='glob', ret='',
@@ -43,7 +100,7 @@
   salt "$deployhosts" -v --out raw test.ping |
   grep '{' | mawk -F"'" '{ print $2 }'
 '''
-arg = self.condition_kwarg(arg, kwarg)
+arg = condition_kwarg(arg, kwarg)
 pub_data = self.run_job(tgt, fun, arg, expr_form, ret,
 timeout, **kwargs)
 
@@ -77,69 +134,53 @@
 expr_form='glob')
 
 
-class Dirdate(object):
-'''
-handle date strings in directory names, used for
-prep/staging area primarily
-'''
-def __init__(self, date=None):
-self.date = self.check_date(date)
-
-def check_date(self, date):
-if date is None:
-print "No date specified, using today's date"
-date = time.strftime("%b-%d-%Y", time.gmtime(time.time()))
-return date[0].lower() + date[1:]
-else:
-# check the user's date for sanity
-date_regexp = ('^(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)'
-  

[MediaWiki-commits] [Gerrit] mediawiki...TemplateSandbox[master]: Add missing visibility declarations

[Anomie (Code Review)]

Anomie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401089 )

Change subject: Add missing visibility declarations
..

Add missing visibility declarations

And re-enable Squiz.Scope.MethodScope.Missing

Change-Id: Ibafb0608942d195630355b4e6b69329a1f3b54ea
---
M .phpcs.xml
M SpecialTemplateSandbox.php
2 files changed, 5 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateSandbox 
refs/changes/89/401089/1

diff --git a/.phpcs.xml b/.phpcs.xml
index bcfe27a..198c91b 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -6,7 +6,6 @@



-   

.

diff --git a/SpecialTemplateSandbox.php b/SpecialTemplateSandbox.php
index ee20ab7..43f8e5e 100644
--- a/SpecialTemplateSandbox.php
+++ b/SpecialTemplateSandbox.php
@@ -12,7 +12,7 @@
 */
private $output = null;
 
-   function __construct() {
+   public function __construct() {
parent::__construct( 'TemplateSandbox' );
}
 
@@ -20,7 +20,7 @@
return 'wiki';
}
 
-   function execute( $par ) {
+   public function execute( $par ) {
$this->setHeaders();
$this->checkPermissions();
 
@@ -115,7 +115,7 @@
 * @param array $allData
 * @return bool|String
 */
-   function validatePageParam( $value, $allData ) {
+   public function validatePageParam( $value, $allData ) {
if ( $value === '' || $value === null ) {
return true;
}
@@ -134,7 +134,7 @@
 * @param array $allData
 * @return bool|String
 */
-   function validateRevidParam( $value, $allData ) {
+   public function validateRevidParam( $value, $allData ) {
if ( $value === '' || $value === null ) {
return true;
}
@@ -150,7 +150,7 @@
 * @param array $allData
 * @return bool|String
 */
-   function validatePrefixParam( $value, $allData ) {
+   public function validatePrefixParam( $value, $allData ) {
if ( $value === '' || $value === null ) {
return true;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/401089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibafb0608942d195630355b4e6b69329a1f3b54ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateSandbox
Gerrit-Branch: master
Gerrit-Owner: Anomie 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ApiFeatureUsage[master]: Add missing visibility declarations

[Anomie (Code Review)]

Anomie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401088 )

Change subject: Add missing visibility declarations
..

Add missing visibility declarations

And re-enable Squiz.Scope.MethodScope.Missing

Change-Id: Ied209262eb592f80fe37b4ba684cf5844d7808d9
---
M .phpcs.xml
M ApiQueryFeatureUsage.php
M SpecialApiFeatureUsage.php
3 files changed, 3 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApiFeatureUsage 
refs/changes/88/401088/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 28c8136..d87bc24 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -6,7 +6,6 @@



-   

.

diff --git a/ApiQueryFeatureUsage.php b/ApiQueryFeatureUsage.php
index a3a32c6..edbac7e 100644
--- a/ApiQueryFeatureUsage.php
+++ b/ApiQueryFeatureUsage.php
@@ -5,7 +5,7 @@
parent::__construct( $query, $moduleName, 'afu' );
}
 
-   function execute() {
+   public function execute() {
$params = $this->extractRequestParams();
 
$agent = $params['agent'] === null
diff --git a/SpecialApiFeatureUsage.php b/SpecialApiFeatureUsage.php
index d965053..28f11b9 100644
--- a/SpecialApiFeatureUsage.php
+++ b/SpecialApiFeatureUsage.php
@@ -2,11 +2,11 @@
 class SpecialApiFeatureUsage extends SpecialPage {
private $engine = null;
 
-   function __construct() {
+   public function __construct() {
parent::__construct( 'ApiFeatureUsage' );
}
 
-   function execute( $par ) {
+   public function execute( $par ) {
$this->setHeaders();
$this->checkPermissions();
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied209262eb592f80fe37b4ba684cf5844d7808d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiFeatureUsage
Gerrit-Branch: master
Gerrit-Owner: Anomie 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve (weak and strict) type hints invarious places

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400587 )

Change subject: Improve (weak and strict) type hints invarious places
..


Improve (weak and strict) type hints invarious places

Change-Id: I3a42ec1547fae971d7b495c99dd144739d8521ab
---
M includes/OutputPage.php
M includes/Title.php
M includes/cache/CacheDependency.php
M includes/content/Content.php
M includes/context/MutableContext.php
M includes/context/RequestContext.php
M includes/installer/DatabaseUpdater.php
M includes/search/SearchExactMatchRescorer.php
M includes/specials/pagers/ContribsPager.php
9 files changed, 16 insertions(+), 21 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 1c2c29d..a2d445f 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -366,8 +366,8 @@
 * Add a new "" tag
 * To add an http-equiv meta tag, precede the name with "http:"
 *
-* @param string $name Tag name
-* @param string $val Tag value
+* @param string $name Name of the meta tag
+* @param string $val Value of the meta tag
 */
function addMeta( $name, $val ) {
array_push( $this->mMetatags, [ $name, $val ] );
diff --git a/includes/Title.php b/includes/Title.php
index b23bd5a..3de85e1 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -4644,7 +4644,7 @@
/**
 * Get the last touched timestamp
 *
-* @param IDatabase $db Optional db
+* @param IDatabase|null $db
 * @return string|false Last-touched timestamp
 */
public function getTouched( $db = null ) {
diff --git a/includes/cache/CacheDependency.php 
b/includes/cache/CacheDependency.php
index a59ba97..dd4c49e 100644
--- a/includes/cache/CacheDependency.php
+++ b/includes/cache/CacheDependency.php
@@ -34,7 +34,6 @@
private $deps;
 
/**
-* Create an instance.
 * @param mixed $value The user-supplied value
 * @param CacheDependency|CacheDependency[] $deps A dependency or 
dependency
 *   array. All dependencies must be objects implementing 
CacheDependency.
diff --git a/includes/content/Content.php b/includes/content/Content.php
index 6a0a63b..3e58782 100644
--- a/includes/content/Content.php
+++ b/includes/content/Content.php
@@ -483,11 +483,11 @@
 * @since 1.21
 *
 * @param WikiPage $page The deleted page
-* @param ParserOutput $parserOutput Optional parser output object
+* @param ParserOutput|null $parserOutput Optional parser output object
 *for efficient access to meta-information about the content object.
 *Provide if you have one handy.
 *
-* @return DataUpdate[] A list of DataUpdate instances that will clean 
up the
+* @return DeferrableUpdate[] A list of DeferrableUpdate instances that 
will clean up the
 *database after deletion.
 */
public function getDeletionUpdates( WikiPage $page,
diff --git a/includes/context/MutableContext.php 
b/includes/context/MutableContext.php
index 6358f11..189b346 100644
--- a/includes/context/MutableContext.php
+++ b/includes/context/MutableContext.php
@@ -26,9 +26,9 @@
/**
 * Set the Config object
 *
-* @param Config $c
+* @param Config $config
 */
-   public function setConfig( Config $c );
+   public function setConfig( Config $config );
 
/**
 * Set the WebRequest object
diff --git a/includes/context/RequestContext.php 
b/includes/context/RequestContext.php
index c2d0de1..cf5c939 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -81,17 +81,13 @@
private static $instance = null;
 
/**
-* Set the Config object
-*
-* @param Config $c
+* @param Config $config
 */
-   public function setConfig( Config $c ) {
-   $this->config = $c;
+   public function setConfig( Config $config ) {
+   $this->config = $config;
}
 
/**
-* Get the Config object
-*
 * @return Config
 */
public function getConfig() {
diff --git a/includes/installer/DatabaseUpdater.php 
b/includes/installer/DatabaseUpdater.php
index 54ff712..242f148 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -179,12 +179,12 @@
/**
 * @param Database $db
 * @param bool $shared
-* @param Maintenance $maintenance
+* @param Maintenance|null $maintenance
 *
 * @throws MWException
 * @return DatabaseUpdater
 */
-   public static function newForDB( Database $db, $shared = false, 
$maintenance = 

[MediaWiki-commits] [Gerrit] translatewiki[master]: [RestBaseUpdateJobs] Removed deleted repo

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401087 )

Change subject: [RestBaseUpdateJobs] Removed deleted repo
..


[RestBaseUpdateJobs] Removed deleted repo

Change-Id: I4248e35a1666206b333d37e4ffef489e488f2b80
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 0 insertions(+), 2 deletions(-)

Approvals:
  Raimond Spekking: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 1dd5e81..98e7c8a 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1980,8 +1980,6 @@
 Replace Text
 aliasfile = ReplaceText/ReplaceText.alias.php
 
-Rest Base Update Jobs
-
 Revision Comment Supplement
 aliasfile = RevisionCommentSupplement/RevisionCommentSupplement.alias.php
 descmsg = revcs-desc

-- 
To view, visit https://gerrit.wikimedia.org/r/401087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4248e35a1666206b333d37e4ffef489e488f2b80
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] translatewiki[master]: [RestBaseUpdateJobs] Removed deleted repo

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401087 )

Change subject: [RestBaseUpdateJobs] Removed deleted repo
..

[RestBaseUpdateJobs] Removed deleted repo

Change-Id: I4248e35a1666206b333d37e4ffef489e488f2b80
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/87/401087/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 1dd5e81..98e7c8a 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1980,8 +1980,6 @@
 Replace Text
 aliasfile = ReplaceText/ReplaceText.alias.php
 
-Rest Base Update Jobs
-
 Revision Comment Supplement
 aliasfile = RevisionCommentSupplement/RevisionCommentSupplement.alias.php
 descmsg = revcs-desc

-- 
To view, visit https://gerrit.wikimedia.org/r/401087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4248e35a1666206b333d37e4ffef489e488f2b80
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TimelineTable[master]: Add minusx to composer.json Change mode of TimelineTable.php...

[OmkarJ (Code Review)]

OmkarJ has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401086 )

Change subject: Add minusx to composer.json Change mode of TimelineTable.php to 
100644
..

Add minusx to composer.json
Change mode of TimelineTable.php to 100644

Change-Id: I65a649f42ed825ef8e5cdfe439302ca9de2da221
---
M TimelineTable.php
M composer.json
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimelineTable 
refs/changes/86/401086/1

diff --git a/TimelineTable.php b/TimelineTable.php
old mode 100755
new mode 100644
diff --git a/composer.json b/composer.json
index 7d306d5..9e2aaab 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,9 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/minus-x": "0.2.1"
+   "mediawiki/minus-x": "0.2.1",
+   "jakub-onderka/php-console-highlighter": "0.3.2"
+   
},
"scripts": {
"test": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65a649f42ed825ef8e5cdfe439302ca9de2da221
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimelineTable
Gerrit-Branch: master
Gerrit-Owner: OmkarJ 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SkinPerPage[master]: Add minusx to composer.json

[OmkarJ (Code Review)]

OmkarJ has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401085 )

Change subject: Add minusx to composer.json
..

Add minusx to composer.json

Bug: T175794
Change-Id: I2dc666d5237f689d10111fefa86a0b0d42704341
---
M composer.json
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SkinPerPage 
refs/changes/85/401085/1

diff --git a/composer.json b/composer.json
index aebd773..059a2a5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,17 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
+
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dc666d5237f689d10111fefa86a0b0d42704341
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SkinPerPage
Gerrit-Branch: master
Gerrit-Owner: OmkarJ 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TimelineTable[master]: Add minusx to composer.json

[OmkarJ (Code Review)]

OmkarJ has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401084 )

Change subject: Add minusx to composer.json
..

Add minusx to composer.json

Bug: T175794
Change-Id: Ied331a7fd4a17148a9f4b5840c32ca77f40fe2c8
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimelineTable 
refs/changes/84/401084/1

diff --git a/composer.json b/composer.json
index aebd773..7d306d5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied331a7fd4a17148a9f4b5840c32ca77f40fe2c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimelineTable
Gerrit-Branch: master
Gerrit-Owner: OmkarJ 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Cleanup and unify class level PHPDoc blocks

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400580 )

Change subject: Cleanup and unify class level PHPDoc blocks
..


Cleanup and unify class level PHPDoc blocks

This unifies certain minor details of the coding style across this
code base. This patch is pretty much exclusively about comments and
should not have any effect on production.

Change-Id: Ic96e60b85503a808f9c55a1efc663c95d413b1fc
---
M NewsletterHooks.php
M includes/Echo/BaseNewsletterPresentationModel.php
M includes/Echo/EchoNewsletterPresentationModel.php
M includes/Echo/EchoNewsletterPublisherAddedPresentationModel.php
M includes/Echo/EchoNewsletterSubscribedPresentationModel.php
M includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
M includes/Echo/EchoNewsletterUserLocator.php
M includes/Newsletter.php
M includes/NewsletterValidator.php
M includes/api/ApiNewsletterSubscribe.php
M includes/content/NewsletterContent.php
M includes/content/NewsletterContentHandler.php
M includes/content/NewsletterDataUpdate.php
M includes/content/NewsletterDiffEngine.php
M includes/logging/NewsletterLogFormatter.php
M includes/specials/SpecialNewsletter.php
M includes/specials/SpecialNewsletterCreate.php
M includes/specials/SpecialNewsletters.php
M includes/specials/pagers/NewsletterTablePager.php
M maintenance/deleteInactiveNewsletters.php
M maintenance/updateSubscribersCount.php
R tests/api/ApiNewsletterSubscribeTest.php
M tests/specials/SpecialNewsletterCreateTest.php
M tests/specials/SpecialNewslettersTest.php
24 files changed, 50 insertions(+), 20 deletions(-)

Approvals:
  01tonythomas: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/NewsletterHooks.php b/NewsletterHooks.php
index de9205c..2e1112d 100644
--- a/NewsletterHooks.php
+++ b/NewsletterHooks.php
@@ -8,8 +8,8 @@
/**
 * Function to be called before EchoEvent
 *
-* @param array &$notifications Echo notifications
-* @param array &$notificationCategories Echo notification categories
+* @param array[] &$notifications Echo notifications
+* @param array[] &$notificationCategories Echo notification categories
 * @return bool
 */
public static function onBeforeCreateEchoEvent( &$notifications, 
&$notificationCategories ) {
@@ -394,4 +394,5 @@
 
return true;
}
+
 }
diff --git a/includes/Echo/BaseNewsletterPresentationModel.php 
b/includes/Echo/BaseNewsletterPresentationModel.php
index 40f8da9..50f7ddd 100644
--- a/includes/Echo/BaseNewsletterPresentationModel.php
+++ b/includes/Echo/BaseNewsletterPresentationModel.php
@@ -1,6 +1,7 @@
 getNewsletterId() );
return (bool)$nl;
@@ -27,4 +28,5 @@
}
return $result;
}
+
 }
diff --git a/includes/Echo/EchoNewsletterPresentationModel.php 
b/includes/Echo/EchoNewsletterPresentationModel.php
index b7ed667..425f933 100644
--- a/includes/Echo/EchoNewsletterPresentationModel.php
+++ b/includes/Echo/EchoNewsletterPresentationModel.php
@@ -42,4 +42,5 @@
return $this->msg( 'notification-body-newsletter-announce' )
->params( $this->event->getExtraParam( 'section-text' ) 
);
}
+
 }
diff --git a/includes/Echo/EchoNewsletterPublisherAddedPresentationModel.php 
b/includes/Echo/EchoNewsletterPublisherAddedPresentationModel.php
index f20d5e5..1c83b5b 100644
--- a/includes/Echo/EchoNewsletterPublisherAddedPresentationModel.php
+++ b/includes/Echo/EchoNewsletterPublisherAddedPresentationModel.php
@@ -21,4 +21,5 @@
$msg->params( $agentGenderName );
return $msg;
}
+
 }
diff --git a/includes/Echo/EchoNewsletterSubscribedPresentationModel.php 
b/includes/Echo/EchoNewsletterSubscribedPresentationModel.php
index 3a9ff32..9a2cf7d 100644
--- a/includes/Echo/EchoNewsletterSubscribedPresentationModel.php
+++ b/includes/Echo/EchoNewsletterSubscribedPresentationModel.php
@@ -20,4 +20,5 @@
$msg->params( $this->getNewsletterName() );
return $msg;
}
+
 }
diff --git a/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php 
b/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
index b050aa5..c50c880 100644
--- a/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
+++ b/includes/Echo/EchoNewsletterUnsubscribedPresentationModel.php
@@ -20,4 +20,5 @@
$msg->params( $this->getNewsletterName() );
return $msg;
}
+
 }
diff --git a/includes/Echo/EchoNewsletterUserLocator.php 
b/includes/Echo/EchoNewsletterUserLocator.php
index f674bc7..023ca47 100644
--- a/includes/Echo/EchoNewsletterUserLocator.php
+++ b/includes/Echo/EchoNewsletterUserLocator.php
@@ -1,6 +1,7 @@
 getSubscribers() );
}
+
 }
diff --git a/includes/Newsletter.php b/includes/Newsletter.php
index 46a5753..5fbf290 100644
--- 

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceBlog[master]: Add minusx to composer.json

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401009 )

Change subject: Add minusx to composer.json
..


Add minusx to composer.json

Bug: T175794
Change-Id: I037fd51ea42e7441ce65e56e429ff9987fc3eb37
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  D3r1ck01: Looks good to me, but someone else must approve
  Florianschmidtwelzow: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index a17f212..4a63132 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,16 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I037fd51ea42e7441ce65e56e429ff9987fc3eb37
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlueSpiceBlog
Gerrit-Branch: master
Gerrit-Owner: OmkarJ 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceAvatars[master]: Add minusx to composer.json

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401008 )

Change subject: Add minusx to composer.json
..


Add minusx to composer.json

Bug: T175794
Change-Id: I8306780c012c70ffca07595beb1d24357dfb61c8
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  D3r1ck01: Looks good to me, but someone else must approve
  Florianschmidtwelzow: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index 7213912..a852f9f 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,16 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401008
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8306780c012c70ffca07595beb1d24357dfb61c8
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/BlueSpiceAvatars
Gerrit-Branch: master
Gerrit-Owner: OmkarJ 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Bouquet[master]: Avoid PHP 7.1 warning of &$this usage

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400719 )

Change subject: Avoid PHP 7.1 warning of &$this usage
..


Avoid PHP 7.1 warning of &$this usage

Bug: T153505
Change-Id: Ic21748bacc4c7281f0b85d0bd6accb285f2de087
---
M includes/BouquetTemplate.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/BouquetTemplate.php b/includes/BouquetTemplate.php
index e33bf5b..aa6b16b 100644
--- a/includes/BouquetTemplate.php
+++ b/includes/BouquetTemplate.php
@@ -317,7 +317,9 @@
echo $this->makeListItem( $key, $tbItem );
}
 
-   Hooks::run( 'SkinTemplateToolboxEnd', array( &$this, true ) );
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $template = $this;
+   Hooks::run( 'SkinTemplateToolboxEnd', array( &$template, true ) 
);
 ?>



-- 
To view, visit https://gerrit.wikimedia.org/r/400719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic21748bacc4c7281f0b85d0bd6accb285f2de087
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Bouquet
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...DuskToDawn[master]: Avoid PHP 7.1 warning of &$this usage

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400718 )

Change subject: Avoid PHP 7.1 warning of &$this usage
..


Avoid PHP 7.1 warning of &$this usage

Bug: T153505
Change-Id: I3db29dba16d8d2561ce71c97d6b451184b5b23bb
---
M includes/DuskToDawnTemplate.php
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/DuskToDawnTemplate.php b/includes/DuskToDawnTemplate.php
index 141a539..e8df08b 100644
--- a/includes/DuskToDawnTemplate.php
+++ b/includes/DuskToDawnTemplate.php
@@ -266,8 +266,9 @@
foreach ( $this->getToolbox() as $key => $tbItem ) {
echo $this->makeListItem( $key, $tbItem );
}
-
-   Hooks::run( 'SkinTemplateToolboxEnd', array( &$this, true ) );
+   // Avoid PHP 7.1 warning of passing $this by reference
+   $template = $this;
+   Hooks::run( 'SkinTemplateToolboxEnd', array( &$template, true ) 
);
 ?>



-- 
To view, visit https://gerrit.wikimedia.org/r/400718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3db29dba16d8d2561ce71c97d6b451184b5b23bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DuskToDawn
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...WPtouch[master]: Avoid PHP 7.1 warning of &$this usage

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400717 )

Change subject: Avoid PHP 7.1 warning of &$this usage
..


Avoid PHP 7.1 warning of &$this usage

Bug: T153505
Change-Id: I7b55990cfe583bfc705f7a9d1ab89c3ddd6128c5
---
M WPtouch.skin.php
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/WPtouch.skin.php b/WPtouch.skin.php
index 465948e..4060f91 100644
--- a/WPtouch.skin.php
+++ b/WPtouch.skin.php
@@ -156,8 +156,9 @@
foreach ( $this->getToolbox() as $key => $item 
) {
echo $this->makeListItem( $key, $item );
}
-
-   Hooks::run( 'SkinTemplateToolboxEnd', array( 
&$this, true ) );
+   // Avoid PHP 7.1 warning of passing $this by 
reference
+   $skin = $this;
+   Hooks::run( 'SkinTemplateToolboxEnd', array( 
&$skin, true ) );
?>

 

-- 
To view, visit https://gerrit.wikimedia.org/r/400717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b55990cfe583bfc705f7a9d1ab89c3ddd6128c5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/WPtouch
Gerrit-Branch: master
Gerrit-Owner: LukBukkit 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Allow newsletters to have non-mainspace main pages

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400589 )

Change subject: Allow newsletters to have non-mainspace main pages
..


Allow newsletters to have non-mainspace main pages

Bug: T183752
Change-Id: Ie676dc56e18b24713735575f5b9eae21cc3239a1
---
M includes/NewsletterEditPage.php
M includes/content/NewsletterDataUpdate.php
M includes/content/NewsletterDiffEngine.php
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  01tonythomas: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/NewsletterEditPage.php b/includes/NewsletterEditPage.php
index 88480a7..32f63d9 100644
--- a/includes/NewsletterEditPage.php
+++ b/includes/NewsletterEditPage.php
@@ -441,7 +441,7 @@
$editResult = NewsletterContentHandler::edit(
$title,
$description,
-   $mainPage->getText(),
+   $mainPage->getFullText(),
$publisherNames,
trim( $data['Summary'] ),
$this->context
diff --git a/includes/content/NewsletterDataUpdate.php 
b/includes/content/NewsletterDataUpdate.php
index 876854a..b22dd72 100644
--- a/includes/content/NewsletterDataUpdate.php
+++ b/includes/content/NewsletterDataUpdate.php
@@ -80,7 +80,7 @@
$newsletter = Newsletter::newFromName( $this->title->getText() 
);
 
$formData = [
-   'Name' => $this->title->getText(),
+   'Name' => $this->title->getFullText(),
'Description' => $this->content->getDescription(),
'MainPage' => $this->content->getMainPage()
];
diff --git a/includes/content/NewsletterDiffEngine.php 
b/includes/content/NewsletterDiffEngine.php
index c3f54bc..5e10f94 100644
--- a/includes/content/NewsletterDiffEngine.php
+++ b/includes/content/NewsletterDiffEngine.php
@@ -27,7 +27,7 @@
}
 
$mainPageDiff = $this->generateTextDiffBody(
-   $old->getMainPage()->getText(), 
$new->getMainPage()->getText()
+   $old->getMainPage()->getFullText(), 
$new->getMainPage()->getFullText()
);
 
if ( $mainPageDiff ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/400589
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie676dc56e18b24713735575f5b9eae21cc3239a1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery 
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Pppery 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Provide Test for site.botusers() method #GCI2017

[Anpans (Code Review)]

Anpans has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401083 )

Change subject: Provide Test for site.botusers() method #GCI2017
..

Provide Test for site.botusers() method #GCI2017

Change-Id: I066eecb25358ae054d7abc925574550153a83a6a
---
M tests/site_tests.py
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/83/401083/1

diff --git a/tests/site_tests.py b/tests/site_tests.py
index bd77485..2ff87e5 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -749,6 +749,18 @@
 self.assertIsInstance(cat, pywikibot.Category)
 self.assertLessEqual(cat.title(withNamespace=False), "Hij")
 
+def test_botusers(self):
+"""Test the site.botusers() method."""
+mysite = self.get_site()
+bu = list(mysite.botusers(total=10))
+self.assertLessEqual(len(bu), 10)
+for botuser in bu:
+self.assertIsInstance(botuser, dict)
+self.assertIn("name", botuser)
+self.assertIn("userid", botuser)
+self.assertIn("editcount", botuser)
+self.assertIn("registration", botuser)
+
 def test_allusers(self):
 """Test the site.allusers() method."""
 mysite = self.get_site()

-- 
To view, visit https://gerrit.wikimedia.org/r/401083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I066eecb25358ae054d7abc925574550153a83a6a
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Anpans 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Separate styles for Special:UploadAvatar into a separate Res...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400996 )

Change subject: Separate styles for Special:UploadAvatar into a separate 
ResourceLoader module
..


Separate styles for Special:UploadAvatar into a separate ResourceLoader module

Change-Id: Ifa80f2421bd07b26ef6f675508f331f985dd7c45
---
A UserProfile/SpecialUploadAvatar.css
M UserProfile/SpecialUploadAvatar.php
M UserProfile/UserProfile.css
M UserProfile/UserProfile.php
4 files changed, 35 insertions(+), 27 deletions(-)

Approvals:
  Jack Phoenix: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/UserProfile/SpecialUploadAvatar.css 
b/UserProfile/SpecialUploadAvatar.css
new file mode 100644
index 000..e65be57
--- /dev/null
+++ b/UserProfile/SpecialUploadAvatar.css
@@ -0,0 +1,24 @@
+#wpUploadSource {
+   width: 100px;
+}
+
+table.avatar-success-page {
+   border-collapse: collapse;
+   margin-top: 20px;
+   padding: 0;
+}
+
+table.avatar-success-page td.title-cell {
+   color: #797979;
+   font-size: 12px;
+   font-weight: 700;
+   padding: 5px 5px 20px 5px;
+}
+
+table.avatar-success-page td.image-cell {
+   padding-bottom: 20px;
+}
+
+table.avatar-success-page td.image-cell img {
+   border: 0;
+}
\ No newline at end of file
diff --git a/UserProfile/SpecialUploadAvatar.php 
b/UserProfile/SpecialUploadAvatar.php
index 01c83df..cefd354 100644
--- a/UserProfile/SpecialUploadAvatar.php
+++ b/UserProfile/SpecialUploadAvatar.php
@@ -46,7 +46,10 @@
$out = $this->getOutput();
 
// Add CSS
-   $out->addModuleStyles( 'ext.socialprofile.userprofile.css' );
+   $out->addModuleStyles( [
+   'ext.socialprofile.userprofile.css',
+   'ext.socialprofile.special.uploadavatar.css'
+   ] );
 
// Let the parent class do most of the heavy lifting.
parent::execute( $params );
diff --git a/UserProfile/UserProfile.css b/UserProfile/UserProfile.css
index 7f7e727..97f333e 100644
--- a/UserProfile/UserProfile.css
+++ b/UserProfile/UserProfile.css
@@ -494,32 +494,6 @@
text-decoration: none;
 }
 
-/* Avatar upload page (Special:UploadAvatar) */
-#wpUploadSource {
-   width: 100px;
-}
-
-table.avatar-success-page {
-   border-collapse: collapse;
-   margin-top: 20px;
-   padding: 0;
-}
-
-table.avatar-success-page td.title-cell {
-   color: #797979;
-   font-size: 12px;
-   font-weight: 700;
-   padding: 5px 5px 20px 5px;
-}
-
-table.avatar-success-page td.image-cell {
-   padding-bottom: 20px;
-}
-
-table.avatar-success-page td.image-cell img {
-   border: 0;
-}
-
 /* Update Profile */
 .profile-info {
padding: 25px 0;
diff --git a/UserProfile/UserProfile.php b/UserProfile/UserProfile.php
index 1420d1e..6e6eb48 100644
--- a/UserProfile/UserProfile.php
+++ b/UserProfile/UserProfile.php
@@ -103,6 +103,13 @@
'position' => 'top'
 );
 
+$wgResourceModules['ext.socialprofile.special.uploadavatar.css'] = array(
+   'styles' => 'SpecialUploadAvatar.css',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'SocialProfile/UserProfile',
+   'position' => 'top'
+);
+
 # Add new log types for profile edits and avatar uploads
 global $wgLogTypes, $wgLogNames, $wgLogHeaders, $wgLogActions;
 $wgLogTypes[]= 'profile';

-- 
To view, visit https://gerrit.wikimedia.org/r/400996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa80f2421bd07b26ef6f675508f331f985dd7c45
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: SamanthaNguyen 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Properly load collapsible sitelinks CSS exactly when needed

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400684 )

Change subject: Properly load collapsible sitelinks CSS exactly when needed
..


Properly load collapsible sitelinks CSS exactly when needed

This patch fixes a series of issues:

* The first is the placement of this CSS. It didn't really belong to
"toolbaritem". Note that the relevant "collapsible" class is set on the
"sitelinkgroupview" template.

* This CSS is only needed on JS clients. But it's needed before the
collapsible feature kicks in. Otherwise a brief flash of an unstyled
"[Collapse]" button would be visible. This is achieved by making it it's
own module, and loading it as a dependency.

* The "toolbaritem" is not loaded on diff pages. That's why diff showed
an unstyled "[Collapse]". This is fixed now.

Bug: T175492
Bug: T182767
Change-Id: I6713bdf4c4994475d80c3a7a55cf6550d17b1968
---
M view/resources/jquery/wikibase/resources.php
R view/resources/jquery/wikibase/themes/default/images/collapse.png
R view/resources/jquery/wikibase/themes/default/images/collapse.svg
R view/resources/jquery/wikibase/themes/default/images/expand.png
R view/resources/jquery/wikibase/themes/default/images/expand.svg
A 
view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkgroupview.mw-collapsible.css
M 
view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
7 files changed, 37 insertions(+), 29 deletions(-)

Approvals:
  Ladsgroup: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/view/resources/jquery/wikibase/resources.php 
b/view/resources/jquery/wikibase/resources.php
index cbb7caf..2854688 100644
--- a/view/resources/jquery/wikibase/resources.php
+++ b/view/resources/jquery/wikibase/resources.php
@@ -323,10 +323,10 @@

'themes/default/jquery.wikibase.sitelinkgroupview.css',
],
'dependencies' => [
-   'jquery.makeCollapsible',
'jquery.sticknode',
'jquery.ui.EditableTemplatedWidget',
'jquery.util.EventSingletonManager',
+   
'jquery.wikibase.sitelinkgroupview.mw-collapsible.styles',
'mediawiki.jqueryMsg', // for {{plural}} and 
{{gender}} support in messages
'wikibase.buildErrorOutput',
'wikibase.sites',
@@ -336,6 +336,12 @@
],
],
 
+   'jquery.wikibase.sitelinkgroupview.mw-collapsible.styles' => 
$moduleTemplate + [
+   'styles' => [
+   
'themes/default/jquery.wikibase.sitelinkgroupview.mw-collapsible.css',
+   ],
+   ],
+
'jquery.wikibase.sitelinklistview' => $moduleTemplate + [
'scripts' => [
'jquery.wikibase.sitelinklistview.js',
diff --git 
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/oojs-ui/collapse.png
 b/view/resources/jquery/wikibase/themes/default/images/collapse.png
similarity index 100%
rename from 
view/resources/jquery/wikibase/toolbar/themes/default/images/icons/oojs-ui/collapse.png
rename to view/resources/jquery/wikibase/themes/default/images/collapse.png
Binary files differ
diff --git 
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/oojs-ui/collapse.svg
 b/view/resources/jquery/wikibase/themes/default/images/collapse.svg
similarity index 100%
rename from 
view/resources/jquery/wikibase/toolbar/themes/default/images/icons/oojs-ui/collapse.svg
rename to view/resources/jquery/wikibase/themes/default/images/collapse.svg
diff --git 
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/oojs-ui/expand.png
 b/view/resources/jquery/wikibase/themes/default/images/expand.png
similarity index 100%
rename from 
view/resources/jquery/wikibase/toolbar/themes/default/images/icons/oojs-ui/expand.png
rename to view/resources/jquery/wikibase/themes/default/images/expand.png
Binary files differ
diff --git 
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/oojs-ui/expand.svg
 b/view/resources/jquery/wikibase/themes/default/images/expand.svg
similarity index 100%
rename from 
view/resources/jquery/wikibase/toolbar/themes/default/images/icons/oojs-ui/expand.svg
rename to view/resources/jquery/wikibase/themes/default/images/expand.svg
diff --git 
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkgroupview.mw-collapsible.css
 
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkgroupview.mw-collapsible.css
new file mode 100644
index 000..0165e1a
--- /dev/null
+++ 

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Uses PSR-4 autoloader

[Tpt (Code Review)]

Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401082 )

Change subject: Uses PSR-4 autoloader
..

Uses PSR-4 autoloader

Change-Id: I9758d20d0ef9df40c188574004d5df45968c2417
---
M extension.json
R includes/Index/CustomIndexField.php
R includes/Index/CustomIndexFieldsParser.php
R includes/Index/DatabaseIndexContentLookup.php
R includes/Index/EditIndexPage.php
R includes/Index/IndexContent.php
R includes/Index/IndexContentHandler.php
R includes/Index/IndexContentLookup.php
R includes/Index/IndexDifferenceEngine.php
R includes/Index/IndexEditAction.php
R includes/Index/IndexRedirectContent.php
R includes/Index/IndexSubmitAction.php
R includes/Index/ParserHelper.php
R includes/Index/ProofreadIndexDbConnector.php
R includes/Page/DatabaseIndexForPageLookup.php
R includes/Page/EditPagePage.php
R includes/Page/IndexForPageLookup.php
R includes/Page/PageContent.php
R includes/Page/PageContentBuilder.php
R includes/Page/PageContentHandler.php
R includes/Page/PageDifferenceEngine.php
R includes/Page/PageDisplayHandler.php
R includes/Page/PageEditAction.php
R includes/Page/PageLevel.php
R includes/Page/PageSubmitAction.php
R includes/Page/PageViewAction.php
R includes/Page/ProofreadPageDbConnector.php
R tests/phpunit/Index/CustomIndexFieldsParserTest.php
R tests/phpunit/Index/IndexContentHandlerTest.php
R tests/phpunit/Index/IndexContentLookupMock.php
R tests/phpunit/Index/IndexContentTest.php
R tests/phpunit/Index/IndexRedirectContentTest.php
R tests/phpunit/Index/ParserHelperTest.php
R tests/phpunit/Page/DatabaseIndexForPageLookupTest.php
R tests/phpunit/Page/IndexForPageLookupMock.php
R tests/phpunit/Page/PageContentBuilderTest.php
R tests/phpunit/Page/PageContentHandlerTest.php
R tests/phpunit/Page/PageContentTest.php
R tests/phpunit/Page/PageDisplayHandlerTest.php
R tests/phpunit/Page/PageLevelTest.php
40 files changed, 7 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/82/401082/1

diff --git a/extension.json b/extension.json
index 2de9048..0e1f5a5 100644
--- a/extension.json
+++ b/extension.json
@@ -43,60 +43,20 @@
"ExtensionMessagesFiles": {
"ProofreadPageAlias": "ProofreadPage.alias.php"
},
+   "AutoloadNamespaces": {
+   "ProofreadPage\\": "includes/"
+   },
"AutoloadClasses": {
"ProofreadPage": "ProofreadPage.body.php",
-   "ProofreadPage\\Context": "includes/Context.php",
-   "ProofreadPage\\ProofreadPageInit": 
"includes/ProofreadPageInit.php",
-   "ProofreadPage\\DiffFormatterUtils": 
"includes/DiffFormatterUtils.php",
-   "ProofreadPage\\FileNotFoundException": 
"includes/FileNotFoundException.php",
-   "ProofreadPage\\PageNumberNotFoundException": 
"includes/PageNumberNotFoundException.php",
-   "ProofreadPage\\FileProvider": "includes/FileProvider.php",
-   "ProofreadPage\\Link": "includes/Link.php",
-   "ProofreadPage\\Index\\CustomIndexField": 
"includes/index/CustomIndexField.php",
-   "ProofreadPage\\Index\\CustomIndexFieldsParser": 
"includes/index/CustomIndexFieldsParser.php",
-   "ProofreadPage\\Index\\IndexContentLookup": 
"includes/index/IndexContentLookup.php",
-   "ProofreadPage\\Index\\DatabaseIndexContentLookup": 
"includes/index/DatabaseIndexContentLookup.php",
-   "ProofreadPage\\Index\\IndexContent": 
"includes/index/IndexContent.php",
-   "ProofreadPage\\Index\\IndexRedirectContent": 
"includes/index/IndexRedirectContent.php",
-   "ProofreadPage\\Index\\IndexContentHandler": 
"includes/index/IndexContentHandler.php",
-   "ProofreadPage\\Index\\IndexDifferenceEngine": 
"includes/index/IndexDifferenceEngine.php",
-   "ProofreadPage\\Index\\IndexEditAction": 
"includes/index/IndexEditAction.php",
-   "ProofreadPage\\Index\\IndexSubmitAction": 
"includes/index/IndexSubmitAction.php",
-   "ProofreadPage\\Index\\ParserHelper": 
"includes/index/ParserHelper.php",
-   "ProofreadPage\\Index\\EditIndexPage": 
"includes/index/EditIndexPage.php",
-   "ProofreadIndexDbConnector": 
"includes/index/ProofreadIndexDbConnector.php",
-   "ProofreadPage\\Pagination\\PaginationFactory": 
"includes/Pagination/PaginationFactory.php",
-   "ProofreadPage\\Pagination\\PageNumber": 
"includes/Pagination/PageNumber.php",
-   "ProofreadPage\\Pagination\\PageList": 
"includes/Pagination/PageList.php",
-   "ProofreadPage\\Pagination\\Pagination": 
"includes/Pagination/Pagination.php",
-   "ProofreadPage\\Pagination\\FilePagination": 
"includes/Pagination/FilePagination.php",
-   "ProofreadPage\\Pagination\\PagePagination": 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set category collation to uca-es-u-kn for eswiki

[MarcoAurelio (Code Review)]

MarcoAurelio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401081 )

Change subject: Set category collation to uca-es-u-kn for eswiki
..

Set category collation to uca-es-u-kn for eswiki

Bug: T183802
Change-Id: I5a67f29c4765a1d868d24ddab49334ec5a29c84e
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/81/401081/1


-- 
To view, visit https://gerrit.wikimedia.org/r/401081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a67f29c4765a1d868d24ddab49334ec5a29c84e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SecurityCheckPlugin[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401080 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: Iae1ba38e9c6d335447045091727989080eae1150
---
M .phpcs.xml
M composer.json
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index 12e6775..41f079f 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -35,7 +35,7 @@

./tests

-   
+   
./tests


diff --git a/composer.json b/composer.json
index d1ebd31..b327092 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
"ext-ast": "<=0.1.4"
},
"require-dev": {
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2"
},

-- 
To view, visit https://gerrit.wikimedia.org/r/401080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae1ba38e9c6d335447045091727989080eae1150
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/phan/SecurityCheckPlugin
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/docroot[master]: phpcs.xml: Use normal exclusion syntax

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401078 )

Change subject: phpcs.xml: Use normal exclusion syntax
..


phpcs.xml: Use normal exclusion syntax

Also vendor/ is now automatically ignored.

Change-Id: I7c31ee5c264cd95f679b5e88fe7e2da13a7f0917
---
M .phpcs.xml
1 file changed, 5 insertions(+), 13 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index c2ab9d5..311ca42 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,6 +1,9 @@
 
 

+   
+   
+   



@@ -8,21 +11,10 @@



+   

.


-   
-   0
-   
-   
-   0
-   
-   
-   0
-   
-   
-   0
-   
-   vendor
 
+

-- 
To view, visit https://gerrit.wikimedia.org/r/401078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c31ee5c264cd95f679b5e88fe7e2da13a7f0917
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...SecurityCheckPlugin[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401080 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..

build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: Iae1ba38e9c6d335447045091727989080eae1150
---
M .phpcs.xml
M composer.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/tools/phan/SecurityCheckPlugin 
refs/changes/80/401080/1

diff --git a/.phpcs.xml b/.phpcs.xml
index 12e6775..41f079f 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -35,7 +35,7 @@

./tests

-   
+   
./tests


diff --git a/composer.json b/composer.json
index d1ebd31..b327092 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
"ext-ast": "<=0.1.4"
},
"require-dev": {
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2"
},

-- 
To view, visit https://gerrit.wikimedia.org/r/401080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae1ba38e9c6d335447045091727989080eae1150
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/phan/SecurityCheckPlugin
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs/libraryupgrader[master]: Install php-ast for SecurityCheckPlugin

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401079 )

Change subject: Install php-ast for SecurityCheckPlugin
..

Install php-ast for SecurityCheckPlugin

Change-Id: I49e596f3f5ad823843308e9434dd4240d3829d38
---
M Dockerfile
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/libraryupgrader 
refs/changes/79/401079/1

diff --git a/Dockerfile b/Dockerfile
index 9282587..873c2e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:stretch-slim
 ENV LANG C.UTF-8
-RUN apt-get update && apt-get install -y composer git php-xml php-zip php-gd 
php-mbstring php-curl python3 python3-pip python3-setuptools python3-wheel 
python3-requests --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y composer git php-ast php-xml php-zip 
php-gd php-mbstring php-curl python3 python3-pip python3-setuptools 
python3-wheel python3-requests --no-install-recommends && rm -rf 
/var/lib/apt/lists/*
 RUN cd /tmp && composer require mediawiki/mediawiki-codesniffer 14.1.0 && rm 
-rf *
 RUN cd /tmp && composer require mediawiki/mediawiki-codesniffer 15.0.0 && rm 
-rf *
 RUN cd /tmp && composer require mediawiki/mediawiki-codesniffer 0.12.0 && rm 
-rf *

-- 
To view, visit https://gerrit.wikimedia.org/r/401079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49e596f3f5ad823843308e9434dd4240d3829d38
Gerrit-PatchSet: 1
Gerrit-Project: labs/libraryupgrader
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs/libraryupgrader[master]: Install php-ast for SecurityCheckPlugin

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401079 )

Change subject: Install php-ast for SecurityCheckPlugin
..


Install php-ast for SecurityCheckPlugin

Change-Id: I49e596f3f5ad823843308e9434dd4240d3829d38
---
M Dockerfile
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Dockerfile b/Dockerfile
index 9282587..873c2e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:stretch-slim
 ENV LANG C.UTF-8
-RUN apt-get update && apt-get install -y composer git php-xml php-zip php-gd 
php-mbstring php-curl python3 python3-pip python3-setuptools python3-wheel 
python3-requests --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y composer git php-ast php-xml php-zip 
php-gd php-mbstring php-curl python3 python3-pip python3-setuptools 
python3-wheel python3-requests --no-install-recommends && rm -rf 
/var/lib/apt/lists/*
 RUN cd /tmp && composer require mediawiki/mediawiki-codesniffer 14.1.0 && rm 
-rf *
 RUN cd /tmp && composer require mediawiki/mediawiki-codesniffer 15.0.0 && rm 
-rf *
 RUN cd /tmp && composer require mediawiki/mediawiki-codesniffer 0.12.0 && rm 
-rf *

-- 
To view, visit https://gerrit.wikimedia.org/r/401079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I49e596f3f5ad823843308e9434dd4240d3829d38
Gerrit-PatchSet: 1
Gerrit-Project: labs/libraryupgrader
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/docroot[master]: phpcs.xml: Use normal exclusion syntax

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401078 )

Change subject: phpcs.xml: Use normal exclusion syntax
..

phpcs.xml: Use normal exclusion syntax

Also vendor/ is now automatically ignored.

Change-Id: I7c31ee5c264cd95f679b5e88fe7e2da13a7f0917
---
M .phpcs.xml
1 file changed, 5 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/78/401078/1

diff --git a/.phpcs.xml b/.phpcs.xml
index c2ab9d5..311ca42 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,6 +1,9 @@
 
 

+   
+   
+   



@@ -8,21 +11,10 @@



+   

.


-   
-   0
-   
-   
-   0
-   
-   
-   0
-   
-   
-   0
-   
-   vendor
 
+

-- 
To view, visit https://gerrit.wikimedia.org/r/401078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c31ee5c264cd95f679b5e88fe7e2da13a7f0917
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs...stewardbots[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401069 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs now pass and were enabled:
* MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected
* MediaWiki.Files.ClassMatchesFilename.NotMatch
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment
* Squiz.Classes.ValidClassName.NotCamelCaps

Also added phpcbf to "composer fix" command.

Change-Id: I6e3d80625b903e6fbce5a1e15888b90d925b7f07
---
M .phpcs.xml
M composer.json
M hat-web-tool/delete.php
M hat-web-tool/projects.php
4 files changed, 10 insertions(+), 12 deletions(-)

Approvals:
  MarcoAurelio: Looks good to me, approved
  Legoktm: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index f33bd38..8874027 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,11 +1,7 @@
 
 

-   
-   

-   
-   



diff --git a/composer.json b/composer.json
index 137703e..765fa56 100644
--- a/composer.json
+++ b/composer.json
@@ -10,13 +10,15 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
-   "mediawiki/mediawiki-codesniffer": "14.1.0"
+   "mediawiki/mediawiki-codesniffer": "15.0.0"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
"phpcs -p -s"
],
-   "fix": "phpcbf"
+   "fix": [
+   "phpcbf"
+   ]
}
 }
diff --git a/hat-web-tool/delete.php b/hat-web-tool/delete.php
index 36169a8..5cba568 100644
--- a/hat-web-tool/delete.php
+++ b/hat-web-tool/delete.php
@@ -5,9 +5,9 @@
 https://tools-static.wmflabs.org/static/jquery/2.1.0/jquery.min.js";>
 https://tools-static.wmflabs.org/static/jquery-tablesorter/2.0.5/jquery.tablesorter.min.js";>
 
-jQuery(document).ready( function() {
-   jQuery('#projects').tablesorter();
-} );
+   jQuery(document).ready( function() {
+  jQuery('#projects').tablesorter();
+   } );
 
 https://tools-static.wmflabs.org/static/jquery-tablesorter/2.0.5/jquery.tablesorter.min.js;>
 
 $(document).ready(function()
-{
-$("#projects").tablesorter();
-}
+   {
+   $("#projects").tablesorter();
+   }
 );
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401069
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e3d80625b903e6fbce5a1e15888b90d925b7f07
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/stewardbots
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] testing-access-wrapper[master]: Use @composer for calling composer commands in scripts

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401077 )

Change subject: Use @composer for calling composer commands in scripts
..

Use @composer for calling composer commands in scripts

https://getcomposer.org/doc/articles/scripts.md#calling-composer-commands

This ensures that the same composer instance is used to execute the command
that was used for calling "composer test".

Change-Id: Ic6d8b3ec7bb19731efe35ee8cae368cb412022b2
---
M composer.json
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/testing-access-wrapper 
refs/changes/77/401077/1

diff --git a/composer.json b/composer.json
index c6cb50d..e5de787 100644
--- a/composer.json
+++ b/composer.json
@@ -44,9 +44,9 @@
"phpunit": "phpunit $PHPUNIT_ARGS",
"coverage": "phpunit --coverage-html coverage $PHPUNIT_ARGS",
"test": [
-   "composer lint",
-   "composer phpcs",
-   "composer phpunit"
+   "@composer lint",
+   "@composer phpcs",
+   "@composer phpunit"
]
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6d8b3ec7bb19731efe35ee8cae368cb412022b2
Gerrit-PatchSet: 1
Gerrit-Project: testing-access-wrapper
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs/libraryupgrader[master]: Fix duplicate phpcbf issue

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401076 )

Change subject: Fix duplicate phpcbf issue
..


Fix duplicate phpcbf issue

If "fix" is a string set to "phpcbf" it still wanted to turn it into a list
and add it again. Whoops.

Change-Id: I82e6eb799bdb41b3380d350de0a3f343bf42bd1b
---
M container/thing.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/container/thing.py b/container/thing.py
index 4b8703c..9c3ceb9 100755
--- a/container/thing.py
+++ b/container/thing.py
@@ -156,7 +156,7 @@
 added_fix = True
 else:
 pass
-else:
+elif j['scripts']['fix'] != 'phpcbf':
 j['scripts']['fix'] = [
 j['scripts']['fix'],
 'phpcbf'

-- 
To view, visit https://gerrit.wikimedia.org/r/401076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I82e6eb799bdb41b3380d350de0a3f343bf42bd1b
Gerrit-PatchSet: 1
Gerrit-Project: labs/libraryupgrader
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] WrappedString[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401065 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: Ibedc7d154608ba6cfa29ca3f90cfe056f46a0947
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index cd822cf..e94eb50 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9.0.0",
"phpunit/phpunit": "^4.8",
-   "mediawiki/mediawiki-codesniffer": "14.1.0"
+   "mediawiki/mediawiki-codesniffer": "15.0.0"
},
"scripts": {
"test": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibedc7d154608ba6cfa29ca3f90cfe056f46a0947
Gerrit-PatchSet: 1
Gerrit-Project: WrappedString
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] base-convert[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401067 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: Ieea3c381403fc94a73894ede65e1a7a0a5ac6ad8
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 12076ea..34e3b0e 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.0",
"phpunit/phpunit": "4.6.*",
-   "mediawiki/mediawiki-codesniffer": "14.1.0"
+   "mediawiki/mediawiki-codesniffer": "15.0.0"
},
"scripts": {
"test": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieea3c381403fc94a73894ede65e1a7a0a5ac6ad8
Gerrit-PatchSet: 1
Gerrit-Project: base-convert
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs/libraryupgrader[master]: Fix duplicate phpcbf issue

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401076 )

Change subject: Fix duplicate phpcbf issue
..

Fix duplicate phpcbf issue

If "fix" is a string set to "phpcbf" it still wanted to turn it into a list
and add it again. Whoops.

Change-Id: I82e6eb799bdb41b3380d350de0a3f343bf42bd1b
---
M container/thing.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/libraryupgrader 
refs/changes/76/401076/1

diff --git a/container/thing.py b/container/thing.py
index 4b8703c..9c3ceb9 100755
--- a/container/thing.py
+++ b/container/thing.py
@@ -156,7 +156,7 @@
 added_fix = True
 else:
 pass
-else:
+elif j['scripts']['fix'] != 'phpcbf':
 j['scripts']['fix'] = [
 j['scripts']['fix'],
 'phpcbf'

-- 
To view, visit https://gerrit.wikimedia.org/r/401076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82e6eb799bdb41b3380d350de0a3f343bf42bd1b
Gerrit-PatchSet: 1
Gerrit-Project: labs/libraryupgrader
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] css-sanitizer[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401071 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Also added phpcbf to "composer fix" command.

Change-Id: I359cbf766d529f4e7a6cbf69c3999d48df85ee4e
---
M composer.json
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 45a716a..c57eb94 100644
--- a/composer.json
+++ b/composer.json
@@ -28,14 +28,16 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"phpunit/phpunit": "4.8.31",
"wikimedia/testing-access-wrapper": "1.0.0"
},
"scripts": {
"lint": "parallel-lint . --exclude vendor",
"phpcs": "phpcs -p -s",
-   "fix": "phpcbf",
+   "fix": [
+   "phpcbf"
+   ],
"phpunit": "phpunit $PHPUNIT_ARGS",
"coverage": "phpunit --coverage-html coverage $PHPUNIT_ARGS",
"test": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I359cbf766d529f4e7a6cbf69c3999d48df85ee4e
Gerrit-PatchSet: 2
Gerrit-Project: css-sanitizer
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] testing-access-wrapper[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401073 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs are failing and were disabled:
* Squiz.Scope.MethodScope.Missing

Also added phpcbf to "composer fix" command.

Change-Id: I2eca550fda751f36cd7c1976131851cdcd0c5066
---
M .phpcs.xml
M composer.json
2 files changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index 4c3c745..eebd61e 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -4,6 +4,7 @@



+   

.

diff --git a/composer.json b/composer.json
index 1b1dfc0..c6cb50d 100644
--- a/composer.json
+++ b/composer.json
@@ -32,13 +32,15 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"phpunit/phpunit": "4.8.31"
},
"scripts": {
"lint": "parallel-lint . --exclude vendor",
"phpcs": "phpcs -p -s",
-   "fix": "phpcbf",
+   "fix": [
+   "phpcbf"
+   ],
"phpunit": "phpunit $PHPUNIT_ARGS",
"coverage": "phpunit --coverage-html coverage $PHPUNIT_ARGS",
"test": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2eca550fda751f36cd7c1976131851cdcd0c5066
Gerrit-PatchSet: 2
Gerrit-Project: testing-access-wrapper
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] php-session-serializer[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401072 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: Ie2b9e868bdf817891cf751960f909f389056d252
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 5afeb1f..97085e4 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9.0.0",
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"phpunit/phpunit": "^4.8"
},
"scripts": {

-- 
To view, visit https://gerrit.wikimedia.org/r/401072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2b9e868bdf817891cf751960f909f389056d252
Gerrit-PatchSet: 1
Gerrit-Project: php-session-serializer
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] utfnormal[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401075 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs are failing and were disabled:
* Squiz.Scope.MethodScope.Missing

Also added phpcbf to "composer fix" command.

Change-Id: Ibb0d86505488338b748edb54f033af030c91336e
---
M .phpcs.xml
M composer.json
2 files changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index a68d22b..e93e28d 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -7,7 +7,8 @@



-   
+   
+   

.
coverage
diff --git a/composer.json b/composer.json
index 2144813..a80214a 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9.2",
"phpunit/phpunit": "^4.8",
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"ext-mbstring": "*"
},
"scripts": {
@@ -31,7 +31,9 @@
"phpunit",
"php scripts/benchmark.php"
],
-   "fix": "phpcbf"
+   "fix": [
+   "phpcbf"
+   ]
},
"config": {
"optimize-autoloader": true

-- 
To view, visit https://gerrit.wikimedia.org/r/401075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb0d86505488338b748edb54f033af030c91336e
Gerrit-PatchSet: 2
Gerrit-Project: utfnormal
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] at-ease[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401066 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

And moved phpcs.xml to .phpcs.xml (T177256).

Change-Id: I7aa8333235c800b957ccf03f524081f4e6f19a24
---
R .phpcs.xml
M composer.json
2 files changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/phpcs.xml b/.phpcs.xml
similarity index 100%
rename from phpcs.xml
rename to .phpcs.xml
diff --git a/composer.json b/composer.json
index 1dbffc7..8397ae2 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
-   "mediawiki/mediawiki-codesniffer": "0.12.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"phpunit/phpunit": "~4.5"
},
"scripts": {

-- 
To view, visit https://gerrit.wikimedia.org/r/401066
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7aa8333235c800b957ccf03f524081f4e6f19a24
Gerrit-PatchSet: 1
Gerrit-Project: at-ease
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] purtle[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401074 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs are failing and were disabled:
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment

The following sniffs now pass and were enabled:
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment

Change-Id: If6879bef7d8ff74c37d046db0cd6c2e6e718b629
---
M .phpcs.xml
M composer.json
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index 0fa259d..690e05f 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -5,7 +5,7 @@



-   
+   

 

diff --git a/composer.json b/composer.json
index d5913bc..fcba661 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
"php": ">=5.5.9"
},
"require-dev": {
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"ockcyp/covers-validator": "~0.4.0",
"phpunit/phpunit": "4.8.24",
"phpmd/phpmd": "~2.3"

-- 
To view, visit https://gerrit.wikimedia.org/r/401074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If6879bef7d8ff74c37d046db0cd6c2e6e718b629
Gerrit-PatchSet: 1
Gerrit-Project: purtle
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] cdb[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401068 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs now pass and were enabled:
* MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName

Change-Id: I2c55f1ec7ef3135175cc56e9b3a03a2106b70039
---
M .phpcs.xml
M composer.json
2 files changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index 01c8457..d5b30ac 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -4,7 +4,6 @@



-   


.
diff --git a/composer.json b/composer.json
index 8015d4c..2bfd3ed 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
"phpunit/phpunit": "^4.8",
-   "mediawiki/mediawiki-codesniffer": "14.1.0"
+   "mediawiki/mediawiki-codesniffer": "15.0.0"
},
"scripts": {
"test": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c55f1ec7ef3135175cc56e9b3a03a2106b70039
Gerrit-PatchSet: 1
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] AhoCorasick[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401059 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: Iedf62cf4161ce90e0a1de50a683e0976810c9de3
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index ee5b1cf..f3eb62e 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
"phpunit/phpunit": "^4.8",
-   "mediawiki/mediawiki-codesniffer": "14.1.0"
+   "mediawiki/mediawiki-codesniffer": "15.0.0"
},
"scripts": {
"test": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iedf62cf4161ce90e0a1de50a683e0976810c9de3
Gerrit-PatchSet: 1
Gerrit-Project: AhoCorasick
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/docroot[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401070 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected
* MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic
* MediaWiki.Commenting.FunctionComment.MissingParamComment
* MediaWiki.Commenting.FunctionComment.MissingParamName
* MediaWiki.Commenting.FunctionComment.MissingParamTag
* MediaWiki.Commenting.FunctionComment.MissingReturn
* MediaWiki.Files.ClassMatchesFilename.NotMatch

And moved phpcs.xml to .phpcs.xml (T177256).

Also added phpcbf to "composer fix" command.

Change-Id: I713be5442edc42b2f509434116570fa6951c4c97
---
A .phpcs.xml
M composer.json
D phpcs.xml
M shared/Page.php
4 files changed, 49 insertions(+), 39 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
new file mode 100644
index 000..c2ab9d5
--- /dev/null
+++ b/.phpcs.xml
@@ -0,0 +1,28 @@
+
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   .
+   
+   
+   
+   0
+   
+   
+   0
+   
+   
+   0
+   
+   
+   0
+   
+   vendor
+
diff --git a/composer.json b/composer.json
index 672564a..ff9c61a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,17 +1,20 @@
 {
-"require": {
-"php": ">= 5.5.9"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9",
-"mediawiki/mediawiki-codesniffer": "0.7.2",
-"phpunit/phpunit": "4.8.*"
-},
-"scripts": {
-"test": [
-"parallel-lint . --exclude vendor",
-"phpunit",
-"phpcs -p -s"
-]
-}
+   "require": {
+   "php": ">= 5.5.9"
+   },
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
+   "phpunit/phpunit": "4.8.*"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor",
+   "phpunit",
+   "phpcs -p -s"
+   ],
+   "fix": [
+   "phpcbf"
+   ]
+   }
 }
diff --git a/phpcs.xml b/phpcs.xml
deleted file mode 100644
index 76e2f1b..000
--- a/phpcs.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-   
-   .
-   
-   
-   
-   0
-   
-   
-   0
-   
-   
-   0
-   
-   
-   0
-   
-   vendor
-
diff --git a/shared/Page.php b/shared/Page.php
index 96aed10..801aa40 100644
--- a/shared/Page.php
+++ b/shared/Page.php
@@ -121,14 +121,14 @@
$path = dirname( $_SERVER['SCRIPT_NAME'] ) . '/';
}
if ( !$path || !isset( $_SERVER['DOCUMENT_ROOT'] ) ) {
-   Page::error( 'Invalid context.' );
+   self::error( 'Invalid context.' );
}
// Use realpath() to prevent escalation through e.g. "../"
// Note: realpath() also normalises paths to have no trailing 
slash
$realPath = realpath( $_SERVER['DOCUMENT_ROOT'] . $path );
if ( !$realPath || strpos( $realPath, $_SERVER['DOCUMENT_ROOT'] 
) !== 0 ) {
// Path escalation. Should be impossible as Apache 
normalises this.
-   Page::error( 'Invalid context.' );
+   self::error( 'Invalid context.' );
}
if ( substr( $path, -1 ) === '/' ) {
$realPath .= '/';
@@ -164,7 +164,7 @@
}
 
/**
-* @return string: URL path to shared/lib (without trailing slash).
+* @return string URL path to shared/lib (without trailing slash).
 */
public function getLibPath() {
if ( $this->libPath ) {
@@ -216,7 +216,6 @@
 * @param string $file
 */
public function addHtmlFile( $file ) {
-
$isRelativePath = ( substr( $file, 0 ) !== '/' );
 
if ( $isRelativePath && $this->dir ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/401070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I713be5442edc42b2f509434116570fa6951c4c97
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 

[MediaWiki-commits] [Gerrit] CLDRPluralRuleParser[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401060 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs are failing and were disabled:
* Squiz.Scope.MethodScope.Missing

Change-Id: I24557e1b71a567f31645bd2f58eba9745cea71f3
---
M .phpcs.xml
M composer.json
2 files changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index 37c6130..80f09e0 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -4,6 +4,7 @@



+   

 
.
diff --git a/composer.json b/composer.json
index fc7345d..f71a4b0 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9.0.0",
"phpunit/phpunit": "^4.7.7.0",
-   "mediawiki/mediawiki-codesniffer": "14.1.0"
+   "mediawiki/mediawiki-codesniffer": "15.0.0"
},
"scripts": {
"test": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I24557e1b71a567f31645bd2f58eba9745cea71f3
Gerrit-PatchSet: 1
Gerrit-Project: CLDRPluralRuleParser
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] HtmlFormatter[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401061 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Also added phpcbf to "composer fix" command.

Change-Id: Ia217ae90f3ac72e062bdf84eb0cca32d03fc1a70
---
M composer.json
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 690ee9a..1a8710c 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"phpunit/phpunit": "4.7.2",
-   "mediawiki/mediawiki-codesniffer": "14.1.0"
+   "mediawiki/mediawiki-codesniffer": "15.0.0"
},
"scripts": {
"test": [
@@ -33,6 +33,8 @@
"phpunit",
"phpcs -sp"
],
-   "fix": "phpcbf"
+   "fix": [
+   "phpcbf"
+   ]
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia217ae90f3ac72e062bdf84eb0cca32d03fc1a70
Gerrit-PatchSet: 2
Gerrit-Project: HtmlFormatter
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] IPSet[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401063 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: Ieb27abef2ed9ba8f24d57f036a680d960d287f1c
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 9e8048a..6744f4c 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"phpunit/phpunit": "^4.8",
-   "mediawiki/mediawiki-codesniffer": "14.1.0"
+   "mediawiki/mediawiki-codesniffer": "15.0.0"
},
"scripts": {
"test": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb27abef2ed9ba8f24d57f036a680d960d287f1c
Gerrit-PatchSet: 1
Gerrit-Project: IPSet
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] RelPath[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401062 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: Ic46273ffbc5136ce66e16f715c027d7129075879
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index dac3a4a..041a8c0 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9.0.0",
"phpunit/phpunit": "^4.8.9.0",
-   "mediawiki/mediawiki-codesniffer": "14.1.0"
+   "mediawiki/mediawiki-codesniffer": "15.0.0"
},
"scripts": {
"test": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic46273ffbc5136ce66e16f715c027d7129075879
Gerrit-PatchSet: 1
Gerrit-Project: RelPath
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] RunningStat[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401064 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

Change-Id: Idb918c1ce37201c886c357ea6ef42b227c6e97ee
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index c984b39..7d261bb 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9.0.0",
"phpunit/phpunit": "4.8.*",
-   "mediawiki/mediawiki-codesniffer": "14.1.0"
+   "mediawiki/mediawiki-codesniffer": "15.0.0"
},
"scripts": {
"test": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb918c1ce37201c886c357ea6ef42b227c6e97ee
Gerrit-PatchSet: 1
Gerrit-Project: RunningStat
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] utfnormal[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[Libraryupgrader (Code Review)]

Libraryupgrader has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401075 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..

build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs are failing and were disabled:
* Squiz.Scope.MethodScope.Missing

Also added phpcbf to "composer fix" command.

Change-Id: Ibb0d86505488338b748edb54f033af030c91336e
---
M .phpcs.xml
M composer.json
2 files changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/utfnormal refs/changes/75/401075/1

diff --git a/.phpcs.xml b/.phpcs.xml
index a68d22b..e93e28d 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -7,7 +7,8 @@



-   
+   
+   

.
coverage
diff --git a/composer.json b/composer.json
index 2144813..1bdca55 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9.2",
"phpunit/phpunit": "^4.8",
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"ext-mbstring": "*"
},
"scripts": {
@@ -31,7 +31,10 @@
"phpunit",
"php scripts/benchmark.php"
],
-   "fix": "phpcbf"
+   "fix": [
+   "phpcbf",
+   "phpcbf"
+   ]
},
"config": {
"optimize-autoloader": true

-- 
To view, visit https://gerrit.wikimedia.org/r/401075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb0d86505488338b748edb54f033af030c91336e
Gerrit-PatchSet: 1
Gerrit-Project: utfnormal
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits