date:20180106

[MediaWiki-commits] [Gerrit] mediawiki...DebugMode[master]: Convert DebugMode to use extension registration

2018-01-06 Thread Gabrielchihonglee (Code Review)

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

Change subject: Convert DebugMode to use extension registration
..

Convert DebugMode to use extension registration

Bug: T184363
Change-Id: If5fcc897ca0bd7546c85424973121aa3201ca075
---
M DebugMode.php
A extension.json
2 files changed, 47 insertions(+), 64 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DebugMode 
refs/changes/27/402627/1

diff --git a/DebugMode.php b/DebugMode.php
index 7d790e7..1e0d045 100644
--- a/DebugMode.php
+++ b/DebugMode.php
@@ -1,66 +1,14 @@
 https://www.mediawiki.org/wiki/Extension_registration for more details.'
+   ); */
+   return true;
+} else {
+   die( 'This version of the DebugMode extension requires MediaWiki 1.29+' 
);
+}
 
-/**
- * DebugMode extension - Puts wiki into debug mode
- *
- * For more info see http://mediawiki.org/wiki/Extension:DebugMode
- *
- * @file
- * @ingroup Extensions
- * @author Ike Hecht
- * @license GNU General Public License 2.0 or later
- */
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'DebugMode',
-   'author' => 'Ike Hecht',
-   'version' => '0.1.0 beta',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:DebugMode',
-   'descriptionmsg' => 'debugmode-desc',
-   'license-name' => 'GPL-2.0-or-later'
-);
-
-$wgMessagesDirs['DebugMode'] = __DIR__ . '/i18n';
-$wgAutoloadClasses['DebugMode'] = __DIR__ . '/DebugMode.class.php';
-$wgAutoloadClasses['DebugModeUtils'] = __DIR__ . '/DebugMode.utils.php';
-
-$wgAutoloadClasses['VarSetter'] = __DIR__ . '/VarSetters/VarSetter.php';
-$wgAutoloadClasses['GlobalVarSetter'] = __DIR__ . 
'/VarSetters/GlobalVarSetter.php';
-$wgAutoloadClasses['PhpFunctionVarSetter'] = __DIR__ . 
'/VarSetters/PhpFunctionVarSetter.php';
-$wgAutoloadClasses['PhpIniVarSetter'] = __DIR__ . 
'/VarSetters/PhpIniVarSetter.php';
-
-$wgExtensionFunctions[] = 'DebugModeUtils::setup';
-
-/* Configuration */
-
-/**
- * Should be set using named constants in the DebugMode class using bitwise 
operators.
- * Can be set to true to enable all debugging or false to do nothing.
- * Note: Setting to false does not turn debugging off! It just leaves the 
existing settings alone.
- */
-$wgDebugMode = DebugModeUtils::getDefault();
-
-/**
- * An array of variables that should be ignored by the extension. Can be used 
for more fine-tuning
- * of variables than allowed by $wgDebugMode.
- * These vars can be any named variables known to the extension, including 
MediaWiki globals and
- * php settings.
- */
-$wgDebugModeIgnoreVars = array();
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..0971926
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,35 @@
+{
+"name": "DebugMode",
+"version": "0.1.0 beta",
+"author": "Ike Hecht",
+"url": "https://www.mediawiki.org/wiki/Extension:DebugMode;,
+"descriptionmsg": "debugmode-desc",
+"license-name": "GPL-2.0-or-above",
+"type": "other",
+"ExtensionFunctions": [
+   "DebugModeUtils::setup"
+   ],
+"MessagesDirs": {
+"DebugMode": [
+   "i18n"
+   ]
+},
+"AutoloadClasses": {
+"DebugMode": "DebugMode.class.php",
+"DebugModeUtils": "DebugMode.utils.php",
+"VarSetter": "VarSetters/VarSetter.php",
+"GlobalVarSetter": "VarSetters/GlobalVarSetter.php",
+"PhpFunctionVarSetter": "VarSetters/PhpFunctionVarSetter.php",
+"PhpIniVarSetter": "VarSetters/PhpIniVarSetter.php"
+},
+"config": {
+"DebugMode": {
+"value": 59
+},
+"DebugModeIgnoreVars": {
+"value": []
+}
+},
+"manifest_version": 2
+}
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5fcc897ca0bd7546c85424973121aa3201ca075
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DebugMode
Gerrit-Branch: master
Gerrit-Owner: Gabrielchihonglee 

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add lazy image loading and display images in rows

2018-01-06 Thread StudentSydney (Code Review)

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

Change subject: Add lazy image loading and display images in rows
..

Add lazy image loading and display images in rows

Images were displayed out-of-order and tried to load all at once, which
was bad for users with large query results. Now images load lazily but
preload well beyond the window. Images load in parallel and are all of
uniform height within each row so the bottom isn't staggard. I had
created a version where images remained queued to be loaded even after a
new query was begun; that is now fixed.

Bug: T166216
Change-Id: I50d883f622fcbecaf930b019c3038cbb80d408e4
---
M style.less
M wikibase/queryService/ui/resultBrowser/ImageResultBrowser.js
A wikibase/tests/queryService/ui/resultBrowser/ImageResultBrowser.test.js
3 files changed, 122 insertions(+), 67 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/26/402626/1

diff --git a/style.less b/style.less
index 0cbf66e..063a75a 100644
--- a/style.less
+++ b/style.less
@@ -442,6 +442,9 @@
box-shadow: 2px 2px 4px 0 #ccc;
display: inline-block;
 }
+.hidden-row>.item{
+   display: none;
+}
 .item-img {
width: 100%;
 }
diff --git a/wikibase/queryService/ui/resultBrowser/ImageResultBrowser.js 
b/wikibase/queryService/ui/resultBrowser/ImageResultBrowser.js
index 20a5edc..b7b4bd9 100644
--- a/wikibase/queryService/ui/resultBrowser/ImageResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/ImageResultBrowser.js
@@ -60,27 +60,38 @@
SELF.prototype._fixedItemWidth = 0;

/**
+* the total width of the grid
+* @private
+*/
+   SELF.prototype._totalWidth = 0;
+   
+   /**
+* the height of each line of summary on an item
+* @private
+*/
+   SELF.prototype._lineHeight = 0;
+   
+   /**
 * Draw browser to the given element
 *
 * @param {jQuery} $element to draw at
 */
SELF.prototype.draw = function( $element ) {
var self = this;
+   //Sometimes, the instance of SELF already has a queue which 
must be cleared
+   this._queue.splice(0,this._queue.length);
+   this._grid = ( $( '' ).html( 
'' ) );

-   this._grid = $( '' ).append( $( '' ) );
$element.html( this._grid );
+   this._lineHeight = 1.5 * parseFloat( this._grid.css( 
'font-size' ) );
this._iterateResult( function( field, key, row ) {
if ( field && self._isCommonsResource( field.value ) ) {
-   var url = field.value,
-   fileName = 
self._getFormatter().getCommonsResourceFileName( url ),
-   item = self._getItem( 
self._getThumbnail( url ), self._getThumbnail(
-   url, 1000 ), fileName, row ),
-   queueItem = { item: item, url: url };
-   
-   self._queue.push( queueItem );
+   row.url = field.value;
+   self._queue.push( row );
}
} );
this._fixedItemWidth = this._calculateBaseWidth();
+   this._gridWidth = this._grid.width();
this._lazyLoad();
};

@@ -129,25 +140,17 @@
/**
 * show the last row even if it's not full
 */
-   SELF.prototype._showFinalRow = function() {
+   SELF.prototype._showFinalRow = function( hidden ) {
var $row = $('.item-row').last(),
-   imgs,
-   summaries,
-   lineHeight,
-   aspectRatios,
-   fixedHeights,
+   $items = $row.find( '.item' ),
calculatedDimensions = { height: 0, widths: [] };
-   
-   if ( $row.children().length ) {
-   imgs = $row.find('.item-img').toArray();
-   summaries = $row.find('.summary').toArray();
-   lineHeight = 1.5 * parseFloat( this._grid.css( 
'font-size' ) );
-   aspectRatios = imgs.map( img => img.naturalWidth / 
img.naturalHeight );
-   fixedHeights = summaries.map( ( summary ) => 
summary.childElementCount * lineHeight );
-   calculatedDimensions.height = this._heightThreshold;
-   calculatedDimensions.widths = aspectRatios.map( ( 
ratio, index ) => ratio * ( calculatedDimensions.height - fixedHeights[ index ] 
) );
 
-   this._setDimensions( $row, calculatedDimensions );
+

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Mobile/responsive menus

2018-01-06 Thread Eflyjason (Code Review)

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

Change subject: Mobile/responsive menus
..

Mobile/responsive menus

Bug: T154890
Change-Id: I9b421d3a2cfba98bba954154fac62a73e3a7f8dc
---
M index.html
M style.less
M wikibase/queryService/ui/App.js
3 files changed, 87 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/25/402625/1

diff --git a/index.html b/index.html
index 1684e15..662757c 100644
--- a/index.html
+++ b/index.html
@@ -50,24 +50,21 @@



-   
-   Toggle 
navigation   

-   





-   
+   


-
+




https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Wikidata_Query_Help;
 target="_blank" class="btn btn-default">
-
+



@@ -88,7 +85,7 @@



-   
+   

https://tools.wmflabs.org/hay/propbrowse/;> Hay's Properties 
Browser
https://tools.wmflabs.org/sqid/#/browse?type=properties;> SQID 
Properties Browser
@@ -100,7 +97,7 @@



-   
+   



diff --git a/style.less b/style.less
index 9c1bb04..d2a38b5 100644
--- a/style.less
+++ b/style.less
@@ -266,39 +266,31 @@
float: left;
 }
 
-/* change navbar breakpoint */
-@media ( max-width: 900px ) {
-   .navbar-header {
-   float: none;
-   }
-   .navbar-toggle {
-   display: block;
-   }
-   .navbar-collapse {
-   border-top: 1px solid transparent;
-   box-shadow: inset 0 1px 0 rgba( 255, 255, 255, 0.1 );
-   }
+/**
+   To disable Bootstrap's default collpase behavior and
+   also allow dropdown to function normally in small screens
+**/
+@media (max-width: 768px) {
.navbar-collapse.collapse {
-   display: none !important;
+   display: block !important;
+   height: auto !important;
+   padding-bottom: 0;
+   overflow: visible !important;
}
-   .navbar-nav,
-   .navbar-form {
-   float: none !important;
+   .navbar-left {
+   float: left !important;
margin: 0;
}
-   .navbar-nav > li > a {
-   padding-top: 10px;
-   padding-bottom: 10px;
+   .navbar-right {
+   float: right !important;
}
-   .navbar-text {
-   float: left;
-   margin: 15px 0;
-   }
-   .navbar-collapse.collapse.in {
-   display: block !important;
-   }
-   .collapsing {
-   overflow: hidden !important;
+   .navbar-nav .open .dropdown-menu {
+   position: absolute;
+   -webkit-box-shadow: black;
+   box-shadow: aliceblue;
+   border: 1px solid rgba(0, 0, 0, 0.15);
+   background-color: #FFF;
+   width: auto;
}
 }
 
diff --git

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Install firejail

2018-01-06 Thread Code Review

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402624 )

Change subject: Install firejail
..

Install firejail

Change-Id: I488d420d094ff2885b1f6547152f9a311d4cda81
---
M puppet/modules/mediawiki/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/24/402624/1

diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index 2dea2a3..11c2043 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -81,7 +81,7 @@
 include ::mediawiki::ready_service
 include ::mediawiki::psysh
 
-require_package('parallel')
+require_package('parallel', 'firejail')
 
 $managed_settings_dir = "${settings_dir}/puppet-managed"
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I488d420d094ff2885b1f6547152f9a311d4cda81
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki...Sentry[master]: Be compatible with PHP 7's Throwable interface

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Be compatible with PHP 7's Throwable interface
..


Be compatible with PHP 7's Throwable interface

Instead of just Exceptions, in PHP 7 we can now get Throwables too, but we
can't type hint against them to stay compatible with PHP 5 still.

Bug: T184359
Change-Id: I7f2d9d7e4cea7bb99c28d60dcba01990a35c5b5d
---
M SentryHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/SentryHooks.php b/SentryHooks.php
index 4dfc95d..9daa500 100644
--- a/SentryHooks.php
+++ b/SentryHooks.php
@@ -62,11 +62,11 @@
}
 
/**
-* @param Exception $e
+* @param Exception|Throwable $e
 * @param bool $suppressed True if the error is below the level set in 
error_reporting().
 * @return bool
 */
-   public static function onLogException( Exception $e, $suppressed ) {
+   public static function onLogException( $e, $suppressed ) {
global $wgSentryDsn, $wgSentryLogPhpErrors, $wgVersion;
 
if ( !$wgSentryLogPhpErrors || $suppressed ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f2d9d7e4cea7bb99c28d60dcba01990a35c5b5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Sentry
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Gergő Tisza 
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...Sentry[master]: Be compatible with PHP 7's Throwable interface

2018-01-06 Thread Legoktm (Code Review)

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

Change subject: Be compatible with PHP 7's Throwable interface
..

Be compatible with PHP 7's Throwable interface

Instead of just Exceptions, in PHP 7 we can now get Throwables too, but we
can't type hint against them to stay compatible with PHP 5 still.

Bug: T184359
Change-Id: I7f2d9d7e4cea7bb99c28d60dcba01990a35c5b5d
---
M SentryHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Sentry 
refs/changes/23/402623/1

diff --git a/SentryHooks.php b/SentryHooks.php
index 4dfc95d..9daa500 100644
--- a/SentryHooks.php
+++ b/SentryHooks.php
@@ -62,11 +62,11 @@
}
 
/**
-* @param Exception $e
+* @param Exception|Throwable $e
 * @param bool $suppressed True if the error is below the level set in 
error_reporting().
 * @return bool
 */
-   public static function onLogException( Exception $e, $suppressed ) {
+   public static function onLogException( $e, $suppressed ) {
global $wgSentryDsn, $wgSentryLogPhpErrors, $wgVersion;
 
if ( !$wgSentryLogPhpErrors || $suppressed ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f2d9d7e4cea7bb99c28d60dcba01990a35c5b5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Sentry
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] mediawiki...Video[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..


Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I742162e6d747e4da2def9046b4e9b905173f287c
---
M includes/parser/VideoGalleryPopulate.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/parser/VideoGalleryPopulate.hooks.php 
b/includes/parser/VideoGalleryPopulate.hooks.php
index eb9c702..5c8c3a9 100644
--- a/includes/parser/VideoGalleryPopulate.hooks.php
+++ b/includes/parser/VideoGalleryPopulate.hooks.php
@@ -15,7 +15,7 @@
}
 
public static function renderVideoGalleryPopulate( $input, $args, 
$parser ) {
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$category = ( isset( $args['category'] ) ) ? $args['category'] 
: '';
$limit = ( isset( $args['limit'] ) ) ? intval( $args['limit'] ) 
: 10;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I742162e6d747e4da2def9046b4e9b905173f287c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Video
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
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...VoteNY[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..


Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I3f5faa40d8edbb0a4bffd74530ff9aaf010f821f
---
M includes/VoteNY.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/VoteNY.hooks.php b/includes/VoteNY.hooks.php
index aae5c21..c6e3193 100644
--- a/includes/VoteNY.hooks.php
+++ b/includes/VoteNY.hooks.php
@@ -32,7 +32,7 @@
// Disable parser cache (sadly we have to do this, because the 
caching is
// messing stuff up; we want to show an up-to-date rating 
instead of old
// or totally wrong rating, i.e. another page's rating...)
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
// Add CSS & JS
// In order for us to do this *here* instead of having to do 
this in

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f5faa40d8edbb0a4bffd74530ff9aaf010f821f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VoteNY
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
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...PollNY[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..


Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I3f6912f9767f5f3c5ccebfaaeeb905042376f9b3
---
M includes/PollNY.hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/PollNY.hooks.php b/includes/PollNY.hooks.php
index bb7e5b7..9b81f63 100644
--- a/includes/PollNY.hooks.php
+++ b/includes/PollNY.hooks.php
@@ -143,7 +143,7 @@
 * @return bool true
 */
public static function onParserLimitReportPrepare( $parser, $output ) {
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
return true;
}
 
@@ -188,7 +188,7 @@
// Disable caching; this is important so that we don't 
cause subtle
// bugs that are a bitch to fix.
$wgOut->enableClientCache( false );
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$poll_title = Title::newFromText( $poll_name, NS_POLL );
$poll_title = PollNYHooks::followPollID( $poll_title );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f6912f9767f5f3c5ccebfaaeeb905042376f9b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
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...SocialProfile[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..


Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: Ib40b4007b7c31f53fcae783f174bb67836819606
---
M UserActivity/SiteActivityHook.php
M UserProfile/UserProfileHooks.php
M UserWelcome/UserWelcomeClass.php
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/UserActivity/SiteActivityHook.php 
b/UserActivity/SiteActivityHook.php
index 3813154..049e6f2 100644
--- a/UserActivity/SiteActivityHook.php
+++ b/UserActivity/SiteActivityHook.php
@@ -16,7 +16,7 @@
public static function getSiteActivity( $input, $args, $parser ) {
global $wgMemc, $wgExtensionAssetsPath;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$limit = ( isset( $args['limit'] ) && is_numeric( 
$args['limit'] ) ) ? $args['limit'] : 10;
 
diff --git a/UserProfile/UserProfileHooks.php b/UserProfile/UserProfileHooks.php
index 702dcd1..5c2d458 100644
--- a/UserProfile/UserProfileHooks.php
+++ b/UserProfile/UserProfileHooks.php
@@ -90,7 +90,7 @@
 * @return bool true
 */
public static function onParserLimitReportPrepare( $parser, $output ) {
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
return true;
}
 
diff --git a/UserWelcome/UserWelcomeClass.php b/UserWelcome/UserWelcomeClass.php
index 1d0c3a4..e8d7fc4 100644
--- a/UserWelcome/UserWelcomeClass.php
+++ b/UserWelcome/UserWelcomeClass.php
@@ -24,7 +24,7 @@
}
 
public static function getWelcomeUser( $input, $args, $parser ) {
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
$parser->getOutput()->addModuleStyles( 
'ext.socialprofile.userwelcome.css' );
// This is so stupid. The callback to onParserFirstCallInit() is
// *always* (assumed to be) static even if you don't declare it 
as such.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib40b4007b7c31f53fcae783f174bb67836819606
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
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...RandomImageByCategory[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..


Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I482e3e553ade06443773f3a75a899ca981b60d6e
---
M RandomImageByCategory.class.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/RandomImageByCategory.class.php b/RandomImageByCategory.class.php
index bd0f352..fa25068 100644
--- a/RandomImageByCategory.class.php
+++ b/RandomImageByCategory.class.php
@@ -23,7 +23,7 @@
public static function getRandomImage( $input, $args, $parser ) {
global $wgMemc;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$categories = ( isset( $args['categories'] ) ) ? trim( 
$args['categories'] ) : '';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I482e3e553ade06443773f3a75a899ca981b60d6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomImageByCategory
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
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...RandomSelection[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..


Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: Ib5d50d1d454aca0a9fb75a135e8ec2a894ab6f48
---
M RandomSelection.class.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/RandomSelection.class.php b/RandomSelection.class.php
index 7c92a2f..70ca809 100644
--- a/RandomSelection.class.php
+++ b/RandomSelection.class.php
@@ -46,7 +46,7 @@
public static function render( $input, $argv, $parser ) {
# Prevent caching if specified so by the user
if ( isset( $argv['uncached'] ) ) {
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
}
 
# Parse the options and calculate total weight

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5d50d1d454aca0a9fb75a135e8ec2a894ab6f48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomSelection
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
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...RandomFeaturedUser[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..


Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: Ie34ddb081c37a3b918e592c7e986589eccbc2210
---
M includes/RandomFeaturedUser.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/RandomFeaturedUser.php b/includes/RandomFeaturedUser.php
index f8ee0bb..e47df95 100644
--- a/includes/RandomFeaturedUser.php
+++ b/includes/RandomFeaturedUser.php
@@ -42,7 +42,7 @@
public static function getRandomUser( $input, $args, Parser $parser ) {
global $wgMemc, $wgRandomFeaturedUser;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$period = ( isset( $args['period'] ) ) ? $args['period'] : '';
if ( $period != 'weekly' && $period != 'monthly' ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie34ddb081c37a3b918e592c7e986589eccbc2210
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomFeaturedUser
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
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...RandomUsersWithAvatars[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..


Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I8198438bde6e183bb0d77266ae0826d6b53ae3ca
---
M includes/RandomUsersWithAvatars.class.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/RandomUsersWithAvatars.class.php 
b/includes/RandomUsersWithAvatars.class.php
index 45c287b..ec1b7f3 100644
--- a/includes/RandomUsersWithAvatars.class.php
+++ b/includes/RandomUsersWithAvatars.class.php
@@ -23,7 +23,7 @@
global $wgUploadDirectory, $wgDBname, $wgMemc;
 
$parser->getOutput()->addModuleStyles( 
'ext.randomuserswithavatars' );
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$count = ( isset( $args['count'] ) && is_numeric( 
$args['count'] ) ) ? intval( $args['count'] ) : 10;
$per_row = ( isset( $args['row'] ) && is_numeric( $args['row'] 
) ) ? intval( $args['row'] ) : 4;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8198438bde6e183bb0d77266ae0826d6b53ae3ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomUsersWithAvatars
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
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...NewUsersList[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..


Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I99cf64b6e99dd5b7f61d15c770b6690d7b7ab5f8
---
M includes/NewUsersList.class.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/NewUsersList.class.php b/includes/NewUsersList.class.php
index 194afeb..b8af02a 100644
--- a/includes/NewUsersList.class.php
+++ b/includes/NewUsersList.class.php
@@ -39,7 +39,7 @@
public static function getNewUsers( $input, $args, $parser ) {
global $wgMemc;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$count = 10;
$per_row = 5;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I99cf64b6e99dd5b7f61d15c770b6690d7b7ab5f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NewUsersList
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
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...FanBoxes[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..


Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I3b9c4406be007b205e87d2ca101fb160ec499047
---
M includes/FanBox.hooks.php
M includes/UserBoxes.hooks.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/FanBox.hooks.php b/includes/FanBox.hooks.php
index 93ab625..2c3fb64 100644
--- a/includes/FanBox.hooks.php
+++ b/includes/FanBox.hooks.php
@@ -170,7 +170,7 @@
public static function embedFanBox( $input, $argv, $parser ) {
global $wgUser, $wgHooks;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$wgHooks['BeforePageDisplay'][] = 
'FanBoxHooks::addFanBoxScripts';
 
diff --git a/includes/UserBoxes.hooks.php b/includes/UserBoxes.hooks.php
index 3bd4b21..64fe958 100644
--- a/includes/UserBoxes.hooks.php
+++ b/includes/UserBoxes.hooks.php
@@ -30,7 +30,7 @@
public static function renderUserBoxesHook( $input, $args, $parser ) {
global $wgOut, $wgUser, $wgMemc;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
// Add CSS & JS
$wgOut->addModules( 'ext.fanBoxes' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b9c4406be007b205e87d2ca101fb160ec499047
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
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...LinkFilter[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..


Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I917b59e40d26ab08a51d277be8acfade831178ec
---
M includes/LinkFilter.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/LinkFilter.hooks.php b/includes/LinkFilter.hooks.php
index 5777a9b..196225a 100644
--- a/includes/LinkFilter.hooks.php
+++ b/includes/LinkFilter.hooks.php
@@ -110,7 +110,7 @@
public static function renderLinkFilterHook( $input, $args, $parser ) {
global $wgMemc, $wgOut;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
// Add CSS (ParserOutput class only has addModules(), not
// addModuleStyles() or addModuleScripts()...strange)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I917b59e40d26ab08a51d277be8acfade831178ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkFilter
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
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...Comments[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..


Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I957df9ccc48dc0da20c5657e52475b29f2b04335
---
M includes/parser/DisplayComments.class.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/parser/DisplayComments.class.php 
b/includes/parser/DisplayComments.class.php
index 110188f..3ae58e0 100644
--- a/includes/parser/DisplayComments.class.php
+++ b/includes/parser/DisplayComments.class.php
@@ -14,7 +14,7 @@
public static function getParserHandler( $input, $args, $parser ) {
global $wgOut, $wgCommentsSortDescending;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
// If an unclosed  tag is added to a page, the 
extension will
// go to an infinite loop...this protects against that 
condition.
$parser->setHook( 'comments', [ __CLASS__, 'nonDisplayComments' 
] );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I957df9ccc48dc0da20c5657e52475b29f2b04335
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Comments
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: UltrasonicNXT 
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...AJAXPoll[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..


Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: Iaffa63bb8e90e4d5853e47a59133d5b720ce89b1
---
M includes/AJAXPoll.class.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/AJAXPoll.class.php b/includes/AJAXPoll.class.php
index de2c3f2..cc22178 100644
--- a/includes/AJAXPoll.class.php
+++ b/includes/AJAXPoll.class.php
@@ -31,7 +31,7 @@
static function AJAXPollRender( $input, $args = [], Parser $parser, 
$frame ) {
global $wgUser, $wgRequest, $wgUseAjax;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
$parser->addTrackingCategory( 'ajaxpoll-tracking-category' );
$parser->getOutput()->addModules( 'ext.ajaxpoll' );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaffa63bb8e90e4d5853e47a59133d5b720ce89b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
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...Refreshed[master]: Fix WikiFont on IE/Edge

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Fix WikiFont on IE/Edge
..


Fix WikiFont on IE/Edge

Update the path to WikiFont in iefontfix.css. This fixes an issue
where WikiFont doesn't load in Edge.
Increment the version number.

Change-Id: I5b69be592f5267ff28b104881732804656ac2d29
---
M refreshed/styles/screen/iefontfix.css
M skin.json
2 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/refreshed/styles/screen/iefontfix.css 
b/refreshed/styles/screen/iefontfix.css
index 01a0298..43400ad 100644
--- a/refreshed/styles/screen/iefontfix.css
+++ b/refreshed/styles/screen/iefontfix.css
@@ -37,10 +37,10 @@
 
 @font-face {
font-family: 'WikiFont-Glyphs';
-   src: url('wikifont/WikiFont-Glyphs.eot'); /* IE9 Compat Modes */
-   src: url('wikifont/WikiFont-Glyphs.woff') format('woff'), /* Modern 
Browsers */
-   url('wikifont/WikiFont-Glyphs.ttf') format('truetype'), /* 
Safari, Android, iOS */
-   
url('wikifont/WikiFont-Glyphs.svg#8088f7bbbdba5c9832b27edb3dfcdf09') 
format('svg'); /* Legacy iOS */
+   src: url('../../wikifont/WikiFont-Glyphs.eot'); /* IE9 Compat Modes */
+   src: url('../../wikifont/WikiFont-Glyphs.woff') format('woff'), /* 
Modern Browsers */
+   url('../../wikifont/WikiFont-Glyphs.ttf') format('truetype'), 
/* Safari, Android, iOS */
+   
url('../../wikifont/WikiFont-Glyphs.svg#8088f7bbbdba5c9832b27edb3dfcdf09') 
format('svg'); /* Legacy iOS */
 }
 
 #header .wikiglyph-caret-down:before {
diff --git a/skin.json b/skin.json
index 3d367b7..f555d84 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Refreshed",
-   "version": "3.3.7",
+   "version": "3.3.8",
"author": [
"Adam Carter",
"Drew1200",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b69be592f5267ff28b104881732804656ac2d29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: MtMNC 
Gerrit-Reviewer: Jack Phoenix 
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...OAuth[master]: Use namespaced version of DBError, DBConnRef and IDatabase

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Use namespaced version of DBError, DBConnRef and IDatabase
..


Use namespaced version of DBError, DBConnRef and IDatabase

Change-Id: I5811ec246a14c482559e97cdd786fe99239ec890
---
M api/MWOAuthSessionProvider.php
M backend/MWOAuthConsumer.php
M backend/MWOAuthConsumerAcceptance.php
M backend/MWOAuthDAO.php
M backend/MWOAuthDataStore.php
M backend/MWOAuthUtils.php
M control/MWOAuthConsumerAcceptanceSubmitControl.php
M control/MWOAuthConsumerSubmitControl.php
M frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
M frontend/specialpages/SpecialMWOAuthListConsumers.php
M frontend/specialpages/SpecialMWOAuthManageConsumers.php
M frontend/specialpages/SpecialMWOAuthManageMyGrants.php
12 files changed, 83 insertions(+), 60 deletions(-)

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



diff --git a/api/MWOAuthSessionProvider.php b/api/MWOAuthSessionProvider.php
index f821e65..c86d62c 100644
--- a/api/MWOAuthSessionProvider.php
+++ b/api/MWOAuthSessionProvider.php
@@ -7,6 +7,7 @@
 use MediaWiki\Session\SessionInfo;
 use MediaWiki\Session\UserInfo;
 use WebRequest;
+use Wikimedia\Rdbms\DBError;
 
 /**
  * Session provider for OAuth
@@ -180,7 +181,7 @@
[ 'oaac_user_id' => $id ],
__METHOD__
);
-   } catch ( \DBError $e ) {
+   } catch ( DBError $e ) {
$dbw->rollback( __METHOD__ );
throw $e;
}
diff --git a/backend/MWOAuthConsumer.php b/backend/MWOAuthConsumer.php
index 98ae243..9ef778d 100644
--- a/backend/MWOAuthConsumer.php
+++ b/backend/MWOAuthConsumer.php
@@ -2,6 +2,8 @@
 
 namespace MediaWiki\Extensions\OAuth;
 
+use Wikimedia\Rdbms\DBConnRef;
+
 /**
  * (c) Aaron Schulz 2013, GPL
  *
@@ -158,12 +160,12 @@
}
 
/**
-* @param \DBConnRef $db
+* @param DBConnRef $db
 * @param string $key
 * @param int $flags MWOAuthConsumer::READ_* bitfield
 * @return MWOAuthConsumer|bool
 */
-   public static function newFromKey( \DBConnRef $db, $key, $flags = 0 ) {
+   public static function newFromKey( DBConnRef $db, $key, $flags = 0 ) {
$row = $db->selectRow( static::getTable(),
array_values( static::getFieldColumnMap() ),
[ 'oarc_consumer_key' => (string)$key ],
@@ -181,7 +183,7 @@
}
 
/**
-* @param \DBConnRef $db
+* @param DBConnRef $db
 * @param string $name
 * @param string $version
 * @param int $userId Central user ID
@@ -189,7 +191,7 @@
 * @return MWOAuthConsumer|bool
 */
public static function newFromNameVersionUser(
-   \DBConnRef $db, $name, $version, $userId, $flags = 0
+   DBConnRef $db, $name, $version, $userId, $flags = 0
) {
$row = $db->selectRow( static::getTable(),
array_values( static::getFieldColumnMap() ),
@@ -283,7 +285,7 @@
$this->grants = (array)$this->grants; // sanity
}
 
-   protected function encodeRow( \DBConnRef $db, $row ) {
+   protected function encodeRow( DBConnRef $db, $row ) {
// For compatibility with other wikis in the farm, un-remap 
some grants
foreach ( self::$mapBackCompatGrants as $old => $new ) {
while ( ( $i = array_search( $new, $row['oarc_grants'], 
true ) ) !== false ) {
@@ -300,7 +302,7 @@
return $row;
}
 
-   protected function decodeRow( \DBConnRef $db, $row ) {
+   protected function decodeRow( DBConnRef $db, $row ) {
$row['oarc_registration'] = wfTimestamp( TS_MW, 
$row['oarc_registration'] );
$row['oarc_stage_timestamp'] = wfTimestamp( TS_MW, 
$row['oarc_stage_timestamp'] );
$row['oarc_restrictions'] = \MWRestrictions::newFromJson( 
$row['oarc_restrictions'] );
diff --git a/backend/MWOAuthConsumerAcceptance.php 
b/backend/MWOAuthConsumerAcceptance.php
index 27969ec..d0ec980 100644
--- a/backend/MWOAuthConsumerAcceptance.php
+++ b/backend/MWOAuthConsumerAcceptance.php
@@ -2,6 +2,8 @@
 
 namespace MediaWiki\Extensions\OAuth;
 
+use Wikimedia\Rdbms\DBConnRef;
+
 /**
  (c) Aaron Schulz 2013, GPL
 
@@ -73,12 +75,12 @@
}
 
/**
-* @param \DBConnRef $db
+* @param DBConnRef $db
 * @param string $token Access token
 * @param int $flags MWOAuthConsumerAcceptance::READ_* bitfield
 * @return MWOAuthConsumerAcceptance|bool
 */
-   public static function newFromToken( \DBConnRef $db, $token, $flags = 0 
) {
+   public static function newFromToken( DBConnRef $db, $token, $flags = 0 
)

[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: Fix WikiFont on IE/Edge

2018-01-06 Thread MtMNC (Code Review)

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

Change subject: Fix WikiFont on IE/Edge
..

Fix WikiFont on IE/Edge

Update the path to WikiFont in iefontfix.css. This fixes an issue
where WikiFont doesn't load in Edge.
Increment the version number.

Change-Id: I5b69be592f5267ff28b104881732804656ac2d29
---
M refreshed/styles/screen/iefontfix.css
M skin.json
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Refreshed 
refs/changes/22/402622/1

diff --git a/refreshed/styles/screen/iefontfix.css 
b/refreshed/styles/screen/iefontfix.css
index 01a0298..43400ad 100644
--- a/refreshed/styles/screen/iefontfix.css
+++ b/refreshed/styles/screen/iefontfix.css
@@ -37,10 +37,10 @@
 
 @font-face {
font-family: 'WikiFont-Glyphs';
-   src: url('wikifont/WikiFont-Glyphs.eot'); /* IE9 Compat Modes */
-   src: url('wikifont/WikiFont-Glyphs.woff') format('woff'), /* Modern 
Browsers */
-   url('wikifont/WikiFont-Glyphs.ttf') format('truetype'), /* 
Safari, Android, iOS */
-   
url('wikifont/WikiFont-Glyphs.svg#8088f7bbbdba5c9832b27edb3dfcdf09') 
format('svg'); /* Legacy iOS */
+   src: url('../../wikifont/WikiFont-Glyphs.eot'); /* IE9 Compat Modes */
+   src: url('../../wikifont/WikiFont-Glyphs.woff') format('woff'), /* 
Modern Browsers */
+   url('../../wikifont/WikiFont-Glyphs.ttf') format('truetype'), 
/* Safari, Android, iOS */
+   
url('../../wikifont/WikiFont-Glyphs.svg#8088f7bbbdba5c9832b27edb3dfcdf09') 
format('svg'); /* Legacy iOS */
 }
 
 #header .wikiglyph-caret-down:before {
diff --git a/skin.json b/skin.json
index 3d367b7..f555d84 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Refreshed",
-   "version": "3.3.7",
+   "version": "3.3.8",
"author": [
"Adam Carter",
"Drew1200",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b69be592f5267ff28b104881732804656ac2d29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Refreshed
Gerrit-Branch: master
Gerrit-Owner: MtMNC 

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

[MediaWiki-commits] [Gerrit] mediawiki...VoteNY[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..

Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I3f5faa40d8edbb0a4bffd74530ff9aaf010f821f
---
M includes/VoteNY.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VoteNY 
refs/changes/21/402621/1

diff --git a/includes/VoteNY.hooks.php b/includes/VoteNY.hooks.php
index aae5c21..c6e3193 100644
--- a/includes/VoteNY.hooks.php
+++ b/includes/VoteNY.hooks.php
@@ -32,7 +32,7 @@
// Disable parser cache (sadly we have to do this, because the 
caching is
// messing stuff up; we want to show an up-to-date rating 
instead of old
// or totally wrong rating, i.e. another page's rating...)
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
// Add CSS & JS
// In order for us to do this *here* instead of having to do 
this in

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f5faa40d8edbb0a4bffd74530ff9aaf010f821f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VoteNY
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Video[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..

Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I742162e6d747e4da2def9046b4e9b905173f287c
---
M includes/parser/VideoGalleryPopulate.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Video 
refs/changes/20/402620/1

diff --git a/includes/parser/VideoGalleryPopulate.hooks.php 
b/includes/parser/VideoGalleryPopulate.hooks.php
index eb9c702..5c8c3a9 100644
--- a/includes/parser/VideoGalleryPopulate.hooks.php
+++ b/includes/parser/VideoGalleryPopulate.hooks.php
@@ -15,7 +15,7 @@
}
 
public static function renderVideoGalleryPopulate( $input, $args, 
$parser ) {
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$category = ( isset( $args['category'] ) ) ? $args['category'] 
: '';
$limit = ( isset( $args['limit'] ) ) ? intval( $args['limit'] ) 
: 10;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I742162e6d747e4da2def9046b4e9b905173f287c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Video
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Change global function to closure in usort

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Change global function to closure in usort
..


Change global function to closure in usort

Change-Id: Ib9f08a60ad3a34524c94b535a11e7247458b9fed
---
M .phpcs.xml
M CollectionProposals.php
2 files changed, 13 insertions(+), 31 deletions(-)

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



diff --git a/.phpcs.xml b/.phpcs.xml
index 2e20643..3f98d46 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -16,11 +16,6 @@

*/templates/*\.php

-   
-   
-   
-   
-   
.


diff --git a/CollectionProposals.php b/CollectionProposals.php
index 42d7d77..177a285 100644
--- a/CollectionProposals.php
+++ b/CollectionProposals.php
@@ -333,7 +333,19 @@
}
}
}
-   usort( $prop, "wgCollectionCompareProps" );
+   usort(
+   $prop,
+   function ( $a, $b ) {
+   if ( $a['val'] == $b['val'] ) {
+   return strcmp( $a['name'], $b['name'] );
+   }
+   if ( $a['val'] < $b['val'] ) {
+   return 1;
+   } else {
+   return -1;
+   }
+   }
+   );
$this->mPropList = [];
$have_real_weights = false;
foreach ( $prop as $p ) {
@@ -391,30 +403,5 @@
 */
private function getPropCount() {
return count( $this->mPropList );
-   }
-}
-
-/**
- * sort $mPropList by the entries values
- * sort alphabetically by equal values
- *
- * @param array $a array that contain two entries
- *the keys: 'name' & 'val'
- *'name': an articlename
- *'val' : a value from 1 to 1.5
- * @param array $b array that contain two entries
- *the keys: 'name' & 'val'
- *'name': an articlename
- *'val' : a value from 1 to 1.5
- * @return int 1 -1 or 0
- */
-function wgCollectionCompareProps( $a, $b ) {
-   if ( $a['val'] == $b['val'] ) {
-   return strcmp( $a['name'], $b['name'] );
-   }
-   if ( $a['val'] < $b['val'] ) {
-   return 1;
-   } else {
-   return - 1;
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9f08a60ad3a34524c94b535a11e7247458b9fed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Legoktm 
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...SocialProfile[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..

Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: Ib40b4007b7c31f53fcae783f174bb67836819606
---
M UserActivity/SiteActivityHook.php
M UserProfile/UserProfileHooks.php
M UserWelcome/UserWelcomeClass.php
3 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/UserActivity/SiteActivityHook.php 
b/UserActivity/SiteActivityHook.php
index 3813154..049e6f2 100644
--- a/UserActivity/SiteActivityHook.php
+++ b/UserActivity/SiteActivityHook.php
@@ -16,7 +16,7 @@
public static function getSiteActivity( $input, $args, $parser ) {
global $wgMemc, $wgExtensionAssetsPath;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$limit = ( isset( $args['limit'] ) && is_numeric( 
$args['limit'] ) ) ? $args['limit'] : 10;
 
diff --git a/UserProfile/UserProfileHooks.php b/UserProfile/UserProfileHooks.php
index 702dcd1..5c2d458 100644
--- a/UserProfile/UserProfileHooks.php
+++ b/UserProfile/UserProfileHooks.php
@@ -90,7 +90,7 @@
 * @return bool true
 */
public static function onParserLimitReportPrepare( $parser, $output ) {
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
return true;
}
 
diff --git a/UserWelcome/UserWelcomeClass.php b/UserWelcome/UserWelcomeClass.php
index 1d0c3a4..e8d7fc4 100644
--- a/UserWelcome/UserWelcomeClass.php
+++ b/UserWelcome/UserWelcomeClass.php
@@ -24,7 +24,7 @@
}
 
public static function getWelcomeUser( $input, $args, $parser ) {
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
$parser->getOutput()->addModuleStyles( 
'ext.socialprofile.userwelcome.css' );
// This is so stupid. The callback to onParserFirstCallInit() is
// *always* (assumed to be) static even if you don't declare it 
as such.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MultiLanguageManager[master]: Add apihelp-mlm-tasks-summary message

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Add apihelp-mlm-tasks-summary message
..


Add apihelp-mlm-tasks-summary message

Also change name of other messages to include the whole module name,
which is the default message name
This should fix the unit tests

Change-Id: Ic0b178fb4698057dda32213a5b1d9a97e0929f47
---
M i18n/en.json
M i18n/qqq.json
M src/Api/Tasks.php
3 files changed, 8 insertions(+), 9 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 26546bd..99c5fc6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -23,7 +23,8 @@
"mlm-input-label-delete": "Delete",
"mlm-input-label-cancel": "Cancel",
"mlm-contentaction-label": "Manage translations",
-   "apihelp-mlm-param-task": "The task that should be executed",
-   "apihelp-mlm-param-taskdata": "JSON string encoded object with 
arbitrary data for the task",
-   "apihelp-mlm-param-format": "The format of the result"
+   "apihelp-mlm-tasks-summary": "Manage translation tasks",
+   "apihelp-mlm-tasks-param-task": "The task that should be executed",
+   "apihelp-mlm-tasks-param-taskData": "JSON string encoded object with 
arbitrary data for the task",
+   "apihelp-mlm-tasks-param-format": "The format of the result"
 }
\ No newline at end of file
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a46b41c..737e2b2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -26,7 +26,8 @@
"mlm-input-label-delete": "Label for a delete 
button\n{{Identical|Delete}}",
"mlm-input-label-cancel": "Label for a delete 
button\n{{Identical|Cancel}}",
"mlm-contentaction-label": "Label of a content action link that opens 
Special:MultiLanguageManager",
-   "apihelp-mlm-param-task": "{{doc-apihelp-param|mlm-tasks|task}}",
-   "apihelp-mlm-param-taskdata": 
"{{doc-apihelp-param|mlm-tasks|taskdata}}",
-   "apihelp-mlm-param-format": "{{doc-apihelp-param|mlm-tasks|format}}"
+   "apihelp-mlm-tasks-summary": "{{doc-apihelp-summary|mlm-tasks}}",
+   "apihelp-mlm-tasks-param-task": "{{doc-apihelp-param|mlm-tasks|task}}",
+   "apihelp-mlm-tasks-param-taskData": 
"{{doc-apihelp-param|mlm-tasks|taskdata}}",
+   "apihelp-mlm-tasks-param-format": 
"{{doc-apihelp-param|mlm-tasks|format}}"
 }
diff --git a/src/Api/Tasks.php b/src/Api/Tasks.php
index b2a9c27..767b923 100644
--- a/src/Api/Tasks.php
+++ b/src/Api/Tasks.php
@@ -277,18 +277,15 @@
'task' => array(
\ApiBase::PARAM_REQUIRED => true,
\ApiBase::PARAM_TYPE => 'string',
-   \ApiBase::PARAM_HELP_MSG => 
'apihelp-mlm-param-task',
),
'taskData' => array(
\ApiBase::PARAM_TYPE => 'string',
\ApiBase::PARAM_REQUIRED => false,
\ApiBase::PARAM_DFLT => '{}',
-   \ApiBase::PARAM_HELP_MSG => 
'apihelp-mlm-param-taskdata',
),
'format' => array(
\ApiBase::PARAM_DFLT => 'json',
\ApiBase::PARAM_TYPE => [ 'json', 'jsonfm' ],
-   \ApiBase::PARAM_HELP_MSG => 
'apihelp-mlm-param-format',
)
];
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0b178fb4698057dda32213a5b1d9a97e0929f47
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MultiLanguageManager
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Siebrand 
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...codesniffer[master]: Skip __construct on checking for @return tags

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Skip __construct on checking for @return tags
..


Skip __construct on checking for @return tags

PHP allows constructor to return objects, but it seems not useful to
have a @return for it.

Bug: T177323
Change-Id: I53fff4cc0c2fe736c0ee419450e728ae93fda444
---
M MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
M MediaWiki/Tests/files/Commenting/commenting_function.php
M MediaWiki/Tests/files/Commenting/commenting_function.php.expect
M MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
4 files changed, 36 insertions(+), 0 deletions(-)

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



diff --git a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php 
b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
index e04f395..40cd69b 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -189,6 +189,12 @@
if ( !isset( $tokens[$stackPtr]['scope_opener'] ) ) {
return;
}
+
+   // Skip constructors
+   if ( $phpcsFile->getDeclarationName( $stackPtr ) === 
'__construct' ) {
+   return;
+   }
+
$endFunction = $tokens[$stackPtr]['scope_closer'];
$found = false;
for ( $i = $stackPtr + 1; $i < $endFunction; $i++ ) {
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php 
b/MediaWiki/Tests/files/Commenting/commenting_function.php
index f06a9e0..ae5a2d0 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php
@@ -249,3 +249,17 @@
$this->info = 'no documentation because obvious';
}
 }
+
+class TestReturnConstructor {
+   /**
+* With return.
+* @param int $a for test.
+* @param int $b for another test.
+*/
+   public function __construct( $a, $b ) {
+   if ( $b instanceof TestPassedExamples ) {
+   return $b;
+   }
+   $this->test( $a );
+   }
+}
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect 
b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
index b7552aa..95b563e 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
@@ -179,4 +179,6 @@
  |   | (Generic.Files.OneObjectStructurePerFile.MultipleFound)
  247 | ERROR | [ ] Only one object structure is allowed in a file
  |   | (Generic.Files.OneObjectStructurePerFile.MultipleFound)
+ 253 | ERROR | [ ] Only one object structure is allowed in a file
+ |   | (Generic.Files.OneObjectStructurePerFile.MultipleFound)
 PHPCBF CAN FIX THE 72 MARKED SNIFF VIOLATIONS AUTOMATICALLY
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed 
b/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
index 24669b9..6e47368 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
@@ -250,3 +250,17 @@
$this->info = 'no documentation because obvious';
}
 }
+
+class TestReturnConstructor {
+   /**
+* With return.
+* @param int $a for test.
+* @param int $b for another test.
+*/
+   public function __construct( $a, $b ) {
+   if ( $b instanceof TestPassedExamples ) {
+   return $b;
+   }
+   $this->test( $a );
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I53fff4cc0c2fe736c0ee419450e728ae93fda444
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Addshore 
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...RandomUsersWithAvatars[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..

Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I8198438bde6e183bb0d77266ae0826d6b53ae3ca
---
M includes/RandomUsersWithAvatars.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RandomUsersWithAvatars 
refs/changes/17/402617/1

diff --git a/includes/RandomUsersWithAvatars.class.php 
b/includes/RandomUsersWithAvatars.class.php
index 45c287b..ec1b7f3 100644
--- a/includes/RandomUsersWithAvatars.class.php
+++ b/includes/RandomUsersWithAvatars.class.php
@@ -23,7 +23,7 @@
global $wgUploadDirectory, $wgDBname, $wgMemc;
 
$parser->getOutput()->addModuleStyles( 
'ext.randomuserswithavatars' );
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$count = ( isset( $args['count'] ) && is_numeric( 
$args['count'] ) ) ? intval( $args['count'] ) : 10;
$per_row = ( isset( $args['row'] ) && is_numeric( $args['row'] 
) ) ? intval( $args['row'] ) : 4;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8198438bde6e183bb0d77266ae0826d6b53ae3ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomUsersWithAvatars
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Shrink favicon file sizes

2018-01-06 Thread Odder (Code Review)

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

Change subject: Shrink favicon file sizes
..

Shrink favicon file sizes

This commit uploads smaller-size versions of all current
Wikimedia favicons, except Wikipedia and Wikiversity which
have already been optimised.

Some of these have been re-created from scratch based on
SVG logos of the relevant projects while some (such as
favicons for Internal, SPCom and Usability wiki) are
simple optimised versions of already existing favicons.

I'm also using this opportunity to delete the favicon for
Macedonian Wiktionary as it's an exact duplicate of the
already existing English Wiktionary favicon, so there is
no point in serving two identical files.

Bug: T177726
Change-Id: I61464776f713fcfd0b680149be148ec2af14020c
---
M static/favicon/arbcom_dewiki.ico
M static/favicon/black-globe.ico
M static/favicon/commons.ico
M static/favicon/community.ico
M static/favicon/incubator.ico
M static/favicon/internal.ico
M static/favicon/labs.ico
M static/favicon/mediawiki.ico
M static/favicon/office.ico
M static/favicon/piece.ico
M static/favicon/spcom.ico
M static/favicon/testwikidata.ico
M static/favicon/toollabs.ico
M static/favicon/usability.ico
M static/favicon/wikibooks.ico
M static/favicon/wikidata.ico
M static/favicon/wikimania.ico
M static/favicon/wikinews.ico
M static/favicon/wikiquote.ico
M static/favicon/wikisource.ico
M static/favicon/wikispecies.ico
M static/favicon/wikitech.ico
M static/favicon/wiktionary/en.ico
D static/favicon/wiktionary/mk.ico
M static/favicon/wiktionary/si.ico
M static/favicon/wmf.ico
M wmf-config/InitialiseSettings.php
27 files changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/static/favicon/arbcom_dewiki.ico b/static/favicon/arbcom_dewiki.ico
index cb0994f..9f2fac2 100644
--- a/static/favicon/arbcom_dewiki.ico
+++ b/static/favicon/arbcom_dewiki.ico
Binary files differ
diff --git a/static/favicon/black-globe.ico b/static/favicon/black-globe.ico
index 84bdd29..2c9c8a9 100644
--- a/static/favicon/black-globe.ico
+++ b/static/favicon/black-globe.ico
Binary files differ
diff --git a/static/favicon/commons.ico b/static/favicon/commons.ico
index b63aa4e..516d189 100644
--- a/static/favicon/commons.ico
+++ b/static/favicon/commons.ico
Binary files differ
diff --git a/static/favicon/community.ico b/static/favicon/community.ico
index e63ead2..7f4d4e0 100644
--- a/static/favicon/community.ico
+++ b/static/favicon/community.ico
Binary files differ
diff --git a/static/favicon/incubator.ico b/static/favicon/incubator.ico
index 15c38ad..a10cd7a 100644
--- a/static/favicon/incubator.ico
+++ b/static/favicon/incubator.ico
Binary files differ
diff --git a/static/favicon/internal.ico b/static/favicon/internal.ico
index 7b4bfd5..ed3bbbe 100644
--- a/static/favicon/internal.ico
+++ b/static/favicon/internal.ico
Binary files differ
diff --git a/static/favicon/labs.ico b/static/favicon/labs.ico
index 962750c..c85c0f9 100644
--- a/static/favicon/labs.ico
+++ b/static/favicon/labs.ico
Binary files differ
diff --git a/static/favicon/mediawiki.ico b/static/favicon/mediawiki.ico
index 26cb9c5..9f06924 100644
--- a/static/favicon/mediawiki.ico
+++ b/static/favicon/mediawiki.ico
Binary files differ
diff --git a/static/favicon/office.ico b/static/favicon/office.ico
index 624a673..1b8c3ca 100644
--- a/static/favicon/office.ico
+++ b/static/favicon/office.ico
Binary files differ
diff --git a/static/favicon/piece.ico b/static/favicon/piece.ico
index 4277167..c46a07c 100644
--- a/static/favicon/piece.ico
+++ b/static/favicon/piece.ico
Binary files differ
diff --git a/static/favicon/spcom.ico b/static/favicon/spcom.ico
index fc85f63..6c5931f 100644
--- a/static/favicon/spcom.ico
+++ b/static/favicon/spcom.ico
Binary files differ
diff --git a/static/favicon/testwikidata.ico b/static/favicon/testwikidata.ico
index d464172..d959fdd 100644
--- a/static/favicon/testwikidata.ico
+++ b/static/favicon/testwikidata.ico
Binary files differ
diff --git a/static/favicon/toollabs.ico b/static/favicon/toollabs.ico
index 656d807..829811a 100644
--- a/static/favicon/toollabs.ico
+++ b/static/favicon/toollabs.ico
Binary files differ
diff --git a/static/favicon/usability.ico b/static/favicon/usability.ico
index 1590b41..3746092 100644
--- a/static/favicon/usability.ico
+++ b/static/favicon/usability.ico
Binary files differ
diff --git a/static/favicon/wikibooks.ico b/static/favicon/wikibooks.ico
index 1447efa..24c3fe3 100644
--- a/static/favicon/wikibooks.ico
+++ b/static/favicon/wikibooks.ico
Binary files differ
diff --git a/static/favicon/wikidata.ico b/static/favicon/wikidata.ico
index 29bcbd9..f56ae5b 100644
--- a/static/favicon/wikidata.ico
+++ b/static/favicon/wikidata.ico
Binary files differ
diff --git a/static/favicon/wikimania.ico b/static/favicon/wikimania.ico
index

[MediaWiki-commits] [Gerrit] mediawiki...RandomSelection[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..

Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: Ib5d50d1d454aca0a9fb75a135e8ec2a894ab6f48
---
M RandomSelection.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RandomSelection 
refs/changes/16/402616/1

diff --git a/RandomSelection.class.php b/RandomSelection.class.php
index 7c92a2f..70ca809 100644
--- a/RandomSelection.class.php
+++ b/RandomSelection.class.php
@@ -46,7 +46,7 @@
public static function render( $input, $argv, $parser ) {
# Prevent caching if specified so by the user
if ( isset( $argv['uncached'] ) ) {
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
}
 
# Parse the options and calculate total weight

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5d50d1d454aca0a9fb75a135e8ec2a894ab6f48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomSelection
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...RandomImageByCategory[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..

Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I482e3e553ade06443773f3a75a899ca981b60d6e
---
M RandomImageByCategory.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/RandomImageByCategory.class.php b/RandomImageByCategory.class.php
index bd0f352..fa25068 100644
--- a/RandomImageByCategory.class.php
+++ b/RandomImageByCategory.class.php
@@ -23,7 +23,7 @@
public static function getRandomImage( $input, $args, $parser ) {
global $wgMemc;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$categories = ( isset( $args['categories'] ) ) ? trim( 
$args['categories'] ) : '';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I482e3e553ade06443773f3a75a899ca981b60d6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomImageByCategory
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Use Language class to get languages names instead of hardcoding

2018-01-06 Thread Phantom42 (Code Review)

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

Change subject: Use Language class to get languages names instead of hardcoding
..

Use Language class to get languages names instead of hardcoding

Change-Id: Id2ece34c73b50b1600e5b2132749e5b1cfe677bc
---
M includes/Score.php
M includes/ScoreHooks.php
2 files changed, 17 insertions(+), 14 deletions(-)


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

diff --git a/includes/Score.php b/includes/Score.php
index 9010605..d6f1bc7 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -46,21 +46,21 @@
 
/**
 * Supported note languages.
-* Key is LilyPond filename. Value is native word
+* Key is LilyPond filename. Value is language code
 */
public static $supportedNoteLanguages = [
-   'arabic' => 'العربية',
-   'catalan' => 'Català',
-   'deutsch' => 'Deutsch',
-   'english' => 'English',
-   'espanol' => 'Español',
-   'italiano' => 'Italiano',
-   'nederlands' => 'Nederlands',
-   'norsk' => 'Norsk',
-   'portugues' => 'Português',
-   'suomi' => 'Suomi',
-   'svenska' => 'Svenska',
-   'vlaams' => 'Flemish',
+   'arabic' => 'ar',
+   'catalan' => 'ca',
+   'deutsch' => 'de',
+   'english' => 'en',
+   'espanol' => 'es',
+   'italiano' => 'it',
+   'nederlands' => 'nl',
+   'norsk' => 'no',
+   'portugues' => 'pt',
+   'suomi' => 'fi',
+   'svenska' => 'sv',
+   'vlaams' => 'vls',
];
 
/**
diff --git a/includes/ScoreHooks.php b/includes/ScoreHooks.php
index 34d053e..3cc32f7 100644
--- a/includes/ScoreHooks.php
+++ b/includes/ScoreHooks.php
@@ -34,7 +34,10 @@
 */
public static function onBeforePageDisplay( OutputPage &$output, Skin 
&$skin ) {
$output->addJsConfigVars( [
-   'wgScoreNoteLanguages' => 
Score::$supportedNoteLanguages,
+   'wgScoreNoteLanguages' => array_map(
+   'Language::fetchLanguageName',
+   Score::$supportedNoteLanguages
+   ),
'wgScoreDefaultNoteLanguage' => 
Score::$defaultNoteLanguage,
] );
return true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2ece34c73b50b1600e5b2132749e5b1cfe677bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Phantom42 

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

[MediaWiki-commits] [Gerrit] mediawiki...RandomFeaturedUser[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..

Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: Ie34ddb081c37a3b918e592c7e986589eccbc2210
---
M includes/RandomFeaturedUser.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/RandomFeaturedUser.php b/includes/RandomFeaturedUser.php
index f8ee0bb..e47df95 100644
--- a/includes/RandomFeaturedUser.php
+++ b/includes/RandomFeaturedUser.php
@@ -42,7 +42,7 @@
public static function getRandomUser( $input, $args, Parser $parser ) {
global $wgMemc, $wgRandomFeaturedUser;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$period = ( isset( $args['period'] ) ) ? $args['period'] : '';
if ( $period != 'weekly' && $period != 'monthly' ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie34ddb081c37a3b918e592c7e986589eccbc2210
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomFeaturedUser
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..

Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I3f6912f9767f5f3c5ccebfaaeeb905042376f9b3
---
M includes/PollNY.hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/PollNY.hooks.php b/includes/PollNY.hooks.php
index bb7e5b7..9b81f63 100644
--- a/includes/PollNY.hooks.php
+++ b/includes/PollNY.hooks.php
@@ -143,7 +143,7 @@
 * @return bool true
 */
public static function onParserLimitReportPrepare( $parser, $output ) {
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
return true;
}
 
@@ -188,7 +188,7 @@
// Disable caching; this is important so that we don't 
cause subtle
// bugs that are a bitch to fix.
$wgOut->enableClientCache( false );
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$poll_title = Title::newFromText( $poll_name, NS_POLL );
$poll_title = PollNYHooks::followPollID( $poll_title );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f6912f9767f5f3c5ccebfaaeeb905042376f9b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...NewUsersList[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..

Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I99cf64b6e99dd5b7f61d15c770b6690d7b7ab5f8
---
M includes/NewUsersList.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/NewUsersList.class.php b/includes/NewUsersList.class.php
index 194afeb..b8af02a 100644
--- a/includes/NewUsersList.class.php
+++ b/includes/NewUsersList.class.php
@@ -39,7 +39,7 @@
public static function getNewUsers( $input, $args, $parser ) {
global $wgMemc;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$count = 10;
$per_row = 5;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99cf64b6e99dd5b7f61d15c770b6690d7b7ab5f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NewUsersList
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...LinkFilter[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..

Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I917b59e40d26ab08a51d277be8acfade831178ec
---
M includes/LinkFilter.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/LinkFilter.hooks.php b/includes/LinkFilter.hooks.php
index 5777a9b..196225a 100644
--- a/includes/LinkFilter.hooks.php
+++ b/includes/LinkFilter.hooks.php
@@ -110,7 +110,7 @@
public static function renderLinkFilterHook( $input, $args, $parser ) {
global $wgMemc, $wgOut;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
// Add CSS (ParserOutput class only has addModules(), not
// addModuleStyles() or addModuleScripts()...strange)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I917b59e40d26ab08a51d277be8acfade831178ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LinkFilter
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..

Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I3b9c4406be007b205e87d2ca101fb160ec499047
---
M includes/FanBox.hooks.php
M includes/UserBoxes.hooks.php
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/FanBox.hooks.php b/includes/FanBox.hooks.php
index 93ab625..2c3fb64 100644
--- a/includes/FanBox.hooks.php
+++ b/includes/FanBox.hooks.php
@@ -170,7 +170,7 @@
public static function embedFanBox( $input, $argv, $parser ) {
global $wgUser, $wgHooks;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
$wgHooks['BeforePageDisplay'][] = 
'FanBoxHooks::addFanBoxScripts';
 
diff --git a/includes/UserBoxes.hooks.php b/includes/UserBoxes.hooks.php
index 3bd4b21..64fe958 100644
--- a/includes/UserBoxes.hooks.php
+++ b/includes/UserBoxes.hooks.php
@@ -30,7 +30,7 @@
public static function renderUserBoxesHook( $input, $args, $parser ) {
global $wgOut, $wgUser, $wgMemc;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
 
// Add CSS & JS
$wgOut->addModules( 'ext.fanBoxes' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b9c4406be007b205e87d2ca101fb160ec499047
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Comments[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..

Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: I957df9ccc48dc0da20c5657e52475b29f2b04335
---
M includes/parser/DisplayComments.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/parser/DisplayComments.class.php 
b/includes/parser/DisplayComments.class.php
index 110188f..3ae58e0 100644
--- a/includes/parser/DisplayComments.class.php
+++ b/includes/parser/DisplayComments.class.php
@@ -14,7 +14,7 @@
public static function getParserHandler( $input, $args, $parser ) {
global $wgOut, $wgCommentsSortDescending;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
// If an unclosed  tag is added to a page, the 
extension will
// go to an infinite loop...this protects against that 
condition.
$parser->setHook( 'comments', [ __CLASS__, 'nonDisplayComments' 
] );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I957df9ccc48dc0da20c5657e52475b29f2b04335
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Comments
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...AddThis[master]: Convert AddThis to use extension registration

2018-01-06 Thread Gabrielchihonglee (Code Review)

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

Change subject: Convert AddThis to use extension registration
..

Convert AddThis to use extension registration

Updating the extension to match with latest extension registration guidelines.

Bug: T184358
Change-Id: I12a9e2bec1afd350dd0d531a8cd60b5b21c04e43
---
M AddThis.php
A extension.json
2 files changed, 117 insertions(+), 209 deletions(-)


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

diff --git a/AddThis.php b/AddThis.php
index a640066..f7692e8 100644
--- a/AddThis.php
+++ b/AddThis.php
@@ -1,212 +1,14 @@
 https://www.mediawiki.org/wiki/Extension:AddThis
- *
- * @addtogroup Extensions
- * @author Gregory Varnum, significant contributions by Johnduhart
- * @license GPL
- *
- * Loosely based on the Google Translator extension by Joachim De Schrijver
- * Thank you to Johnduhart, Roan Kattouw, Unikum111, catrope, Nikerabbit, Reedy
- * and folks at AddThis for feedback and cleaning up code
- * Thank you to Raymond, Kghbln, Michawiki, Toliño, McDutchie, Bjankuloski06,
- * SPQRobin, Veeven, Gucci Mane Burrr, Kaajawa, Purodha, Kwj2772, Unikum111,
- * Y-M D, Xuacu, Naudefj, Gomoko, Anakmalaysia, פוילישער, Shizhao, and others
- * mentioned i18n/*.json for translation work.
- */
-
-/**
- * Exit if called outside of MediaWiki
- */
-if ( !defined( 'MEDIAWIKI' ) ) {
-   echo "This file is an extension to the MediaWiki software and cannot be 
used standalone.\n";
-   die( 1 );
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'AddThis' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['CookieWarning'] = __DIR__ . '/i18n';
+   /* wfWarn(
+   'Deprecated PHP entry point used for CookieWarning extension. 
Please use wfLoadExtension' .
+   'instead, see 
https://www.mediawiki.org/wiki/Extension_registration for more details.'
+   ); */
+   return true;
+} else {
+   die( 'This version of the AddThis extension requires MediaWiki 1.23+' );
 }
 
-/**
- * SETTINGS
- * 
- * The following variables may be reset in your LocalSettings.php file.
- *
- * $wgAddThispubid
- *- AddThis Profile ID - more info: 
http://www.addthis.com/help/profiles
- * $wgAddThisBackground
- *- Background color for AddThis toolbox displayed in article 
header
- *  Default is #f6f6f6
- * $wgAddThisBorder
- *- Border color for AddThis toolbox displayed in article header
- *  Default is #a7d7f9
- * $wgAddThisSidebar
- *- Display AddThis widget as sidebar portlet
- *  Default is true
- * $wgAddThisHeader
- *- Display AddThis widget in article headers
- *  Default is true
- * $wgAddThisMain
- *- Display AddThis widget on main page
- *  Default is true
- * $wgAddThis['addressbarsharing']
- *- Enable AddThis Address Bar Sharing
- *  http://www.addthis.com/help/address-bar-sharing-analytics
- *  Default is false
- * $wgAddThisSBServ[0]['service']
- *- Service code for 1st button in sidebar
- *  Service codes: http://www.addthis.com/services/list
- *  Default is compact - AddThis icon used to access full AddThis 
popup menu
- * $wgAddThisSBServ[0]['attribs']
- *- Settings for 1st button in sidebar
- *  More info: 
http://www.addthis.com/help/client-api#attribute-config
- * $wgAddThisSBServ[1]['service']
- *- Service code for 2nd button in sidebar
- *  Default is facebook
- * $wgAddThisSBServ[1]['attribs']
- *- Settings for 2nd button in sidebar
- * $wgAddThisSBServ[2]['service']
- *- Service code for 3rd button in sidebar
- *  Default is twitter
- * $wgAddThisSBServ[2]['attribs']
- *- Settings for 3rd button in sidebar
- * $wgAddThisSBServ[3]['service']
- *- Service code for 4th button in sidebar
- *  Default is google_plusone
- * $wgAddThisSBServ[3]['attribs']
- *- Settings for 4th button in sidebar
- *  Default is g:plusone:count="false" style="margin-top:1px;"
- * $wgAddThisSBServ[4]['service']
- *- Service code for 5th button in sidebar
- *  Default is email
- * $wgAddThisSBServ[4]['attribs']
- *- Settings for 5th button in sidebar
- * $wgAddThisHServ[0]['service']
- *- Service code for 1st button in article header after AddThis 
icon
- *  (which cannot be moved in the header)
- *  Default is facebook
- * $wgAddThisHServ[0]['attribs']
- *- Settings for 1st button in article header
- * $wgAddThisHServ[1]['service']
- *- Service code for 2nd button in article header
- *

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: wikimetrics: remove role

2018-01-06 Thread BryanDavis (Code Review)

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

Change subject: wikimetrics: remove role
..

wikimetrics: remove role

Remove the wikimetrics role and related Puppet module. This module was
removed from Wikimedia's operations/puppet.git repo in its f79b155
revision. The code present here has not been updated for systemd, which
means that it does not work on the current Debian Jessie master branch
of MediaWiki-Vagrant or the Debian Stretch testing branch.

Bug: T184154
Change-Id: I5d315c0f0b6be94b5559f0d1afe21704104b1ce1
---
M .gitmodules
M .rubocop.yml
M puppet/hieradata/common.yaml
D puppet/modules/role/manifests/wikimetrics.pp
D puppet/modules/wikimetrics
5 files changed, 0 insertions(+), 116 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/06/402606/1

diff --git a/.gitmodules b/.gitmodules
index 5b6ae2b..117e3b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "puppet/modules/wikimetrics"]
-   path = puppet/modules/wikimetrics
-   url = https://gerrit.wikimedia.org/r/operations/puppet/wikimetrics
 [submodule "puppet/modules/nginx"]
path = puppet/modules/nginx
url = https://gerrit.wikimedia.org/r/operations/puppet/nginx
diff --git a/.rubocop.yml b/.rubocop.yml
index e8367dd..6ff92d4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -11,7 +11,6 @@
 - 'puppet/modules/cdh/**/*'
 - 'puppet/modules/nginx/**/*'
 - 'puppet/modules/stdlib/**/*'
-- 'puppet/modules/wikimetrics/**/*'
 - 'puppet/modules/wmflib/**/*'
 - 'srv/**/*'
 - 'tmp/**/*'
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index fabf5cf..81ee666 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -441,8 +441,6 @@
 
 role::wikidata::main_page: "Wiki:Main Page"
 
-role::wikimetrics::dir: "%{hiera('mwv::services_dir')}/wikimetrics"
-
 scholarships::vhost_name: "scholarships%{hiera('mwv::tld')}"
 scholarships::db_name: scholarships
 scholarships::db_user: scholarships
diff --git a/puppet/modules/role/manifests/wikimetrics.pp 
b/puppet/modules/role/manifests/wikimetrics.pp
deleted file mode 100644
index ce261f2..000
--- a/puppet/modules/role/manifests/wikimetrics.pp
+++ /dev/null
@@ -1,109 +0,0 @@
-# == Class: role::wikimetrics
-# Wikimetrics is a Wikimedia Foundation developed tool that provides
-# access to the Wikimedia API. It allows users to pull data about a
-# group of usernames (called cohorts) to discover retention rates for
-# those users, how many characters they have added, how many edits they
-# have made, how many pages they have created, etc, all within time
-# periods the Wikimetrics user sets.
-#
-# This role installs and hosts Wikimetrics at http://localhost:5000.
-# (both the guest and host)
-#
-# NOTE!  You will need the wikimetrics git submodule available.
-# Run this command on your local machine make sure modules/wikimetrics
-# is cloned and up to date:
-#
-#git submodule update --init
-#
-class role::wikimetrics(
-$dir,
-) {
-require ::role::mediawiki
-require ::role::centralauth
-require ::mysql::packages
-
-require_package('python-nose')
-
-# Should Wikimetrics run under Apache or using the development server?
-# Legal values are 'daemon' and 'apache'.
-$web_server_mode = 'daemon'
-
-# Make wikimetrics group 'www-data' if running in apache mode.
-# This allows for apache to write files to wikimetrics var directories
-$wikimetrics_group = $web_server_mode ? {
-'apache' => 'www-data',
-default  => 'wikimetrics',
-}
-
-class { '::wikimetrics':
-path=> $dir,
-group   => $wikimetrics_group,
-# Use the role::mediawiki MySQL database for
-# wikimetrics editor cohort analysis
-db_user_mediawiki   => $::mediawiki::multiwiki::db_user,
-db_pass_mediawiki   => $::mediawiki::multiwiki::db_pass,
-db_name_mediawiki   => $::mediawiki::db_name,
-db_host_mediawiki   => 'localhost',
-# Use the role::centralauth MySQL database for
-# wikimetrics cohort user expansion
-db_user_centralauth => $::mediawiki::multiwiki::db_user,
-db_pass_centralauth => $::mediawiki::multiwiki::db_pass,
-db_name_centralauth => $::role::centralauth::shared_db,
-db_host_centralauth => 'localhost',
-# clone wikimetrics as vagrant share user
-# so that it works properly in the shared
-# /vagrant directory
-repository_owner=> $::share_owner,
-# wikimetrics runs on the LabsDB usually,
-# where this table is called 'revision_userindex'.
-# The mediawiki database usually calls this 'revision'.
-revision_tablename  => 'revision',
-archive_tablename   => 'archive',
-# Since we are using the /vagrant shared

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Fix SpaceyParenthesisSniff comment detection for ignore stat...

2018-01-06 Thread Umherirrender (Code Review)

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

Change subject: Fix SpaceyParenthesisSniff comment detection for ignore 
statements
..

Fix SpaceyParenthesisSniff comment detection for ignore statements

When changed all the @codingStandardsIgnore in
I92ef235849bcc349c69e53504e664a155dd162c8 I have to move some of them in
tests provider to different line due to this bug. I assumed it in
upstream and therefore not looking in it deeper.
But I found it a problem in our own sniff, so fixing it.

Change-Id: Ia99b628001de7c522db27ca1da706806157fad45
---
M MediaWiki/Sniffs/WhiteSpace/SpaceyParenthesisSniff.php
M MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis.php
M MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis.php.fixed
3 files changed, 49 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/05/402605/1

diff --git a/MediaWiki/Sniffs/WhiteSpace/SpaceyParenthesisSniff.php 
b/MediaWiki/Sniffs/WhiteSpace/SpaceyParenthesisSniff.php
index ce1a704..9e84d58 100644
--- a/MediaWiki/Sniffs/WhiteSpace/SpaceyParenthesisSniff.php
+++ b/MediaWiki/Sniffs/WhiteSpace/SpaceyParenthesisSniff.php
@@ -56,6 +56,19 @@
}
 
/**
+* @param int $token PHPCS token code.
+* @return boolean Whether the token code is a comment.
+*/
+   private function isComment( $token ) {
+   return $token === T_COMMENT
+   || $token === T_PHPCS_ENABLE
+   || $token === T_PHPCS_DISABLE
+   || $token === T_PHPCS_SET
+   || $token === T_PHPCS_IGNORE
+   || $token === T_PHPCS_IGNORE_FILE;
+   }
+
+   /**
 * @param File $phpcsFile File object.
 * @param int $stackPtr The current token index.
 * @return void
@@ -163,7 +176,7 @@
if ( $this->isOpen( $previousToken['code'] )
|| ( $previousToken['code'] === T_WHITESPACE
&& $previousToken['content'] === ' ' )
-   || ( $previousToken['code'] === T_COMMENT
+   || ( $this->isComment( $previousToken['code'] )
&& substr( $previousToken['content'], -1, 1 ) 
=== "\n" ) ) {
// If previous token was
// '(' or ' ' or a comment ending with a newline
@@ -180,7 +193,7 @@
}
 
// If the comment before all the whitespaces immediately 
preceding the ')' ends with a newline
-   if ( $tokens[$ptr]['code'] === T_COMMENT
+   if ( $this->isComment( $tokens[$ptr]['code'] )
&& substr( $tokens[$ptr]['content'], -1, 1 ) === "\n" ) 
{
return;
}
diff --git a/MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis.php 
b/MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis.php
index 0ebe73c..d5ba3c3 100644
--- a/MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis.php
+++ b/MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis.php
@@ -30,4 +30,21 @@
// 'foo' => 'baz',
];
(int)$arg->bar();
+
+   $fooArray = [
+   // phpcs:disable Generic.Files.LineLength
+   [
+   'Some',
+   'Parameter',
+   'For',
+   'Testprovider',
+   ],
+   [
+   'Some very',
+   
'nng
 Parameter',
+   'For',
+   'Testprovider',
+   ],
+   // phpcs:enable
+   ];
 }
diff --git a/MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis.php.fixed 
b/MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis.php.fixed
index 84fd45b..8272978 100644
--- a/MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis.php.fixed
+++ b/MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis.php.fixed
@@ -30,4 +30,21 @@
// 'foo' => 'baz',
];
(int)$arg->bar();
+
+   $fooArray = [
+   // phpcs:disable Generic.Files.LineLength
+   [
+   'Some',
+   'Parameter',
+   'For',
+   'Testprovider',
+   ],
+   [
+   'Some very',
+   
'nng
 Parameter',
+   'For',
+   'Testprovider',
+   ],
+   // phpcs:enable
+   ];
 }

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

Gerrit-MessageType: newchange

[MediaWiki-commits] [Gerrit] labs...ZppixBot[master]: Add guides for maintainers

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Add guides for maintainers
..


Add guides for maintainers

Change-Id: I07468f25d931250d18859c50a74db74e5d2a821a
---
M public_html/documentation.html
1 file changed, 69 insertions(+), 19 deletions(-)

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



diff --git a/public_html/documentation.html b/public_html/documentation.html
index 6516771..662337b 100644
--- a/public_html/documentation.html
+++ b/public_html/documentation.html
@@ -10,6 +10,14 @@
 
 List of commands
 Module Development
+Managing the bot (for maintainers)
+
+   Restarting the bot
+   Making changes to modules
+   Making config changes
+   Canceling a reminder
+   Updateing the website for 
ZppixBot
+
 
 List of commands
 
@@ -92,7 +100,7 @@
 tld
 
 
-.task>
+.task
 Gives a link to the specified task on Miraheze 
Phabricator
 .task 1
 mh_phab
@@ -373,13 +381,13 @@
 
 
 
-
+ 
 Module development
 If you decided to extend ZppixBot with some functionality, you will need 
to create a new module.
 This instruction will guide you through the process of custom module 
development
 First of all, create a new file in modules directory with name 
your_module.py
 Bot modules are python scripts, so we shall start with importing required 
libraries (bot is using sopel) for your module to work. Here is the list of 
imports typically used:
-
+ 
 
 from __future__ import unicode_literals, absolute_import, print_function, 
division
 import sopel
@@ -388,15 +396,15 @@
 import sopel.tools
 from sopel.module import rule, priority, thread, commands, example
 
-
+ 
 Let's define a function, which replies to ".hi" command with a greeting:
-
+ 
 
 @commands('hi')
 def bot_hi(bot, trigger):
 bot.say('Hi ' + trigger.nick + '!')
 
-
+ 
 Explanation: using @commands we specify which command bot 
should react to (in our case ".hi")
 Handler function has two parameters:
 
@@ -408,43 +416,43 @@
 
 Unluckily, our bot will react only to ".hi" messages, but you may want it 
to react to ".hello" and ".hey" as well
 In order to achieve that, we may set multiple command variations bot will 
respond to by specifying all of them in the decorator:
-
+ 
 
 @commands('hi', 'hello', 'hey')
 def bot_hi(bot, trigger):
 bot.say('Hi ' + trigger.nick + '!')
 
-
+ 
 You may try running that code and see that bot will react to all commands 
mentioned by saying "hi" to message sender.
 
 Finally, you may want bot to accept some input from user. To demonstrate 
how to achieve that, let's develop a function which will welcome chat 
newcomers
 For example, if John joins your chat, you may ask bot to welcome him with 
command ".welcome John" and bot will send a message saying "Welcome, John! 
Enjoy yourself in this chat!"
 Similarly, you may ask bot to welcome Bob my saying ".welcome Bob" and bot 
will say "Welcome, Bob! Enjoy yourself in this chat!"
 Let's also use @example decorator to provide command usage example:
-
+ 
 
 @commands('welcome')
 @example('.welcome John')
 def bot_welcome(bot, trigger):
 bot.say('Welcome ' + trigger.group(2) + '! Enjoy yourself in this chat!')
 
-
+ 
 Explanation: we use trigger.group(2) to get the text after 
the command (in our example - name of user to welcome)
 
 Additionally, you may use bot.reply, which is similar to 
bot.say, but puts message sender name in the beginning of the message
 To demonstrate that, let's create an "echo" function - it will send back 
to you your message, which will be starting with you name (i.e mention you):
-
+ 
 
 @commands('echo')
 @example('.echo hello world!')
 def bot_welcome(bot, trigger):
 bot.reply('You said: ' + trigger.group(2))
 
-
+ 
 That was an example of simple module. We recommend you visiting https://github.com/sopel-irc/sopel/wiki;>Sopel Wiki for more info on 
this topic.
 
 Complete source code of this example (file simple_module.py):
-
+ 
 
 from __future__ import unicode_literals, absolute_import, print_function, 
division
 import sopel
@@ -452,23 +460,65 @@
 import requests
 import sopel.tools
 from sopel.module import rule, priority, thread, commands, example
-
+ 
 @commands('hi', 'hello', 'hey')
 def bot_hi(bot, trigger):
 bot.say('Hi ' + trigger.nick + '!')
-
-
+ 
+ 
 commands('welcome')
 @example('.welcome John')
 def bot_welcome(bot, trigger):
 bot.say('Welcome ' + trigger.group(2) + '! Enjoy yourself in this chat!')
-
-
+ 
+ 
 @commands('echo')
 @example('.echo hello world!')
 def bot_welcome(bot, trigger):

[MediaWiki-commits] [Gerrit] labs...ZppixBot[master]: Add guides for maintainers

2018-01-06 Thread MacFan4000 (Code Review)

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

Change subject: Add guides for maintainers
..

Add guides for maintainers

Change-Id: I07468f25d931250d18859c50a74db74e5d2a821a
---
M public_html/documentation.html
1 file changed, 69 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/ZppixBot 
refs/changes/04/402604/2

diff --git a/public_html/documentation.html b/public_html/documentation.html
index 6516771..662337b 100644
--- a/public_html/documentation.html
+++ b/public_html/documentation.html
@@ -10,6 +10,14 @@
 
 List of commands
 Module Development
+Managing the bot (for maintainers)
+
+   Restarting the bot
+   Making changes to modules
+   Making config changes
+   Canceling a reminder
+   Updateing the website for 
ZppixBot
+
 
 List of commands
 
@@ -92,7 +100,7 @@
 tld
 
 
-.task>
+.task
 Gives a link to the specified task on Miraheze 
Phabricator
 .task 1
 mh_phab
@@ -373,13 +381,13 @@
 
 
 
-
+ 
 Module development
 If you decided to extend ZppixBot with some functionality, you will need 
to create a new module.
 This instruction will guide you through the process of custom module 
development
 First of all, create a new file in modules directory with name 
your_module.py
 Bot modules are python scripts, so we shall start with importing required 
libraries (bot is using sopel) for your module to work. Here is the list of 
imports typically used:
-
+ 
 
 from __future__ import unicode_literals, absolute_import, print_function, 
division
 import sopel
@@ -388,15 +396,15 @@
 import sopel.tools
 from sopel.module import rule, priority, thread, commands, example
 
-
+ 
 Let's define a function, which replies to ".hi" command with a greeting:
-
+ 
 
 @commands('hi')
 def bot_hi(bot, trigger):
 bot.say('Hi ' + trigger.nick + '!')
 
-
+ 
 Explanation: using @commands we specify which command bot 
should react to (in our case ".hi")
 Handler function has two parameters:
 
@@ -408,43 +416,43 @@
 
 Unluckily, our bot will react only to ".hi" messages, but you may want it 
to react to ".hello" and ".hey" as well
 In order to achieve that, we may set multiple command variations bot will 
respond to by specifying all of them in the decorator:
-
+ 
 
 @commands('hi', 'hello', 'hey')
 def bot_hi(bot, trigger):
 bot.say('Hi ' + trigger.nick + '!')
 
-
+ 
 You may try running that code and see that bot will react to all commands 
mentioned by saying "hi" to message sender.
 
 Finally, you may want bot to accept some input from user. To demonstrate 
how to achieve that, let's develop a function which will welcome chat 
newcomers
 For example, if John joins your chat, you may ask bot to welcome him with 
command ".welcome John" and bot will send a message saying "Welcome, John! 
Enjoy yourself in this chat!"
 Similarly, you may ask bot to welcome Bob my saying ".welcome Bob" and bot 
will say "Welcome, Bob! Enjoy yourself in this chat!"
 Let's also use @example decorator to provide command usage example:
-
+ 
 
 @commands('welcome')
 @example('.welcome John')
 def bot_welcome(bot, trigger):
 bot.say('Welcome ' + trigger.group(2) + '! Enjoy yourself in this chat!')
 
-
+ 
 Explanation: we use trigger.group(2) to get the text after 
the command (in our example - name of user to welcome)
 
 Additionally, you may use bot.reply, which is similar to 
bot.say, but puts message sender name in the beginning of the message
 To demonstrate that, let's create an "echo" function - it will send back 
to you your message, which will be starting with you name (i.e mention you):
-
+ 
 
 @commands('echo')
 @example('.echo hello world!')
 def bot_welcome(bot, trigger):
 bot.reply('You said: ' + trigger.group(2))
 
-
+ 
 That was an example of simple module. We recommend you visiting https://github.com/sopel-irc/sopel/wiki;>Sopel Wiki for more info on 
this topic.
 
 Complete source code of this example (file simple_module.py):
-
+ 
 
 from __future__ import unicode_literals, absolute_import, print_function, 
division
 import sopel
@@ -452,23 +460,65 @@
 import requests
 import sopel.tools
 from sopel.module import rule, priority, thread, commands, example
-
+ 
 @commands('hi', 'hello', 'hey')
 def bot_hi(bot, trigger):
 bot.say('Hi ' + trigger.nick + '!')
-
-
+ 
+ 
 commands('welcome')
 @example('.welcome John')
 def bot_welcome(bot, trigger):
 bot.say('Welcome ' + trigger.group(2) + '! Enjoy yourself in this chat!')
-
-
+ 
+ 
 @commands('echo')
 @example('.echo hello world!')
 def bot_welcome(bot, trigger):
 bot.reply('You

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Skip __construct on checking for @return tags

2018-01-06 Thread Umherirrender (Code Review)

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

Change subject: Skip __construct on checking for @return tags
..

Skip __construct on checking for @return tags

PHP allows constructor to return objects, but it seems not useful to
have a @return for it.

Bug: T177323
Change-Id: I53fff4cc0c2fe736c0ee419450e728ae93fda444
---
M MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
M MediaWiki/Tests/files/Commenting/commenting_function.php
M MediaWiki/Tests/files/Commenting/commenting_function.php.expect
M MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
4 files changed, 36 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/03/402603/1

diff --git a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php 
b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
index e04f395..40cd69b 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -189,6 +189,12 @@
if ( !isset( $tokens[$stackPtr]['scope_opener'] ) ) {
return;
}
+
+   // Skip constructors
+   if ( $phpcsFile->getDeclarationName( $stackPtr ) === 
'__construct' ) {
+   return;
+   }
+
$endFunction = $tokens[$stackPtr]['scope_closer'];
$found = false;
for ( $i = $stackPtr + 1; $i < $endFunction; $i++ ) {
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php 
b/MediaWiki/Tests/files/Commenting/commenting_function.php
index f06a9e0..ae5a2d0 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php
@@ -249,3 +249,17 @@
$this->info = 'no documentation because obvious';
}
 }
+
+class TestReturnConstructor {
+   /**
+* With return.
+* @param int $a for test.
+* @param int $b for another test.
+*/
+   public function __construct( $a, $b ) {
+   if ( $b instanceof TestPassedExamples ) {
+   return $b;
+   }
+   $this->test( $a );
+   }
+}
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect 
b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
index b7552aa..95b563e 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
@@ -179,4 +179,6 @@
  |   | (Generic.Files.OneObjectStructurePerFile.MultipleFound)
  247 | ERROR | [ ] Only one object structure is allowed in a file
  |   | (Generic.Files.OneObjectStructurePerFile.MultipleFound)
+ 253 | ERROR | [ ] Only one object structure is allowed in a file
+ |   | (Generic.Files.OneObjectStructurePerFile.MultipleFound)
 PHPCBF CAN FIX THE 72 MARKED SNIFF VIOLATIONS AUTOMATICALLY
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed 
b/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
index 24669b9..6e47368 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
@@ -250,3 +250,17 @@
$this->info = 'no documentation because obvious';
}
 }
+
+class TestReturnConstructor {
+   /**
+* With return.
+* @param int $a for test.
+* @param int $b for another test.
+*/
+   public function __construct( $a, $b ) {
+   if ( $b instanceof TestPassedExamples ) {
+   return $b;
+   }
+   $this->test( $a );
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I53fff4cc0c2fe736c0ee419450e728ae93fda444
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
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...minus-x[master]: Loosen symfony/console dependency

2018-01-06 Thread Legoktm (Code Review)

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

Change subject: Loosen symfony/console dependency
..

Loosen symfony/console dependency

This is a commonly used package and trying to pin it to one specific version
is going to be problematic in the long run. And symfony generally does a good
job with following semantic versioning, and not breaking backwards-
compatibility.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/minus-x 
refs/changes/02/402602/1

diff --git a/composer.json b/composer.json
index 47362b2..8a498e3 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
],
"require": {
"php": ">=5.5.9",
-   "symfony/console": "3.3.5"
+   "symfony/console": "^3.3.5"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I900f48ca95b62b63ff5b1b0c2e3436c6fb988d5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/minus-x
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] translatewiki[master]: Upgrade puppet-lint and puppet-syntax checks

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Upgrade puppet-lint and puppet-syntax checks
..


Upgrade puppet-lint and puppet-syntax checks

Ignore vendor modules and update puppet itself to the version we
are using.

Change-Id: I754f4b7469317bde89c45842a42f216647eaf673
---
M Gemfile
M Rakefile
M puppet/modules/users/manifests/init.pp
3 files changed, 10 insertions(+), 6 deletions(-)

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



diff --git a/Gemfile b/Gemfile
index 88617d9..a8b6157 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 3.7.0'
-gem 'puppet-lint', '1.1.0'
-gem 'puppetlabs_spec_helper', '< 2.0.0'
+gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 4.10.9'
+gem 'puppetlabs_spec_helper', '< 3.0.0'
 
 # Puppet 3.7 fails on ruby 2.2+
 # https://tickets.puppetlabs.com/browse/PUP-3796
diff --git a/Rakefile b/Rakefile
index 9cd5ff5..6c01b89 100644
--- a/Rakefile
+++ b/Rakefile
@@ -17,6 +17,9 @@
 require 'puppet-lint/tasks/puppet-lint'
 require 'puppet-syntax/tasks/puppet-syntax'
 
+PuppetSyntax.exclude_paths = ["puppet/vendor/**/*"]
+PuppetLint.configuration.pattern = "puppet/modules/**/*.pp"
+
 task :default => [:help]
 
 desc 'Show the help'
diff --git a/puppet/modules/users/manifests/init.pp 
b/puppet/modules/users/manifests/init.pp
index dfb8f66..2f977b6 100644
--- a/puppet/modules/users/manifests/init.pp
+++ b/puppet/modules/users/manifests/init.pp
@@ -269,6 +269,7 @@
   comment=> 'Corey Floyd (WMF)';
   }
 
+  # lint:ignore:140chars
   ssh_authorized_key {
 'siebrand_ssh':
   ensure => present,
@@ -278,8 +279,9 @@
   key=> 
'C3NzaC1lZDI1NTE5IHxdP9KdKSwuVpRaaevBbuCgPTV+2rvIe6Y57iOP57I6';
 'fjalapeno_ssh':
   ensure => present,
-  user => 'fjalapeno',
-  type => 'rsa',
-  key  => 
'B3NzaC1yc2EBIwAAAQEA0FskuPOIjhNL4BGfI9p9FyWLt6DM5hjVMqPSz/puQ96Q1/Q92CTHT5gfthLVla/J/j14wW8G2vvz4ZBC1j123xNM4jbLo2jtbKitSTjr4vVf+Q4KPZ3R2ow/dOoWutKuoNwBBRSBBjjPv/F38aQRba4GRBflKhdOCmn6tUeE/Sk8U7WC7oSIfv2cZ1OC+PP9xFuG7a3FgWflzS+hwDyL3LGRlGlK6k3kI2IyOEwYlaZe/BTGZpC7Af+B1ad7z6PlzpKGDIomvMr8Q6r7GjEnAQnVJtXkMxsT0j4gSbcyUQMoBCzRDe7BR4CkiZXljxrvCGkhATav5gGI2DKT/uijlw==';
+  user   => 'fjalapeno',
+  type   => 'rsa',
+  key=> 
'B3NzaC1yc2EBIwAAAQEA0FskuPOIjhNL4BGfI9p9FyWLt6DM5hjVMqPSz/puQ96Q1/Q92CTHT5gfthLVla/J/j14wW8G2vvz4ZBC1j123xNM4jbLo2jtbKitSTjr4vVf+Q4KPZ3R2ow/dOoWutKuoNwBBRSBBjjPv/F38aQRba4GRBflKhdOCmn6tUeE/Sk8U7WC7oSIfv2cZ1OC+PP9xFuG7a3FgWflzS+hwDyL3LGRlGlK6k3kI2IyOEwYlaZe/BTGZpC7Af+B1ad7z6PlzpKGDIomvMr8Q6r7GjEnAQnVJtXkMxsT0j4gSbcyUQMoBCzRDe7BR4CkiZXljxrvCGkhATav5gGI2DKT/uijlw==';
   }
+  # lint:endignore
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I754f4b7469317bde89c45842a42f216647eaf673
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Nikerabbit 
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]: Add options and join conds to MediaWikiTestCase::assertSelect

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Add options and join conds to MediaWikiTestCase::assertSelect
..


Add options and join conds to MediaWikiTestCase::assertSelect

Because selects sometimes need to specify these.

Change-Id: I853e8210bbafe16a62060b9075384afb9cdb03c0
---
M tests/phpunit/MediaWikiTestCase.php
1 file changed, 13 insertions(+), 2 deletions(-)

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



diff --git a/tests/phpunit/MediaWikiTestCase.php 
b/tests/phpunit/MediaWikiTestCase.php
index d542826..5c27fa1 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -1482,13 +1482,17 @@
 * @param string|array $fields The columns to include in the result 
(and to sort by)
 * @param string|array $condition "where" condition(s)
 * @param array $expectedRows An array of arrays giving the expected 
rows.
+* @param array $options Options for the query
+* @param array $join_conds Join conditions for the query
 *
 * @throws MWException If this test cases's needsDB() method doesn't 
return true.
 * Test cases can use "@group Database" to enable database test 
support,
 * or list the tables under testing in $this->tablesUsed, or 
override the
 * needsDB() method.
 */
-   protected function assertSelect( $table, $fields, $condition, array 
$expectedRows ) {
+   protected function assertSelect(
+   $table, $fields, $condition, array $expectedRows, array 
$options = [], array $join_conds = []
+   ) {
if ( !$this->needsDB() ) {
throw new MWException( 'When testing database state, 
the test cases\'s needDB()' .
' method should return true. Use @group 
Database or $this->tablesUsed.' );
@@ -1496,7 +1500,14 @@
 
$db = wfGetDB( DB_REPLICA );
 
-   $res = $db->select( $table, $fields, $condition, wfGetCaller(), 
[ 'ORDER BY' => $fields ] );
+   $res = $db->select(
+   $table,
+   $fields,
+   $condition,
+   wfGetCaller(),
+   $options + [ 'ORDER BY' => $fields ],
+   $join_conds
+   );
$this->assertNotEmpty( $res, "query failed: " . 
$db->lastError() );
 
$i = 0;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I853e8210bbafe16a62060b9075384afb9cdb03c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix interception of WebView content with extended content-ty...

2018-01-06 Thread Dbrant (Code Review)

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

Change subject: Fix interception of WebView content with extended content-type 
header.
..

Fix interception of WebView content with extended content-type header.

Background:
We use a WebView to display article content, but we intercept the
WebView's network requests by using a custom WebViewClient where we
perform our own network transaction using OkHttp.

Once we receive a response, we pass it back to the WebView by creating a
WebResourceResponse object which contains the stream of bytes, as well as
the encoding and mime-type of the bytes.

The thing is:
The WebResourceResponse object expects the mime-type parameter to be a
pure mime-type string, that is "type/subtype", with nothing else appended
to it.  Whereas, we were incorrectly passing the entire "content-type"
header, which contains the mime-type, plus additional possible parameters
such as "charset" and "profile."

This patch updates our code to extract only the mime-type from the
content-type header, and correctly pass it into the WebResourceResponse,
thereby fixing the issues that users are seeing with SVG math formulas,
which were recently updated to contain a "charset" parameter in their
content-type.

Bug: T184347
Change-Id: I7e5417519e842995bb6a54a0ed6b22096827b67f
---
M app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java
1 file changed, 11 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/00/402600/1

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java 
b/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java
index aeddad3..14881c4 100644
--- a/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java
+++ b/app/src/main/java/org/wikipedia/dataclient/okhttp/OkHttpWebViewClient.java
@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -35,7 +36,6 @@
 
 private static final List SUPPORTED_SCHEMES = 
Arrays.asList("http", "https");
 private static final String HEADER_CONTENT_TYPE = "content-type";
-private static final String HEADER_CONTENT_ENCODING = "content-encoding";
 private static final String CONTENT_TYPE_OGG = "application/ogg";
 
 @NonNull public abstract WikiSite getWikiSite();
@@ -48,9 +48,11 @@
 
 try {
 Response rsp = request(url);
-return new WebResourceResponse(rsp.header(HEADER_CONTENT_TYPE),
-rsp.header(HEADER_CONTENT_ENCODING), getInputStream(rsp));
-} catch (IOException e) {
+// noinspection ConstantConditions
+return new WebResourceResponse(rsp.body().contentType().type() + 
"/" + rsp.body().contentType().subtype(),
+
rsp.body().contentType().charset(Charset.defaultCharset()).toString(),
+getInputStream(rsp));
+} catch (Exception e) {
 L.e(e);
 }
 return null;
@@ -65,12 +67,14 @@
 
 try {
 Response rsp = request(request.getUrl().toString());
-return new WebResourceResponse(rsp.header(HEADER_CONTENT_TYPE),
-rsp.header(HEADER_CONTENT_ENCODING), rsp.code(),
+// noinspection ConstantConditions
+return new WebResourceResponse(rsp.body().contentType().type() + 
"/" + rsp.body().contentType().subtype(),
+
rsp.body().contentType().charset(Charset.defaultCharset()).toString(),
+rsp.code(),
 StringUtils.defaultIfBlank(rsp.message(), "Unknown error"),
 toMap(rsp.headers()),
 getInputStream(rsp));
-} catch (IOException e) {
+} catch (Exception e) {
 L.e(e);
 }
 return null;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e5417519e842995bb6a54a0ed6b22096827b67f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Bump versionCode.

2018-01-06 Thread Dbrant (Code Review)

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

Change subject: Bump versionCode.
..

Bump versionCode.

Change-Id: I9cb519cd40ba8e35989707a26efc47109efa387f
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/01/402601/1

diff --git a/app/build.gradle b/app/build.gradle
index 657c335..0c18a14 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,7 +55,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 19
 targetSdkVersion 27
-versionCode 222
+versionCode 223
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
 vectorDrawables.useSupportLibrary = true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cb519cd40ba8e35989707a26efc47109efa387f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Remove comments about partitioning on db2039

2018-01-06 Thread Jcrespo (Code Review)

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

Change subject: mariadb: Remove comments about partitioning on db2039
..

mariadb: Remove comments about partitioning on db2039

Partitions on db2039 have been removed, no need to warn about that
anymore.

Bug: T184090
Change-Id: I783c2110feac7bde47d0dba286cf3248f152b052
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index e324d44..6a15c87 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -157,7 +157,7 @@
'db2089:3315' => 1, # A3 3.3TB 512GB # rc, log: s5 and s6
],
's6' => [
-   'db2039'  => 0,   # C6 2.9TB 160GB, master, partitioned!
+   'db2039'  => 0,   # C6 2.9TB 160GB, master
'db2046'  => 400, # C6 2.9TB 160GB
'db2053'  => 100, # D6 2.9TB 160GB, dump (inactive), vslow
'db2060'  => 100, # D6 3.3TB 160GB, api

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I783c2110feac7bde47d0dba286cf3248f152b052
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

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

[MediaWiki-commits] [Gerrit] mediawiki...Mailgun[master]: Codestyle fixes

2018-01-06 Thread D3r1ck01 (Code Review)

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

Change subject: Codestyle fixes
..

Codestyle fixes

Change-Id: I1c1628065c9c27483a456147109ed64a6fbd9251
---
M MailgunHooks.php
1 file changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/MailgunHooks.php b/MailgunHooks.php
index ef86270..8eb3145 100644
--- a/MailgunHooks.php
+++ b/MailgunHooks.php
@@ -36,7 +36,11 @@
 * @throws Exception
 */
public static function onAlternateUserMailer(
-   array $headers, array $to, MailAddress $from, $subject, $body
+   array $headers,
+   array $to,
+   MailAddress $from,
+   $subject,
+   $body
) {
$conf = RequestContext::getMain()->getConfig();
$client = new \Http\Adapter\Guzzle6\Client();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c1628065c9c27483a456147109ed64a6fbd9251
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Mailgun
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 

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

[MediaWiki-commits] [Gerrit] mediawiki...AJAXPoll[master]: Replace deprecated Parser::disableCache() function

2018-01-06 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated Parser::disableCache() function
..

Replace deprecated Parser::disableCache() function

Deprecated in 1.28 in favor of CacheTime::updateCacheExpiry().

Change-Id: Iaffa63bb8e90e4d5853e47a59133d5b720ce89b1
---
M includes/AJAXPoll.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AJAXPoll 
refs/changes/97/402597/1

diff --git a/includes/AJAXPoll.class.php b/includes/AJAXPoll.class.php
index de2c3f2..cc22178 100644
--- a/includes/AJAXPoll.class.php
+++ b/includes/AJAXPoll.class.php
@@ -31,7 +31,7 @@
static function AJAXPollRender( $input, $args = [], Parser $parser, 
$frame ) {
global $wgUser, $wgRequest, $wgUseAjax;
 
-   $parser->disableCache();
+   $parser->getOutput()->updateCacheExpiry( 0 );
$parser->addTrackingCategory( 'ajaxpoll-tracking-category' );
$parser->getOutput()->addModules( 'ext.ajaxpoll' );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaffa63bb8e90e4d5853e47a59133d5b720ce89b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...CongressLookup[master]: Using the extension registration (extension.json)

2018-01-06 Thread LukBukkit (Code Review)

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

Change subject: Using the extension registration (extension.json)
..

Using the extension registration (extension.json)

Bug: T184346
Change-Id: I70bdd3e21520e1f900fa29d4ea70dee2186916eb
---
M CongressLookup.php
A CongressLookupHooks.php
A extension.json
3 files changed, 92 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CongressLookup 
refs/changes/96/402596/1

diff --git a/CongressLookup.php b/CongressLookup.php
index 54c6cf8..8c54ab0 100644
--- a/CongressLookup.php
+++ b/CongressLookup.php
@@ -22,6 +22,20 @@
  * @author Ryan Kaldari
  */
 
+# Warn users if they using the old entry point and a MediaWiki with the new 
extension registration
+if ( function_exists( 'wfLoadExtension' ) ) {
+wfLoadExtension( 'CongressLookup' );
+// Keep i18n globals so mergeMessageFileList.php doesn't break
+$wgMessagesDirs['FooBar'] = __DIR__ . '/i18n';
+$wgExtensionMessagesFiles['FooBarAlias'] = __DIR__ . '/FooBar.alias.php';
+wfWarn(
+'Deprecated PHP entry point used for the FooBar extension. ' .
+'Please use wfLoadExtension instead, ' .
+'see https://www.mediawiki.org/wiki/Extension_registration for more 
details.'
+);
+return;
+}
+
 # Alert the user that this is not a valid entry point to MediaWiki if they try 
to access the special pages file directly.
 if ( !defined( 'MEDIAWIKI' ) ) {
echo <addExtensionUpdate( array( 'addTable', 'cl_errors',
-   dirname( __FILE__ ) . 
'/patches/CongressDataErrors.sql', true ) );
-   }
-   return true;
-}
+$wgHooks['LoadExtensionSchemaUpdates'][] = 'CongressLookupHooks::schemaUpdate';
diff --git a/CongressLookupHooks.php b/CongressLookupHooks.php
new file mode 100644
index 000..9d8614f
--- /dev/null
+++ b/CongressLookupHooks.php
@@ -0,0 +1,26 @@
+addExtensionUpdate( array( 'addTable', 'cl_senate',
+dirname( __FILE__ ) . '/patches/CongressLookup.sql', true ) );
+$updater->addExtensionUpdate( array( 'addTable', 'cl_errors',
+dirname( __FILE__ ) . '/patches/CongressDataErrors.sql', true 
) );
+}
+return true;
+}
+
+}
\ No newline at end of file
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..a7b483a
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,50 @@
+{
+   "name": "CongressLookup",
+   "version": "1.1.0",
+   "author": [
+   "Ryan Kaldari"
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:CongressLookup;,
+   "descriptionmsg": "congresslookup-desc",
+   "type": "specialpage",
+   "APIModules": {
+   "congresslookup": "ApiCongressLookup"
+   },
+   "SpecialPages": {
+   "CongressLookup": "SpecialCongressLookup",
+   "CongressFail": "SpecialCongressFail"
+   },
+   "MessagesDirs": {
+   "CongressLookup": [
+   "i18n"
+   ]
+   },
+   "ExtensionMessagesFiles": {
+   "CongressLookupAlias": "CongressLookup.alias.php"
+   },
+   "AutoloadClasses": {
+   "ApiCongressLookup": "ApiCongressLookup.php",
+   "CongressLookupHooks": "CongressLookupHooks.php",
+   "SpecialCongressLookup": "SpecialCongressLookup.php",
+   "SpecialCongressFail": "SpecialCongressFail.php",
+   "CongressLookupDB": "CongressLookup.db.php"
+   },
+   "Hooks": {
+   "LoadExtensionSchemaUpdates": 
"CongressLookupHooks::schemaUpdate"
+   },
+   "config": {
+   "CongressLookupSharedMaxAge": {
+   "value": 1200
+   },
+   "CongressLookupMaxAge": {
+   "value": 600
+   },
+   "CongressLookupErrorPage": {
+   "value": "CongressFail"
+   },
+   "CongressLookupBlackOnWhite": {
+   "value": false
+   }
+   },
+   "manifest_version": 2
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70bdd3e21520e1f900fa29d4ea70dee2186916eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CongressLookup
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/vagrant[stretch-migration]: varnish: Fix ::forwarded_port references

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: varnish: Fix ::forwarded_port references
..


varnish: Fix ::forwarded_port references

Change-Id: I2cacfc98951542b32d6643b67831d3dc89aeaa7b
---
M puppet/modules/varnish/templates/default-subs.vcl.erb
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/puppet/modules/varnish/templates/default-subs.vcl.erb 
b/puppet/modules/varnish/templates/default-subs.vcl.erb
index d164e41..7b8ef7d 100644
--- a/puppet/modules/varnish/templates/default-subs.vcl.erb
+++ b/puppet/modules/varnish/templates/default-subs.vcl.erb
@@ -7,8 +7,8 @@
 # Since we expose varnish on the default port (6081) we need to rewrite
 # requests that are generated using the default wiki port (8080)
 # This needs to be done early because it's needed for PURGE calls
-if (req.url ~ ":<%= scope[':forwarded_port'] %>") {
-set req.url = regsub(req.url, "(.*):<%= scope[':forwarded_port'] 
%>/(.*)", "\1:6081/\2");
+if (req.url ~ ":<%= scope['::forwarded_port'] %>") {
+set req.url = regsub(req.url, "(.*):<%= scope['::forwarded_port'] 
%>/(.*)", "\1:6081/\2");
 }
 
 # This uses the ACL action called "purge". Basically if a request to

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2cacfc98951542b32d6643b67831d3dc89aeaa7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
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/vagrant[stretch-migration]: nginx: define $::realm

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: nginx: define $::realm
..


nginx: define $::realm

Change-Id: I6373c10963d88e9434f84ee22c2ff6c5e52fa4ae
---
M puppet/manifests/site.pp
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index a71ba7f..14a1266 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -23,6 +23,10 @@
 $load_later  = 15
 $load_last   = 20
 
+# Declare global '$::realm' for modules that are shared with Wikimedia's
+# operations/puppet.git tree (e.g. nginx).
+$realm = 'vagrant'
+
 # Declares a default search path for executables, allowing the path to
 # be omitted from individual resources. Also configures Puppet to log
 # the command's output if it was unsuccessful. Finally, set timeout to

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6373c10963d88e9434f84ee22c2ff6c5e52fa4ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
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/vagrant[stretch-migration]: math: Install texlive-fonts-all

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: math: Install texlive-fonts-all
..


math: Install texlive-fonts-all

Install TEX fonts via the texlive-fonts-all omnibus package rather than
cherry-picking font packages which may change names from release to
release.

Change-Id: Iea87244fffd0ec7c1868692abb330a659b866a49
---
M puppet/modules/role/manifests/math.pp
1 file changed, 3 insertions(+), 23 deletions(-)

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



diff --git a/puppet/modules/role/manifests/math.pp 
b/puppet/modules/role/manifests/math.pp
index 67b4b73..4d09ddc 100644
--- a/puppet/modules/role/manifests/math.pp
+++ b/puppet/modules/role/manifests/math.pp
@@ -13,40 +13,20 @@
 browser_tests => true,
 }
 
-package { [
+require_package(
 'ocaml-native-compilers',
 'texlive',
 'texlive-bibtex-extra',
 'texlive-font-utils',
 'texlive-fonts-extra',
-'texlive-lang-croatian',
-'texlive-lang-cyrillic',
-'texlive-lang-czechslovak',
-'texlive-lang-danish',
-'texlive-lang-dutch',
-'texlive-lang-finnish',
-'texlive-lang-french',
-'texlive-lang-german',
-'texlive-lang-greek',
-'texlive-lang-hungarian',
-'texlive-lang-italian',
-'texlive-lang-latin',
-'texlive-lang-mongolian',
-'texlive-lang-norwegian',
-'texlive-lang-other',
-'texlive-lang-polish',
-'texlive-lang-portuguese',
-'texlive-lang-spanish',
-'texlive-lang-swedish',
-'texlive-lang-vietnamese',
+'texlive-lang-all',
 'texlive-latex-extra',
 'texlive-math-extra',
 'texlive-pictures',
 'texlive-pstricks',
 'texlive-publishers',
 'texlive-generic-extra'
-]:
-}
+)
 
 exec { 'compile_texvc':
 command => 'make',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea87244fffd0ec7c1868692abb330a659b866a49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
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...codesniffer[master]: Expand sniff to replace some php aliases with main function

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Expand sniff to replace some php aliases with main function
..


Expand sniff to replace some php aliases with main function

- is_writeable => is_writable
- join => implode
- key_exists => array_key_exists
- pos => current
- sizeof => count

Bug: T183220
Change-Id: I0bc74cd3556f1cae513f1bc28cefae16c39a43a5
---
M MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
M utils/bootstrap-ci.php
2 files changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified
  Thiemo Kreuz (WMDE): Looks good to me, but someone else must approve



diff --git a/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php 
b/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
index d607ea8..048a688 100644
--- a/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
+++ b/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
@@ -32,6 +32,11 @@
 */
private $functions = [
'is_integer' => 'is_int',
+   'is_writeable' => 'is_writable',
+   'join' => 'implode',
+   'key_exists' => 'array_key_exists',
+   'pos' => 'current',
+   'sizeof' => 'count',
'extract' => false,
// Deprecated in PHP 7.2
'create_function' => false,
diff --git a/utils/bootstrap-ci.php b/utils/bootstrap-ci.php
index 1ab6920..6c1e4da 100644
--- a/utils/bootstrap-ci.php
+++ b/utils/bootstrap-ci.php
@@ -61,8 +61,8 @@
unset( $_return );
return;
}
-   $_prev_composer = json_decode( join( '', $_prev_composer ), true );
-   $_cur_composer = json_decode( join( '', $_cur_composer ), true );
+   $_prev_composer = json_decode( implode( '', $_prev_composer ), true );
+   $_cur_composer = json_decode( implode( '', $_cur_composer ), true );
if ( $_prev_composer['require-dev']['mediawiki/mediawiki-codesniffer']
!== 
$_cur_composer['require-dev']['mediawiki/mediawiki-codesniffer']
) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bc74cd3556f1cae513f1bc28cefae16c39a43a5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
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/vagrant[stretch-migration]: varnish: Fix ::forwarded_port references

2018-01-06 Thread BryanDavis (Code Review)

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

Change subject: varnish: Fix ::forwarded_port references
..

varnish: Fix ::forwarded_port references

Change-Id: I2cacfc98951542b32d6643b67831d3dc89aeaa7b
---
M puppet/modules/varnish/templates/default-subs.vcl.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/94/402594/1

diff --git a/puppet/modules/varnish/templates/default-subs.vcl.erb 
b/puppet/modules/varnish/templates/default-subs.vcl.erb
index d164e41..7b8ef7d 100644
--- a/puppet/modules/varnish/templates/default-subs.vcl.erb
+++ b/puppet/modules/varnish/templates/default-subs.vcl.erb
@@ -7,8 +7,8 @@
 # Since we expose varnish on the default port (6081) we need to rewrite
 # requests that are generated using the default wiki port (8080)
 # This needs to be done early because it's needed for PURGE calls
-if (req.url ~ ":<%= scope[':forwarded_port'] %>") {
-set req.url = regsub(req.url, "(.*):<%= scope[':forwarded_port'] 
%>/(.*)", "\1:6081/\2");
+if (req.url ~ ":<%= scope['::forwarded_port'] %>") {
+set req.url = regsub(req.url, "(.*):<%= scope['::forwarded_port'] 
%>/(.*)", "\1:6081/\2");
 }
 
 # This uses the ACL action called "purge". Basically if a request to

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cacfc98951542b32d6643b67831d3dc89aeaa7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: math: Install texlive-fonts-all

2018-01-06 Thread BryanDavis (Code Review)

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

Change subject: math: Install texlive-fonts-all
..

math: Install texlive-fonts-all

Install TEX fonts via the texlive-fonts-all omnibus package rather than
cherry-picking font packages which may change names from release to
release.

Change-Id: Iea87244fffd0ec7c1868692abb330a659b866a49
---
M puppet/modules/role/manifests/math.pp
1 file changed, 3 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/93/402593/1

diff --git a/puppet/modules/role/manifests/math.pp 
b/puppet/modules/role/manifests/math.pp
index 67b4b73..4d09ddc 100644
--- a/puppet/modules/role/manifests/math.pp
+++ b/puppet/modules/role/manifests/math.pp
@@ -13,40 +13,20 @@
 browser_tests => true,
 }
 
-package { [
+require_package(
 'ocaml-native-compilers',
 'texlive',
 'texlive-bibtex-extra',
 'texlive-font-utils',
 'texlive-fonts-extra',
-'texlive-lang-croatian',
-'texlive-lang-cyrillic',
-'texlive-lang-czechslovak',
-'texlive-lang-danish',
-'texlive-lang-dutch',
-'texlive-lang-finnish',
-'texlive-lang-french',
-'texlive-lang-german',
-'texlive-lang-greek',
-'texlive-lang-hungarian',
-'texlive-lang-italian',
-'texlive-lang-latin',
-'texlive-lang-mongolian',
-'texlive-lang-norwegian',
-'texlive-lang-other',
-'texlive-lang-polish',
-'texlive-lang-portuguese',
-'texlive-lang-spanish',
-'texlive-lang-swedish',
-'texlive-lang-vietnamese',
+'texlive-lang-all',
 'texlive-latex-extra',
 'texlive-math-extra',
 'texlive-pictures',
 'texlive-pstricks',
 'texlive-publishers',
 'texlive-generic-extra'
-]:
-}
+)
 
 exec { 'compile_texvc':
 command => 'make',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea87244fffd0ec7c1868692abb330a659b866a49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: nginx: define $::realm

2018-01-06 Thread BryanDavis (Code Review)

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

Change subject: nginx: define $::realm
..

nginx: define $::realm

Change-Id: I6373c10963d88e9434f84ee22c2ff6c5e52fa4ae
---
M puppet/manifests/site.pp
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/95/402595/1

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index a71ba7f..14a1266 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -23,6 +23,10 @@
 $load_later  = 15
 $load_last   = 20
 
+# Declare global '$::realm' for modules that are shared with Wikimedia's
+# operations/puppet.git tree (e.g. nginx).
+$realm = 'vagrant'
+
 # Declares a default search path for executables, allowing the path to
 # be omitted from individual resources. Also configures Puppet to log
 # the command's output if it was unsuccessful. Finally, set timeout to

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6373c10963d88e9434f84ee22c2ff6c5e52fa4ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Set timezone

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Set timezone
..


Set timezone

Bug: T184215
Change-Id: I16067dba5dc586a77c8f70b28d8bb21b78cd964a
---
M puppet/hieradata/common.yaml
M puppet/modules/mwv/manifests/init.pp
M puppet/modules/mwv/manifests/packages.pp
3 files changed, 30 insertions(+), 0 deletions(-)

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



diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 2ef5d23..fabf5cf 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -259,6 +259,7 @@
 mwv::services_dir: /vagrant/srv
 mwv::vendor_dir: /srv
 mwv::tld: '.local.wmftest.net'
+mwv::timezone: Etc/UTC
 mwv::cachefilesd::enable: true
 
 nginx::variant: extras
diff --git a/puppet/modules/mwv/manifests/init.pp 
b/puppet/modules/mwv/manifests/init.pp
index 9c19aa1..6b55118 100644
--- a/puppet/modules/mwv/manifests/init.pp
+++ b/puppet/modules/mwv/manifests/init.pp
@@ -21,12 +21,16 @@
 #   Top level domain to use when creating hostnames. Value should include
 #   leading '.' (example: '.local.wmftest.net').
 #
+# [*timezone*]
+#   Timezone for the VM. (example: 'Etc/UTC')
+#
 class mwv (
 $files_dir,
 $etc_dir,
 $services_dir,
 $vendor_dir,
 $tld,
+$timezone,
 ) {
 include ::apt
 include ::env
@@ -65,4 +69,28 @@
 } -> File <| |>
 }
 
+# Why is this so hard?
+$tzparts = split($timezone, '/')
+$tzarea = $tzparts[0]
+$tzzone = $tzparts[1]
+exec { 'debconf tzarea':
+command => "/bin/echo tzdata tzdata/Areas select ${tzarea} | 
/usr/bin/debconf-set-selections",
+unless  => "/usr/bin/debconf-get-selections | /bin/grep -q -E 
\"^tzdata\\s+tzdata/Areas\\s+select\\s+${tzarea}\"",
+before  => Package['tzdata'],
+}
+exec { 'debconf tzzone':
+command => "/bin/echo tzdata tzdata/Zones/${tzarea} select ${timezone} 
| /usr/bin/debconf-set-selections",
+unless  => "/usr/bin/debconf-get-selections | /bin/grep -q -E 
\"^tzdata\\s+tzdata/Zones/${tzarea}\\s+select\\s+${timezone}\"",
+before  => Package['tzdata'],
+}
+file { '/etc/localtime':
+ensure  => 'link',
+target  => "/usr/share/zoneinfo/${timezone}",
+require => Package['tzdata'],
+}
+file { '/etc/timezone':
+ensure  => 'present',
+content => $timezone,
+require => Package['tzdata'],
+}
 }
diff --git a/puppet/modules/mwv/manifests/packages.pp 
b/puppet/modules/mwv/manifests/packages.pp
index f85d745..b3a1c05 100644
--- a/puppet/modules/mwv/manifests/packages.pp
+++ b/puppet/modules/mwv/manifests/packages.pp
@@ -15,6 +15,7 @@
 'gdb',
 'python-dev',
 'ruby-dev',
+'tzdata',
 )
 
 # Cron resources need a cron provider installed

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I16067dba5dc586a77c8f70b28d8bb21b78cd964a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Reedy 
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/vagrant[stretch-migration]: mysql: remove unnecessary -p${mysql::root_password} usage

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: mysql: remove unnecessary -p${mysql::root_password} usage
..


mysql: remove unnecessary -p${mysql::root_password} usage

The root user is setup to use unix auth rather than password auth, so
passing a password to /usr/bin/mysql is unnecessary.

Bug: T51652
Change-Id: Ibf27465c901efa341241f210d526eb10684eeb33
---
M puppet/modules/crm/manifests/dash.pp
M puppet/modules/role/manifests/ores.pp
M puppet/modules/smashpig/manifests/init.pp
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/puppet/modules/crm/manifests/dash.pp 
b/puppet/modules/crm/manifests/dash.pp
index 30371c3..5070bab 100644
--- a/puppet/modules/crm/manifests/dash.pp
+++ b/puppet/modules/crm/manifests/dash.pp
@@ -34,7 +34,7 @@
 }
 
 exec { 'dash_schema':
-command => "cat ${fundraising_dash_dir}/schema/*.sql | /usr/bin/mysql 
-u root -p${mysql::root_password} fredge -qfsA",
+command => "cat ${fundraising_dash_dir}/schema/*.sql | /usr/bin/mysql 
fredge -qfsA",
 require => [
 File['dash_settings_js'],
 Mysql::Db['fredge'],
diff --git a/puppet/modules/role/manifests/ores.pp 
b/puppet/modules/role/manifests/ores.pp
index 338a8a2..ae9555e 100644
--- a/puppet/modules/role/manifests/ores.pp
+++ b/puppet/modules/role/manifests/ores.pp
@@ -27,7 +27,7 @@
 
 mediawiki::maintenance { 'check ORES model versions':
 command => '/usr/local/bin/mwscript 
extensions/ORES/maintenance/CheckModelVersions.php --wiki=wiki',
-unless  => "/usr/bin/mysql -u root -p${::mysql::root_password} -e 
'select * from ores_model' wiki | /bin/grep -q 'damaging'",
+unless  => "/usr/bin/mysql -e 'select * from ores_model' wiki | 
/bin/grep -q 'damaging'",
 require => Mediawiki::Extension['ORES'],
 }
 
diff --git a/puppet/modules/smashpig/manifests/init.pp 
b/puppet/modules/smashpig/manifests/init.pp
index 62feda9..3cf65d8 100644
--- a/puppet/modules/smashpig/manifests/init.pp
+++ b/puppet/modules/smashpig/manifests/init.pp
@@ -64,7 +64,7 @@
 mysql::db { 'smashpig': }
 
 exec { 'smashpig_schema':
-command => "cat ${dir}/Schema/mysql/*.sql | /usr/bin/mysql -uroot 
-p${mysql::root_password} smashpig -qfsA",
+command => "cat ${dir}/Schema/mysql/*.sql | /usr/bin/mysql smashpig 
-qfsA",
 require => [
 Git::Clone['wikimedia/fundraising/SmashPig'],
 Mysql::Db['smashpig'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf27465c901efa341241f210d526eb10684eeb33
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Ejegg 
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...SocialProfile[master]: Avoid use of $wgLang global in UserProfilePage

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Avoid use of $wgLang global in UserProfilePage
..


Avoid use of $wgLang global in UserProfilePage

Change-Id: I18b5d7b60e5e22830679c8b163a2b65ef783d6b8
---
M UserProfile/UserProfilePage.php
1 file changed, 16 insertions(+), 10 deletions(-)

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



diff --git a/UserProfile/UserProfilePage.php b/UserProfile/UserProfilePage.php
index 53a5b75..043180f 100644
--- a/UserProfile/UserProfilePage.php
+++ b/UserProfile/UserProfilePage.php
@@ -161,9 +161,11 @@
function getUserStatsRow( $label, $value ) {
$output = ''; // Prevent E_NOTICE
 
+   $context = $this->getContext();
+   $language = $context->getLanguage();
+
if ( $value != 0 ) {
-   global $wgLang;
-   $formattedValue = $wgLang->formatNum( $value );
+   $formattedValue = $language->formatNum( $value );
$output = "
{$label}
{$formattedValue}
@@ -918,10 +920,11 @@
 * @param $user_name String: user name
 */
function getProfileTop( $user_id, $user_name ) {
-   global $wgLang, $wgUserLevels;
+   global $wgUserLevels;
 
$context = $this->getContext();
$userContext = $context->getUser();
+   $language = $context->getLanguage();
 
$stats = new UserStats( $user_id, $user_name );
$stats_data = $stats->getUserStats();
@@ -994,7 +997,7 @@
' .
wfMessage(
'user-profile-points',
-   $wgLang->formatNum( 
$stats_data['points'] )
+   $language->formatNum( 
$stats_data['points'] )
)->escaped() .
'

@@ -1007,7 +1010,7 @@
';
 
if ( $this->isOwner() ) {
-   $output .= $wgLang->pipeList( array(
+   $output .= $language->pipeList( array(
'' . wfMessage( 'user-edit-profile' 
)->escaped() . '',
'' . wfMessage( 'user-upload-avatar' 
)->escaped() . '',
'' . wfMessage( 'user-watchlist' )->escaped() . 
'',
@@ -1015,20 +1018,20 @@
) );
} elseif ( $userContext->isLoggedIn() ) {
if ( $relationship == false ) {
-   $output .= $wgLang->pipeList( array(
+   $output .= $language->pipeList( array(
'' . wfMessage( 'user-add-friend' )->escaped() . '',
'' . wfMessage( 'user-add-foe' )->escaped() . '',
''
) );
} else {
if ( $relationship == 1 ) {
-   $output .= $wgLang->pipeList( array(
+   $output .= $language->pipeList( array(
'' . wfMessage( 
'user-remove-friend' )->escaped() . '',
''
) );
}
if ( $relationship == 2 ) {
-   $output .= $wgLang->pipeList( array(
+   $output .= $language->pipeList( array(
'' . wfMessage( 
'user-remove-foe' )->escaped() . '',
''
) );
@@ -1114,7 +1117,10 @@
 *   foes
 */
function getRelationships( $user_name, $rel_type ) {
-   global $wgMemc, $wgUserProfileDisplay, $wgLang;
+   global $wgMemc, $wgUserProfileDisplay;
+
+   $context = $this->getContext();
+   $language = $context->getLanguage();
 
// If not enabled in site settings, don't display
if ( $rel_type == 1 ) {
@@ -1186,7 +1192,7 @@
$avatar = new wAvatar( $friend['user_id'], 'ml' 
);
 
// Chop down username that gets displayed
-   $user_name = $wgLang->truncate(

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Use moment’s relative time for “x seconds ago” message

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Use moment’s relative time for “x seconds ago” message
..


Use moment’s relative time for “x seconds ago” message

Formatting the duration stand-alone and then appending some string does
not always yield correct results. For example, in German, the
stand-alone duration is in the nominative case („eine Minute“), but the
suffix requires the dative case („vor einer Minute“, not „vor eine
Minute“). Moment.js can fix this for us; unfortunately, it requires an
incompatible change to the message (Moment.js already adds the “ago”, so
we can’t have it in the message), so the message key is changed and we
lose all existing translations.

Change-Id: I08fd2133a1cd772e844fa4b73c5a9673662f6945
---
M i18n/en.json
M i18n/qqq.json
M wikibase/queryService/ui/App.js
3 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 9c2679a..c82a4ed 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -35,7 +35,7 @@
 "wdqs-app-help-copy": "Licensing information",
 "wdqs-app-help-queryhelper": "Query Helper",
 "wdqs-app-footer-help": "Press [CTRL-SPACE] to activate auto 
completion.",
-"wdqs-app-footer-updated": "Data updated $1 ago",
+"wdqs-app-footer-updated-ago": "Data updated $1",
 "wdqs-app-result-shorturl": "Short URL to result",
 "wdqs-app-result-shorturl-title": "Short URL to this result",
 "wdqs-app-result-rawgraphs": "Open in RAWGraphs.io",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 63ab7ba..89f9246 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -37,7 +37,7 @@
"wdqs-app-help-copy": "Link to page with licensing information",
"wdqs-app-help-queryhelper": "Heading of the Query Helper widget",
"wdqs-app-footer-help": "Help message at the footer of the editor",
-   "wdqs-app-footer-updated": "Message displaying how long ago data was 
updated",
+   "wdqs-app-footer-updated-ago": "Message displaying how long ago data 
was updated. $1 contains the time period, including a suffix indicating that 
the period is in the past, e.g. “a few seconds ago” or “two minutes 
ago”.",
"wdqs-app-result-shorturl": "Link message in the footer link dropdown",
"wdqs-app-result-shorturl-title": "Title of link message in the footer 
link dropdown",
"wdqs-app-result-rawgraphs": "Link message in the footer link dropdown",
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 6f60eb4..6a7dcb8 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -447,7 +447,7 @@
 
var e = $( this );
self._sparqlApi.queryDataUpdatedTime().done( function( 
time, difference ) {
-   var text = moment.duration( difference, 
'seconds' ).humanize(),
+   var text = moment.duration( -difference, 
'seconds' ).humanize( true ),
title = time,
badge = '' + text + 
'';
 
@@ -456,7 +456,7 @@
html: true,
trigger: 'hover',
placement: 'top',
-   content: $.i18n( 
'wdqs-app-footer-updated', badge )
+   content: $.i18n( 
'wdqs-app-footer-updated-ago', badge )
} );
} ).fail( function() {
e.popover( {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I08fd2133a1cd772e844fa4b73c5a9673662f6945
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Smalyshev 
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...Flow[master]: Type hint against DbFactory instead of IDatabase

2018-01-06 Thread Thiemo Kreuz (WMDE) (Code Review)

Thiemo Kreuz (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402592 )

Change subject: Type hint against DbFactory instead of IDatabase
..

Type hint against DbFactory instead of IDatabase

Change-Id: I0bca260618a8f199a4206af145a6746582d6d714
---
M Hooks.php
M maintenance/FlowAddMissingModerationLogs.php
M maintenance/FlowExternalStoreMoveCluster.php
M maintenance/FlowFixUserIp.php
M maintenance/FlowFixWorkflowLastUpdateTimestamp.php
M maintenance/FlowPopulateLinksTables.php
M maintenance/FlowSetUserIp.php
M maintenance/FlowUpdateRevisionTypeId.php
M tests/phpunit/Repository/TreeRepositoryDbTest.php
9 files changed, 17 insertions(+), 5 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
index 249323b..e81bab1 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -3,6 +3,7 @@
 use Flow\Collection\PostCollection;
 use Flow\Container;
 use Flow\Conversion\Utils;
+use Flow\DbFactory;
 use Flow\Exception\FlowException;
 use Flow\Exception\PermissionException;
 use Flow\Data\Listener\RecentChangesListener;
@@ -14,7 +15,6 @@
 use Flow\TalkpageManager;
 use Flow\WorkflowLoader;
 use Flow\WorkflowLoaderFactory;
-use Wikimedia\Rdbms\IDatabase;
 
 class FlowHooks {
/**
@@ -1869,8 +1869,8 @@
return true;
}
 
+   /** @var DbFactory $dbFactory */
$dbFactory = Container::get( 'db.factory' );
-   /** @var IDatabase $dbr */
$dbr = $dbFactory->getDB( DB_REPLICA );
 
// if a username is specified, search only for that user
diff --git a/maintenance/FlowAddMissingModerationLogs.php 
b/maintenance/FlowAddMissingModerationLogs.php
index 1ae3807..24f4244 100644
--- a/maintenance/FlowAddMissingModerationLogs.php
+++ b/maintenance/FlowAddMissingModerationLogs.php
@@ -1,9 +1,9 @@
 getDb( DB_MASTER );
 
$storage = $container['storage'];
diff --git a/maintenance/FlowExternalStoreMoveCluster.php 
b/maintenance/FlowExternalStoreMoveCluster.php
index 107df68..192aca2 100644
--- a/maintenance/FlowExternalStoreMoveCluster.php
+++ b/maintenance/FlowExternalStoreMoveCluster.php
@@ -1,6 +1,7 @@
 storage = $storage = Container::get( 'storage' );
+   /** @var DbFactory $dbf */
$dbf = Container::get( 'db.factory' );
-   /** @var IDatabase $dbw */
$dbw = $dbf->getDB( DB_MASTER );
 
$runUpdate = function ( $callback ) use ( $dbf, $dbw, $storage 
) {
diff --git a/maintenance/FlowFixWorkflowLastUpdateTimestamp.php 
b/maintenance/FlowFixWorkflowLastUpdateTimestamp.php
index e02857a..ee08ee0 100644
--- a/maintenance/FlowFixWorkflowLastUpdateTimestamp.php
+++ b/maintenance/FlowFixWorkflowLastUpdateTimestamp.php
@@ -2,6 +2,7 @@
 
 use Flow\Container;
 use Flow\Data\ManagerGroup;
+use Flow\DbFactory;
 use Flow\Exception\FlowException;
 use Flow\Model\AbstractRevision;
 use Flow\Model\PostRevision;
@@ -36,6 +37,7 @@
public function execute() {
global $wgFlowCluster;
 
+   /** @var DbFactory $dbFactory */
$dbFactory = Container::get( 'db.factory' );
$storage = Container::get( 'storage' );
$rootPostLoader = Container::get( 'loader.root_post' );
diff --git a/maintenance/FlowPopulateLinksTables.php 
b/maintenance/FlowPopulateLinksTables.php
index 769c644..4f0b09a 100644
--- a/maintenance/FlowPopulateLinksTables.php
+++ b/maintenance/FlowPopulateLinksTables.php
@@ -1,6 +1,7 @@
 mBatchSize;
$id = '';
+   /** @var DbFactory $dbf */
$dbf = Container::get( 'db.factory' );
$dbr = $dbf->getDB( DB_REPLICA );
while ( $count === $this->mBatchSize ) {
diff --git a/maintenance/FlowSetUserIp.php b/maintenance/FlowSetUserIp.php
index f32541c..bbb25fa 100644
--- a/maintenance/FlowSetUserIp.php
+++ b/maintenance/FlowSetUserIp.php
@@ -1,6 +1,7 @@
 getDB( DB_MASTER );
$hasRun = false;
diff --git a/maintenance/FlowUpdateRevisionTypeId.php 
b/maintenance/FlowUpdateRevisionTypeId.php
index d9e7dbd..0ac5ae3 100644
--- a/maintenance/FlowUpdateRevisionTypeId.php
+++ b/maintenance/FlowUpdateRevisionTypeId.php
@@ -1,6 +1,7 @@
 mBatchSize;
+   /** @var DbFactory $dbFactory */
$dbFactory = Container::get( 'db.factory' );
$dbr = $dbFactory->getDB( DB_REPLICA );
$dbw = $dbFactory->getDB( DB_MASTER );
diff --git a/tests/phpunit/Repository/TreeRepositoryDbTest.php 
b/tests/phpunit/Repository/TreeRepositoryDbTest.php
index cb34482..b195aab 100644
--- a/tests/phpunit/Repository/TreeRepositoryDbTest.php
+++ b/tests/phpunit/Repository/TreeRepositoryDbTest.php
@@ -26,6 +26,7 @@
$cache[] = $this->getCache();
$cache[] = $this->getCache();

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: imagecopy: Convert to use requests

2018-01-06 Thread Rafidaslam (Code Review)

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

Change subject: imagecopy: Convert to use requests
..

imagecopy: Convert to use requests

Convert scripts/imagecopy.py to use `requests`
instead of `urllib`.

Also removes `url` parameter from `pageTextPost()`
since it's not used anywhere in the function.

Bug: T130523
Change-Id: I278081b24ff265a43c37372cd26f6fbae1c3b44e
---
M scripts/imagecopy.py
1 file changed, 7 insertions(+), 12 deletions(-)


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

diff --git a/scripts/imagecopy.py b/scripts/imagecopy.py
index 377f3c6..02134a5 100644
--- a/scripts/imagecopy.py
+++ b/scripts/imagecopy.py
@@ -65,6 +65,7 @@
 import socket
 import threading
 import webbrowser
+import requests
 
 import pywikibot
 
@@ -77,13 +78,8 @@
 
 if not PY2:
 import tkinter as Tkinter
-
-from urllib.parse import urlencode
-from urllib.request import urlopen
 else:
 import Tkinter
-
-from urllib import urlencode, urlopen
 
 try:
 from pywikibot.userinterfaces.gui import Tkdialog
@@ -203,14 +199,15 @@
 }
 
 
-def pageTextPost(url, parameters):
+def pageTextPost(parameters):
 """Get data from commons helper page."""
 gotInfo = False
 while not gotInfo:
 try:
-commonsHelperPage = urlopen(
-"http://tools.wmflabs.org/commonshelper/index.php;, parameters)
-data = commonsHelperPage.read().decode('utf-8')
+commonsHelperPage = requests.post(
+"https://tools.wmflabs.org/commonshelper/index.php;,
+data=parameters)
+data = commonsHelperPage.content.decode('utf-8')
 gotInfo = True
 except IOError:
 pywikibot.output(u'Got an IOError, let\'s try again')
@@ -246,10 +243,8 @@
   'doit': 'Uitvoeren'
   }
 
-tosend = urlencode(tosend)
 pywikibot.output(tosend)
-CH = pageTextPost('http://tools.wmflabs.org/commonshelper/index.php',
-  tosend)
+CH = pageTextPost(tosend)
 pywikibot.output('Got CH desc.')
 
 tablock = CH.split('')[0]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I278081b24ff265a43c37372cd26f6fbae1c3b44e
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...Score[master]: Use MP3 with LAME instead of OGG for MIDI conversion

2018-01-06 Thread Divadsn (Code Review)

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

Change subject: Use MP3 with LAME instead of OGG for MIDI conversion
..

Use MP3 with LAME instead of OGG for MIDI conversion

Bug: T181875
Change-Id: I4b87d0bb665e824fe934d714bf2e282b1bbe8318
---
M includes/Score.php
1 file changed, 10 insertions(+), 10 deletions(-)


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

diff --git a/includes/Score.php b/includes/Score.php
index dc90818..34b7a54 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -432,24 +432,24 @@
$existingFiles += self::generatePngAndMidi( 
$code, $options, $metaData );
}
 
-   /* Generate Ogg/Vorbis file if necessary */
-   if ( $options['generate_ogg'] ) {
+   /* Generate MP3 file if necessary */
+   if ( $options['generate_mp3'] ) {
if ( $options['override_midi'] ) {
-   $oggUrl = $options['audio_url'];
-   $oggPath = 
$options['audio_storage_path'];
+   $mp3Url = $options['audio_url'];
+   $mp3Path = 
$options['audio_storage_path'];
$exists = $backend->fileExists( [ 'src' 
=> $options['audio_storage_path'] ] );
if ( !$exists ) {
$backend->prepare( [ 'dir' => 
$options['audio_storage_dir'] ] );
$sourcePath = 
$options['midi_file']->getLocalRefPath();
-   self::generateOgg( $sourcePath, 
$options, $oggPath, $metaData );
+   self::generateMp3( $sourcePath, 
$options, $mp3Path, $metaData );
}
} else {
-   $oggFileName = 
"{$options['file_name_prefix']}.ogg";
-   $oggUrl = 
"{$options['dest_url']}/$oggFileName";
-   $oggPath = 
"{$options['dest_storage_path']}/$oggFileName";
+   $mp3FileName = 
"{$options['file_name_prefix']}.mp3";
+   $mp3Url = 
"{$options['dest_url']}/$mp3FileName";
+   $mp3Path = 
"{$options['dest_storage_path']}/$mp3FileName";
if (
-   !isset( 
$existingFiles[$oggFileName] ) ||
-   !isset( 
$metaData[$oggFileName]['length'] )
+   !isset( 
$existingFiles[$mp3FileName] ) ||
+   !isset( 
$metaData[$mp3FileName]['length'] )
) {
// Maybe we just generated it
$sourcePath = 
"{$options['factory_directory']}/file.midi";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b87d0bb665e824fe934d714bf2e282b1bbe8318
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Divadsn 

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

[MediaWiki-commits] [Gerrit] mediawiki...Special404[master]: Extension registration

2018-01-06 Thread Gabrielchihonglee (Code Review)

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

Change subject: Extension registration
..

Extension registration

Changing the plugin file to match with the latest extension registration 
requirements.

Bug: T184334
Change-Id: I50817616b7597e3d99de3371f599e63f482d5d3c
---
M Special404.php
1 file changed, 11 insertions(+), 37 deletions(-)


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

diff --git a/Special404.php b/Special404.php
index 4093780..47173f0 100644
--- a/Special404.php
+++ b/Special404.php
@@ -1,39 +1,13 @@
 https://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- * @link https://www.mediawiki.org/wiki/Extension:Special404 Documentation
- */
-
-// Ensure that the script cannot be executed outside of MediaWiki.
-if ( !defined( 'MEDIAWIKI' ) ) {
-die( 'This is an extension to MediaWiki and cannot be run standalone.' );
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'Special4040' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['CookieWarning'] = __DIR__ . '/i18n';
+   /* wfWarn(
+   'Deprecated PHP entry point used for CookieWarning extension. 
Please use wfLoadExtension' .
+   'instead, see 
https://www.mediawiki.org/wiki/Extension_registration for more details.'
+   ); */
+   return true;
+} else {
+   die( 'This version of the Special404  extension requires MediaWiki 
1.23+' );
 }
-
-// Display extension properties on MediaWiki.
-$wgExtensionCredits['specialpage'][] = array(
-   'path' => __FILE__,
-   'author' => 'Daniel Friesen',
-   'name' => 'Special404',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:Special404',
-   'descriptionmsg' => 'special404-desc',
-   'license-name' => 'GPL-2.0+',
-);
-
-// Register extension messages and other localisation.
-$wgMessagesDirs['Special404'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['Special404Alias'] = __DIR__ . 
'/Special404.alias.php';
-
-// Register special page with MediaWiki.
-$wgSpecialPages['Error404'] = 'Special404';
-
-// Load extension's classes.
-$wgAutoloadClasses['Special404'] = __DIR__ . '/Special404_body.php';
-
-// Enable this to force an automatic 301 Moved Permanently redirect if a 
matching title exists
-// This might be useful if you used to use root /Article urls and moved to 
something else
-$egSpecial404RedirectExistingRoots = false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50817616b7597e3d99de3371f599e63f482d5d3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Special404
Gerrit-Branch: master
Gerrit-Owner: Gabrielchihonglee 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: ModuleDeprecationWrapper._add_deprecated_attr: Delete existi...

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: ModuleDeprecationWrapper._add_deprecated_attr: Delete existing 
attribute
..


ModuleDeprecationWrapper._add_deprecated_attr: Delete existing attribute

In Python __getattr__ is only invoked if object does not have the requested
attribute. If the deprecated module has the attribute, then the __getattr__
method of ModuleDeprecationWrapper will not be invoked and therefore no
warning will be issued.

Bug: T184337
Change-Id: I4193481a0bd1b2fa310f15a8bddb7a4e2f090134
---
M pywikibot/tools/__init__.py
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index b9c99e0..8acdf51 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -1733,6 +1733,9 @@
 else:
 warning_message = u"{0}.{1} is deprecated."
 
+if hasattr(self, name):
+# __getattr__ will only be invoked if self. does not exist.
+delattr(self, name)
 self._deprecated[name] = replacement_name, replacement, warning_message
 
 def __setattr__(self, attr, value):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4193481a0bd1b2fa310f15a8bddb7a4e2f090134
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: Zoranzoki21 
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]: ModuleDeprecationWrapper._add_deprecated_attr: Delete existi...

2018-01-06 Thread Dalba (Code Review)

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

Change subject: ModuleDeprecationWrapper._add_deprecated_attr: Delete existing 
attribute
..

ModuleDeprecationWrapper._add_deprecated_attr: Delete existing attribute

In Python __getattr__ is only invoked if object does not have the requested
attribute. If the deprecated module has the attribute, then the __getattr__
method of ModuleDeprecationWrapper will not be invoked and therefore no
warning will be issued.

Bug: T184337
Change-Id: I4193481a0bd1b2fa310f15a8bddb7a4e2f090134
---
M pywikibot/tools/__init__.py
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/88/402588/1

diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index b9c99e0..8acdf51 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -1733,6 +1733,9 @@
 else:
 warning_message = u"{0}.{1} is deprecated."
 
+if hasattr(self, name):
+# __getattr__ will only be invoked if self. does not exist.
+delattr(self, name)
 self._deprecated[name] = replacement_name, replacement, warning_message
 
 def __setattr__(self, attr, value):

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Fix all kinds of type safety warnings accross the code base

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Fix all kinds of type safety warnings accross the code base
..


Fix all kinds of type safety warnings accross the code base

This fixes all kinds of warnings the static analysis in my PHPStorms
spits out. Most changes are to PHPDoc comments. Some are actually broken,
some outdated, some missing. Some changes make generic "array" type hints
more specific. Other changes add strict type hints to internal methods.

Change-Id: Ie053a03556c253fa2796b04d83050adfcdbb31d9
---
M AntiSpoof/batchCAAntiSpoof.php
M includes/CentralAuthHooks.php
M includes/CentralAuthPrimaryAuthenticationProvider.php
M includes/CentralAuthUser.php
M includes/CentralAuthUserArray.php
M includes/CentralAuthUserArrayFromResult.php
M includes/CentralAuthUtils.php
M includes/GlobalRename/GlobalRenameRequest.php
M includes/GlobalRename/GlobalRenameUserDatabaseUpdates.php
M includes/GlobalRename/GlobalRenameUserStatus.php
M includes/GlobalRename/GlobalUserMergeDatabaseUpdates.php
M includes/UsersToRename/UsersToRenameDatabaseUpdates.php
M includes/api/ApiQueryGlobalAllUsers.php
M includes/session/CentralAuthSessionProvider.php
M includes/specials/RenameQueueTablePager.php
M includes/specials/SpecialCentralAuth.php
M includes/specials/SpecialCentralAutoLogin.php
M includes/specials/SpecialCentralLogin.php
M maintenance/forceRenameUsers.php
M maintenance/populateListOfUsersToRename.php
20 files changed, 49 insertions(+), 18 deletions(-)

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



diff --git a/AntiSpoof/batchCAAntiSpoof.php b/AntiSpoof/batchCAAntiSpoof.php
index 017ccbb..d259009 100644
--- a/AntiSpoof/batchCAAntiSpoof.php
+++ b/AntiSpoof/batchCAAntiSpoof.php
@@ -1,6 +1,8 @@
 getProvider( 'CentralAuthSessionProvider' );
if ( $provider ) {
diff --git a/includes/CentralAuthUserArray.php 
b/includes/CentralAuthUserArray.php
index b530604..a70750f 100644
--- a/includes/CentralAuthUserArray.php
+++ b/includes/CentralAuthUserArray.php
@@ -1,12 +1,14 @@
 numRows() == 0 ) {
diff --git a/includes/CentralAuthUtils.php b/includes/CentralAuthUtils.php
index b4d8100..d896893 100644
--- a/includes/CentralAuthUtils.php
+++ b/includes/CentralAuthUtils.php
@@ -1,6 +1,7 @@
 
  */
 
+use Wikimedia\Rdbms\DBQueryError;
 use Wikimedia\Rdbms\IDatabase;
 
 class GlobalRenameUserStatus implements IDBAccessObject {
diff --git a/includes/GlobalRename/GlobalUserMergeDatabaseUpdates.php 
b/includes/GlobalRename/GlobalUserMergeDatabaseUpdates.php
index 41427fb..888258c 100644
--- a/includes/GlobalRename/GlobalUserMergeDatabaseUpdates.php
+++ b/includes/GlobalRename/GlobalUserMergeDatabaseUpdates.php
@@ -1,5 +1,7 @@
 resetQueryParams();
 
// Get all global groups now. We do this by using a WHERE
diff --git a/includes/session/CentralAuthSessionProvider.php 
b/includes/session/CentralAuthSessionProvider.php
index 39614c0..dfbd15a 100644
--- a/includes/session/CentralAuthSessionProvider.php
+++ b/includes/session/CentralAuthSessionProvider.php
@@ -22,7 +22,7 @@
 
/**
 * @param array $params In addition to the parameters for
-* \\MediaWiki\\Session\\CookieSessionProvider, the following are
+* CookieSessionProvider, the following are
 * recognized:
 *  - enable: Whether to set CentralAuth-specific features. Defaults to
 *$wgCentralAuthCookies.
diff --git a/includes/specials/RenameQueueTablePager.php 
b/includes/specials/RenameQueueTablePager.php
index a88eecc..44cedc0 100644
--- a/includes/specials/RenameQueueTablePager.php
+++ b/includes/specials/RenameQueueTablePager.php
@@ -27,17 +27,17 @@
 class RenameQueueTablePager extends TablePager {
 
/**
-* @var SpecialPage $mOwner
+* @var SpecialPage
 */
protected $mOwner;
 
/**
-* @var string $mPage
+* @var string
 */
protected $mPage;
 
/**
-* @var mFieldNames array
+* @var string[]|null
 */
protected $mFieldNames;
 
@@ -230,7 +230,7 @@
}
 
/**
-* @return array
+* @return string[]
 */
public function getFieldNames() {
if ( $this->mFieldNames === null ) {
diff --git a/includes/specials/SpecialCentralAuth.php 
b/includes/specials/SpecialCentralAuth.php
index 48b6150..e055cbd 100644
--- a/includes/specials/SpecialCentralAuth.php
+++ b/includes/specials/SpecialCentralAuth.php
@@ -653,6 +653,7 @@
// "temporary" indication applies to both groups, or just the 
last one
$listTemporary = [];
$list = [];
+   /** @var UserGroupMembership $ugm */
foreach ( $row['groupMemberships'] as $group => $ugm ) {
if ( $ugm->getExpiry() ) {

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Minor fixups to documentation, imports, and such

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Minor fixups to documentation, imports, and such
..


Minor fixups to documentation, imports, and such

This patch contains a bunch of minor improvements that are not really
worth their own patches. Please tell me if you disagree, and which
changes I should split to seperate patches.

Change-Id: Ib6a53a5b216498aa92085c46d5f13e45be04fb64
---
M includes/CentralAuthGroupMembershipProxy.php
M includes/CentralAuthHooks.php
M includes/CentralAuthPrimaryAuthenticationProvider.php
M includes/LocalRenameJob/LocalRenameUserJob.php
M includes/LocalRenameJob/LocalUserMergeJob.php
M includes/session/CentralAuthTokenSessionProvider.php
M includes/specials/SpecialGlobalRenameQueue.php
M includes/specials/SpecialGlobalRenameRequest.php
M tests/phpunit/CentralAuthTestUser.php
9 files changed, 12 insertions(+), 12 deletions(-)

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



diff --git a/includes/CentralAuthGroupMembershipProxy.php 
b/includes/CentralAuthGroupMembershipProxy.php
index 7f1ea72..0dce775 100644
--- a/includes/CentralAuthGroupMembershipProxy.php
+++ b/includes/CentralAuthGroupMembershipProxy.php
@@ -96,7 +96,7 @@
 
/**
 * Replaces User::getGroupMemberships()
-* @return array Associative array of (group name => 
UserGroupMembership object)
+* @return UserGroupMembership[] Associative array of (group name => 
UserGroupMembership object)
 */
function getGroupMemberships() {
$groups = $this->getGroups();
diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index 43a1e05..c3d0a83 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -1273,7 +1273,7 @@
/**
 * Check whether the user's preferences are such that a UI reload is
 * recommended.
-* @param User $user User
+* @param User $user
 * @return bool
 */
public static function isUIReloadRecommended( User $user ) {
diff --git a/includes/CentralAuthPrimaryAuthenticationProvider.php 
b/includes/CentralAuthPrimaryAuthenticationProvider.php
index 451342e..3a3d035 100644
--- a/includes/CentralAuthPrimaryAuthenticationProvider.php
+++ b/includes/CentralAuthPrimaryAuthenticationProvider.php
@@ -119,7 +119,7 @@
}
 
$status = $this->checkPasswordValidity( $username, 
$req->password );
-   if ( !$status->isOk() ) {
+   if ( !$status->isOK() ) {
// Fatal, can't log in
return AuthenticationResponse::newFail( 
$status->getMessage() );
}
@@ -392,7 +392,7 @@
$options += [ 'flags' => User::READ_NORMAL ];
 
$status = parent::testUserForCreation( $user, $autocreate, 
$options );
-   if ( !$status->isOk() ) {
+   if ( !$status->isOK() ) {
return $status;
}
 
diff --git a/includes/LocalRenameJob/LocalRenameUserJob.php 
b/includes/LocalRenameJob/LocalRenameUserJob.php
index 3a1cb8b..3a3b347 100644
--- a/includes/LocalRenameJob/LocalRenameUserJob.php
+++ b/includes/LocalRenameJob/LocalRenameUserJob.php
@@ -1,6 +1,6 @@
 addModules( 'ext.centralauth.globalrenamequeue' );
 
$status = $form->show();
-   if ( $status instanceof Status && $status->isOk() ) {
+   if ( $status instanceof Status && $status->isOK() ) {
$this->getOutput()->redirect(
$this->getPageTitle(
self::PAGE_PROCESS_REQUEST . 
"/{$req->getId()}/{$status->value}"
diff --git a/includes/specials/SpecialGlobalRenameRequest.php 
b/includes/specials/SpecialGlobalRenameRequest.php
index c9c7cc6..0e5ee35 100644
--- a/includes/specials/SpecialGlobalRenameRequest.php
+++ b/includes/specials/SpecialGlobalRenameRequest.php
@@ -207,7 +207,7 @@
protected function suggestedUsername() {
do {
$rand = $this->getUser()->getName() . rand( 123, 999 );
-   } while ( !GlobalRenameRequest::isNameAvailable( $rand 
)->isOk() );
+   } while ( !GlobalRenameRequest::isNameAvailable( $rand 
)->isOK() );
return $rand;
}
 
diff --git a/tests/phpunit/CentralAuthTestUser.php 
b/tests/phpunit/CentralAuthTestUser.php
index bfcd948..c926d7b 100644
--- a/tests/phpunit/CentralAuthTestUser.php
+++ b/tests/phpunit/CentralAuthTestUser.php
@@ -77,7 +77,7 @@
private $createLocal;
 
/**
-* @param string $username the username
+* @param string $username
 * @param string $password password for the account
 * @param array $attrs associative array of global user attributs
 * @param array

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] show deprecation warning

2018-01-06 Thread Xqt (Code Review)

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

Change subject: [bugfix] show deprecation warning
..

[bugfix] show deprecation warning

A warning level > 1 isn't be shown in some cases.

Bug: T184337
Change-Id: Ib7483d83c735db34b8518c002cd4349d64a12ac6
---
M pywikibot/tools/__init__.py
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/87/402587/1

diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index b9c99e0..68903e4 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Miscellaneous helper functions (not wiki-dependent)."""
 #
-# (C) Pywikibot team, 2008-2017
+# (C) Pywikibot team, 2008-2018
 #
 # Distributed under the terms of the MIT license.
 #
@@ -1746,7 +1746,7 @@
 warning_message = self._deprecated[attr][2]
 warn(warning_message.format(self._module.__name__, attr,
 self._deprecated[attr][0]),
- DeprecationWarning, 2)
+ DeprecationWarning, 1)
 if self._deprecated[attr][1]:
 return self._deprecated[attr][1]
 elif '.' in self._deprecated[attr][0]:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Remove obsolete text from self-explaining code

2018-01-06 Thread Thiemo Kreuz (WMDE) (Code Review)

Thiemo Kreuz (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402586 )

Change subject: Remove obsolete text from self-explaining code
..

Remove obsolete text from self-explaining code

Change-Id: I6a29891383a6d76b26d566b980f6253d1ec0bf44
---
M Hooks.php
M includes/Conversion/Utils.php
M includes/Data/Listener/RecentChangesListener.php
M includes/Notifications/Controller.php
M includes/Notifications/FlowPresentationModel.php
M includes/OOUI/BoardDescriptionWidget.php
6 files changed, 8 insertions(+), 10 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
index ec52bfd..4c13761 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -180,7 +180,7 @@
/**
 * Hook: LoadExtensionSchemaUpdates
 *
-* @param DatabaseUpdater $updater DatabaseUpdater object
+* @param DatabaseUpdater $updater
 * @return bool true in all cases
 */
public static function getSchemaUpdates( DatabaseUpdater $updater ) {
@@ -1132,7 +1132,7 @@
/**
 * Add topiclist sortby to preferences.
 *
-* @param User $user User object
+* @param User $user
 * @param array &$preferences Preferences object
 * @return bool
 */
diff --git a/includes/Conversion/Utils.php b/includes/Conversion/Utils.php
index 528065e..232544c 100644
--- a/includes/Conversion/Utils.php
+++ b/includes/Conversion/Utils.php
@@ -407,7 +407,7 @@
 * Handler for FlowAddModules, avoids rest of Flow having to be aware if
 * Parsoid is in use.
 *
-* @param OutputPage $out OutputPage object
+* @param OutputPage $out
 * @return bool
 */
public static function onFlowAddModules( OutputPage $out ) {
diff --git a/includes/Data/Listener/RecentChangesListener.php 
b/includes/Data/Listener/RecentChangesListener.php
index cfe173a..6edc98e 100644
--- a/includes/Data/Listener/RecentChangesListener.php
+++ b/includes/Data/Listener/RecentChangesListener.php
@@ -41,7 +41,7 @@
/**
 * @param FlowActions $actions
 * @param UserNameBatch $usernames
-* @param RecentChangeFactory $rcFactory Creates mw RecentChange 
instances
+* @param RecentChangeFactory $rcFactory
 * @param IRCLineUrlFormatter $ircFormatter
 */
public function __construct(
@@ -57,7 +57,7 @@
}
 
/**
-* @param AbstractRevision $revision Revision object
+* @param AbstractRevision $revision
 * @param array $row Revision row
 * @param array $metadata
 */
diff --git a/includes/Notifications/Controller.php 
b/includes/Notifications/Controller.php
index c65dac9..bb0a7bb 100644
--- a/includes/Notifications/Controller.php
+++ b/includes/Notifications/Controller.php
@@ -492,7 +492,7 @@
/**
 * @param AbstractRevision $content The (post|topic|header) revision 
that contains the content of the mention
 * @param PostRevision|null $topic Topic PostRevision object, if 
relevant (e.g. not for Header)
-* @param Workflow $workflow Workflow object
+* @param Workflow $workflow
 * @param User $user User who created the new post
 * @param array $mentionedUsers
 * @param bool $mentionsSkipped Were mentions skipped due to too many 
mentions being attempted?
diff --git a/includes/Notifications/FlowPresentationModel.php 
b/includes/Notifications/FlowPresentationModel.php
index 67d31db..0258b60 100644
--- a/includes/Notifications/FlowPresentationModel.php
+++ b/includes/Notifications/FlowPresentationModel.php
@@ -76,8 +76,8 @@
/**
 * Get the topic title Title
 *
-* @param string $fragment Optional fragment
-* @return Title Topic title
+* @param string $fragment
+* @return Title
 */
protected function getTopicTitleObj( $fragment = '' ) {
$workflowId = $this->event->getExtraParam( 'topic-workflow' );
diff --git a/includes/OOUI/BoardDescriptionWidget.php 
b/includes/OOUI/BoardDescriptionWidget.php
index e80ceb0..1bc546d 100644
--- a/includes/OOUI/BoardDescriptionWidget.php
+++ b/includes/OOUI/BoardDescriptionWidget.php
@@ -9,7 +9,6 @@
protected $description = '';
 
public function __construct( array $config = [] ) {
-   // Parent constructor
parent::__construct( $config );
 
if ( isset( $config['description'] ) ) {
@@ -20,7 +19,6 @@
$editLink = $config['editLink'];
}
 
-   // Edit button
$this->editButton = new \OOUI\ButtonWidget( [
'framed' => false,
'href' => $editLink,

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Use namespaced version of ResultWrapper

2018-01-06 Thread Thiemo Kreuz (WMDE) (Code Review)

Thiemo Kreuz (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402585 )

Change subject: Use namespaced version of ResultWrapper
..

Use namespaced version of ResultWrapper

Change-Id: I5f6acd431f20035c5c0f20642707d8a21fbd2659
---
M includes/Formatter/AbstractQuery.php
M includes/Formatter/ContributionsQuery.php
M includes/Search/Iterators/AbstractIterator.php
3 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/includes/Formatter/AbstractQuery.php 
b/includes/Formatter/AbstractQuery.php
index b608abc..2ac0cc2 100644
--- a/includes/Formatter/AbstractQuery.php
+++ b/includes/Formatter/AbstractQuery.php
@@ -11,7 +11,7 @@
 use Flow\Model\UUID;
 use Flow\Model\Workflow;
 use Flow\Repository\TreeRepository;
-use ResultWrapper;
+use Wikimedia\Rdbms\ResultWrapper;
 
 /**
  * Base class that collects the data necessary to utilize AbstractFormatter
diff --git a/includes/Formatter/ContributionsQuery.php 
b/includes/Formatter/ContributionsQuery.php
index 8475282..49e90e3 100644
--- a/includes/Formatter/ContributionsQuery.php
+++ b/includes/Formatter/ContributionsQuery.php
@@ -14,8 +14,8 @@
 use Flow\Repository\TreeRepository;
 use Flow\Exception\FlowException;
 use Flow\FlowActions;
-use ResultWrapper;
 use User;
+use Wikimedia\Rdbms\ResultWrapper;
 
 class ContributionsQuery extends AbstractQuery {
 
diff --git a/includes/Search/Iterators/AbstractIterator.php 
b/includes/Search/Iterators/AbstractIterator.php
index b42a376..d072f44 100644
--- a/includes/Search/Iterators/AbstractIterator.php
+++ b/includes/Search/Iterators/AbstractIterator.php
@@ -9,8 +9,8 @@
 use Flow\Model\AbstractRevision;
 use Flow\Model\UUID;
 use Iterator;
-use ResultWrapper;
 use stdClass;
+use Wikimedia\Rdbms\ResultWrapper;
 
 abstract class AbstractIterator implements Iterator {
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f6acd431f20035c5c0f20642707d8a21fbd2659
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) 

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Minor fixups to documentation, imports, and such

2018-01-06 Thread Thiemo Kreuz (WMDE) (Code Review)

Thiemo Kreuz (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402584 )

Change subject: Minor fixups to documentation, imports, and such
..

Minor fixups to documentation, imports, and such

This patch contains a bunch of minor improvements that are not really
worth their own patches. Please tell me if you disagree, and which
changes I should split to seperate patches.

Change-Id: Ib6a53a5b216498aa92085c46d5f13e45be04fb64
---
M includes/CentralAuthGroupMembershipProxy.php
M includes/CentralAuthHooks.php
M includes/CentralAuthPrimaryAuthenticationProvider.php
M includes/LocalRenameJob/LocalRenameUserJob.php
M includes/LocalRenameJob/LocalUserMergeJob.php
M includes/session/CentralAuthTokenSessionProvider.php
M includes/specials/SpecialGlobalRenameQueue.php
M includes/specials/SpecialGlobalRenameRequest.php
M tests/phpunit/CentralAuthTestUser.php
9 files changed, 12 insertions(+), 12 deletions(-)


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

diff --git a/includes/CentralAuthGroupMembershipProxy.php 
b/includes/CentralAuthGroupMembershipProxy.php
index 7f1ea72..0dce775 100644
--- a/includes/CentralAuthGroupMembershipProxy.php
+++ b/includes/CentralAuthGroupMembershipProxy.php
@@ -96,7 +96,7 @@
 
/**
 * Replaces User::getGroupMemberships()
-* @return array Associative array of (group name => 
UserGroupMembership object)
+* @return UserGroupMembership[] Associative array of (group name => 
UserGroupMembership object)
 */
function getGroupMemberships() {
$groups = $this->getGroups();
diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index d56268b..b84cb05 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -1275,7 +1275,7 @@
/**
 * Check whether the user's preferences are such that a UI reload is
 * recommended.
-* @param User $user User
+* @param User $user
 * @return bool
 */
public static function isUIReloadRecommended( User $user ) {
diff --git a/includes/CentralAuthPrimaryAuthenticationProvider.php 
b/includes/CentralAuthPrimaryAuthenticationProvider.php
index 9540c29..1291faa 100644
--- a/includes/CentralAuthPrimaryAuthenticationProvider.php
+++ b/includes/CentralAuthPrimaryAuthenticationProvider.php
@@ -120,7 +120,7 @@
}
 
$status = $this->checkPasswordValidity( $username, 
$req->password );
-   if ( !$status->isOk() ) {
+   if ( !$status->isOK() ) {
// Fatal, can't log in
return AuthenticationResponse::newFail( 
$status->getMessage() );
}
@@ -393,7 +393,7 @@
$options += [ 'flags' => User::READ_NORMAL ];
 
$status = parent::testUserForCreation( $user, $autocreate, 
$options );
-   if ( !$status->isOk() ) {
+   if ( !$status->isOK() ) {
return $status;
}
 
diff --git a/includes/LocalRenameJob/LocalRenameUserJob.php 
b/includes/LocalRenameJob/LocalRenameUserJob.php
index 3a1cb8b..3a3b347 100644
--- a/includes/LocalRenameJob/LocalRenameUserJob.php
+++ b/includes/LocalRenameJob/LocalRenameUserJob.php
@@ -1,6 +1,6 @@
 addModules( 'ext.centralauth.globalrenamequeue' );
 
$status = $form->show();
-   if ( $status instanceof Status && $status->isOk() ) {
+   if ( $status instanceof Status && $status->isOK() ) {
$this->getOutput()->redirect(
$this->getPageTitle(
self::PAGE_PROCESS_REQUEST . 
"/{$req->getId()}/{$status->value}"
diff --git a/includes/specials/SpecialGlobalRenameRequest.php 
b/includes/specials/SpecialGlobalRenameRequest.php
index c9c7cc6..0e5ee35 100644
--- a/includes/specials/SpecialGlobalRenameRequest.php
+++ b/includes/specials/SpecialGlobalRenameRequest.php
@@ -207,7 +207,7 @@
protected function suggestedUsername() {
do {
$rand = $this->getUser()->getName() . rand( 123, 999 );
-   } while ( !GlobalRenameRequest::isNameAvailable( $rand 
)->isOk() );
+   } while ( !GlobalRenameRequest::isNameAvailable( $rand 
)->isOK() );
return $rand;
}
 
diff --git a/tests/phpunit/CentralAuthTestUser.php 
b/tests/phpunit/CentralAuthTestUser.php
index bfcd948..c926d7b 100644
--- a/tests/phpunit/CentralAuthTestUser.php
+++ b/tests/phpunit/CentralAuthTestUser.php
@@ -77,7 +77,7 @@
private $createLocal;
 
/**
-* @param string $username the username
+* @param string $username
 * @param string $password password for the account
 * @param array $attrs associative array of global user attributs

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Update group photo on people.wm.org

2018-01-06 Thread Framawiki (Code Review)

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

Change subject: Update group photo on people.wm.org
..

Update group photo on people.wm.org

Update people.wikimedia.org with the 2017 Wikimania hackathon group photo. 
Updating links, author, license.
Add some css rules.

Bug: T184338
Change-Id: I6806d0b341e4f12b66cc4a0f4fbab07178bc410c
---
M modules/publichtml/templates/index.html.erb
1 file changed, 9 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/402583/1

diff --git a/modules/publichtml/templates/index.html.erb 
b/modules/publichtml/templates/index.html.erb
index 2155895..ca7f8d8 100644
--- a/modules/publichtml/templates/index.html.erb
+++ b/modules/publichtml/templates/index.html.erb
@@ -22,13 +22,16 @@
 See https://wikitech.wikimedia.org/wiki/People.wikimedia.org;>Wikitech 
for more information.
 
 
-https://commons.wikimedia.org/wiki/File:Wikimania_2015_-_Group_photo.jpg;>
-https://upload.wikimedia.org/wikipedia/commons/thumb/7/7c/Wikimania_2015_-_Group_photo.jpg/640px-Wikimania_2015_-_Group_photo.jpg;
 height="425" width="640" />
-
-"https://commons.wikimedia.org/wiki/File:Wikimania_2015_-_Group_photo.jpg;>Wikimania_2015_-_Group_photo.jpg"
- by ©https://commons.wikimedia.org/wiki/User:EneasMx; 
title="User:EneasMx">EneasMx
+https://commons.wikimedia.org/wiki/File:Wikimedia_Hackathon_Vienna_2017-05-20_GROUP_PHOTO_03_16to9.jpg;>
+https://upload.wikimedia.org/wikipedia/commons/thumb/b/b7/Wikimedia_Hackathon_Vienna_2017-05-20_GROUP_PHOTO_03_16to9.jpg/640px-Wikimedia_Hackathon_Vienna_2017-05-20_GROUP_PHOTO_03_16to9.jpg;
 height="360" width="640" style="display: block; margin: 0 auto;"/>
+
+
+
+"https://commons.wikimedia.org/wiki/File:Wikimedia_Hackathon_Vienna_2017-05-20_GROUP_PHOTO_03_16to9.jpg;>Wikimedia
 Hackathon Vienna 2017-05-20 GROUP PHOTO 03 16to9.jpg"
+ by ©https://commons.wikimedia.org/wiki/User:Tsui; 
title="User:Tsui">Manfred Werner (Tsui)
 Own work. Licensed under
-CC-BY-SA-4.0
+https://creativecommons.org/licenses/by-sa/4.0/deed.en;>CC-BY-SA-4.0
 via https://commons.wikimedia.org/;>Wikimedia Commons.
 
+
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6806d0b341e4f12b66cc4a0f4fbab07178bc410c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Framawiki 

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

[MediaWiki-commits] [Gerrit] operations...python-thumbor-wikimedia[master]: Upgrade to 1.9

2018-01-06 Thread Gilles (Code Review)

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

Change subject: Upgrade to 1.9
..

Upgrade to 1.9

Bug: T169144
Change-Id: I1cb3d133ca3522dd64e52c6b9cb2764863ffc0ad
---
M debian/changelog
M setup.py
M wikimedia_thumbor/handler/images/images.py
3 files changed, 24 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/python-thumbor-wikimedia 
refs/changes/82/402582/1

diff --git a/debian/changelog b/debian/changelog
index 59b5c76..31a1f0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-thumbor-wikimedia (1.9-1) jessie-wikimedia; urgency=low
+
+  * New upstream release
+
+ -- Gilles Dubuc   Sat, 6 Jan 2018 13:02:00 +
+
 python-thumbor-wikimedia (1.8-1) jessie-wikimedia; urgency=low
 
   * New upstream release
diff --git a/setup.py b/setup.py
index 36d..5d9cac0 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 
 setup(
 name='wikimedia_thumbor',
-version='1.8',
+version='1.9',
 url='https://phabricator.wikimedia.org/diffusion/THMBREXT/',
 license='MIT',
 author='Gilles Dubuc, Wikimedia Foundation',
diff --git a/wikimedia_thumbor/handler/images/images.py 
b/wikimedia_thumbor/handler/images/images.py
index 3625506..9094809 100644
--- a/wikimedia_thumbor/handler/images/images.py
+++ b/wikimedia_thumbor/handler/images/images.py
@@ -197,6 +197,11 @@
 if hasattr(self.context.config, 'SWIFT_SHARDED_CONTAINERS'):
 sharded_containers = self.context.config.SWIFT_SHARDED_CONTAINERS
 
+private_containers = []
+
+if hasattr(self.context.config, 'SWIFT_PRIVATE_CONTAINERS'):
+private_containers = self.context.config.SWIFT_PRIVATE_CONTAINERS
+
 projlang = '-'.join((kw['project'], kw['language']))
 original_container = projlang + '-local-public'
 thumbnail_container = projlang + '-local-thumb'
@@ -221,6 +226,8 @@
 hashed = md5.new(hashed_name).hexdigest()
 original_shard1 = hashed[:1]
 original_shard2 = hashed[:2]
+
+self.context.private = original_container in private_containers
 
 if original_container in sharded_containers:
 original_container += '.' + original_shard2
@@ -374,6 +381,16 @@
 )
 return
 
+if self.context.private:
+received_secret = self.request.headers.get('X-Swift-Secret', False)
+secret = self.context.config.get('SWIFT_PRIVATE_SECRET', False)
+if not secret or not received_secret or received_secret != secret:
+self._error(
+401,
+'Unauthorized access to private Swift container'
+)
+return
+
 xkey = self.set_headers(translated_kw)
 mc = self.failure_memcache()
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cb3d133ca3522dd64e52c6b9cb2764863ffc0ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/python-thumbor-wikimedia
Gerrit-Branch: master
Gerrit-Owner: Gilles 

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

[MediaWiki-commits] [Gerrit] mediawiki...UrlGetParameters[master]: Provides some tweaks and makes a new release

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Provides some tweaks and makes a new release
..


Provides some tweaks and makes a new release

* Bumps version to 1.5.0
  (due to previously authored breaking I18n changes)
* Provides license file
* Provides license label (SPDX 3.0)
* Consistently switches to __DIR__
* Adds file documentation
* Extends author's array
* Fixes external link

Bug:T123943
Change-Id: If89505a856e61150013841670eaddcfb97c98f6d
---
A COPYING
M UrlGetParameters.php
2 files changed, 359 insertions(+), 11 deletions(-)

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



diff --git a/COPYING b/COPYING
new file mode 100644
index 000..d159169
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Expand sniff to replace some php aliases with main function

2018-01-06 Thread Umherirrender (Code Review)

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

Change subject: Expand sniff to replace some php aliases with main function
..

Expand sniff to replace some php aliases with main function

- is_writeable => is_writable
- join => implode
- key_exists => array_key_exists
- pos => current
- sizeof => count

Bug: T183220
Change-Id: I0bc74cd3556f1cae513f1bc28cefae16c39a43a5
---
M MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/81/402581/1

diff --git a/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php 
b/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
index d607ea8..048a688 100644
--- a/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
+++ b/MediaWiki/Sniffs/Usage/ForbiddenFunctionsSniff.php
@@ -32,6 +32,11 @@
 */
private $functions = [
'is_integer' => 'is_int',
+   'is_writeable' => 'is_writable',
+   'join' => 'implode',
+   'key_exists' => 'array_key_exists',
+   'pos' => 'current',
+   'sizeof' => 'count',
'extract' => false,
// Deprecated in PHP 7.2
'create_function' => false,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bc74cd3556f1cae513f1bc28cefae16c39a43a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
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...WatchSubpages[master]: [WIP-DNM-TESTME] Convert WatchSubpages to use extension regi...

2018-01-06 Thread MarcoAurelio (Code Review)

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

Change subject: [WIP-DNM-TESTME] Convert WatchSubpages to use extension 
registration
..

[WIP-DNM-TESTME] Convert WatchSubpages to use extension registration

Added also "license-name" to extension.json and a COPYING file.

Bug: T184336
Change-Id: Ic7cc583e24da12e9cc525109b1e6c866b0275c42
---
M WatchSubpages.php
A extension.json
2 files changed, 46 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WatchSubpages 
refs/changes/80/402580/1

diff --git a/WatchSubpages.php b/WatchSubpages.php
index 1a6a08f..c0528ac 100644
--- a/WatchSubpages.php
+++ b/WatchSubpages.php
@@ -1,38 +1,15 @@
 http://www.strategywiki.org/wiki/User:Prod)
- * @link http://www.mediawiki.org/wiki/Extension:WatchSubpages Documentation
- */
-
-# Not a valid entry point, skip unless MEDIAWIKI is defined
-if( !defined( 'MEDIAWIKI' ) ) {
-   echo << __FILE__,
-   'author' => '[http://www.strategywiki.org/wiki/User:Prod User:Prod]',
-   'name' => 'Watch Subpages',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:WatchSubpages',
-   'descriptionmsg' => 'watchsubpages-desc',
-   'version' => '2.2.0',
-);
-
-// Set up the new special page
-$dir = dirname( __FILE__ ) . '/';
-$wgMessagesDirs['WatchSubpages'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['WatchSubpagesAlias'] = $dir . 
'WatchSubpages.alias.php';
-$wgAutoloadClasses['WatchSubpages'] = $dir . 'WatchSubpages_body.php';
-$wgSpecialPages['WatchSubpages'] = 'WatchSubpages';
-$wgAvailableRights[] = 'watchsubpages';
-$wgGroupPermissions['user']['watchsubpages'] = true;
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'WatchSubpages' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['WatchSubpages'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['WatchSubpagesAlias'] = __DIR__ . 
'/WatchSubpages.alias.php';
+   wfWarn(
+   'Deprecated PHP entry point used for the WatchSubpages 
extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the WatchSubpages extension requires MediaWiki 
1.25+' );
+}
\ No newline at end of file
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..725f953
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,32 @@
+{
+   "name": "Watch Subpages",
+   "version": "2.2.0",
+   "author": "[http://www.strategywiki.org/wiki/User:Prod User:Prod]",
+   "url": "https://www.mediawiki.org/wiki/Extension:WatchSubpages;,
+   "descriptionmsg": "watchsubpages-desc",
+   "license-name": "GPL-2.0-or-later",
+   "type": "specialpage",
+   "AvailableRights": [
+   "watchsubpages"
+   ],
+   "GroupPermissions": {
+   "user": {
+   "watchsubpages": true
+   }
+   },
+   "SpecialPages": {
+   "WatchSubpages": "WatchSubpages"
+   },
+   "MessagesDirs": {
+   "WatchSubpages": [
+   "i18n"
+   ]
+   },
+   "ExtensionMessagesFiles": {
+   "WatchSubpagesAlias": "WatchSubpages.alias.php"
+   },
+   "AutoloadClasses": {
+   "WatchSubpages": "WatchSubpages_body.php"
+   },
+   "manifest_version": 2
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic7cc583e24da12e9cc525109b1e6c866b0275c42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WatchSubpages
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add ability to proxy thumbnail requests to a service

2018-01-06 Thread Gilles (Code Review)

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

Change subject: Add ability to proxy thumbnail requests to a service
..

Add ability to proxy thumbnail requests to a service

Bug: T169144
Change-Id: I4af09a8b75e7158d6ff15f97e8f067b66ac33d5c
---
M includes/filerepo/FileRepo.php
M thumb.php
2 files changed, 60 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/402579/1

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 5d22b8d..b4fa11a 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -132,6 +132,11 @@
/** @var array callable|bool Override these in the base class */
protected $oldFileFactoryKey = false;
 
+   /** @var string URL of where to proxy thumb.php requests to */
+   protected $thumbProxyUrl;
+   /** @var string Secret key to pass as an X-Swift-Secret header to the 
proxied thumb service */
+   protected $thumbProxySecret;
+
/**
 * @param array|null $info
 * @throws MWException
@@ -159,7 +164,7 @@
$optionalSettings = [
'descBaseUrl', 'scriptDirUrl', 'articleUrl', 
'fetchDescription',
'thumbScriptUrl', 'pathDisclosureProtection', 
'descriptionCacheExpiry',
-   'scriptExtension', 'favicon'
+   'scriptExtension', 'favicon', 'thumbProxyUrl', 
'thumbProxySecret'
];
foreach ( $optionalSettings as $var ) {
if ( isset( $info[$var] ) ) {
@@ -612,6 +617,24 @@
}
 
/**
+* Get the URL thumb.php requests are being proxied to
+*
+* @return string
+*/
+   public function getThumbProxyUrl() {
+   return $this->thumbProxyUrl;
+   }
+
+   /**
+* Get the secret key for the proxied thumb service
+*
+* @return string
+*/
+   public function getThumbProxySecret() {
+   return $this->thumbProxySecret;
+   }
+
+   /**
 * Returns true if the repository can transform files via a 404 handler
 *
 * @return bool
diff --git a/thumb.php b/thumb.php
index 7c3e757..8127114 100644
--- a/thumb.php
+++ b/thumb.php
@@ -337,7 +337,42 @@
return;
}
 
-   list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, 
$thumbName, $thumbPath );
+   $thumbProxyUrl = $img->getRepo()->getThumbProxyUrl();
+
+   if ( strlen( $thumbProxyUrl ) ) {
+   // Instead of generating the thumbnail ourselves, we proxy the 
request to another service
+   $thumbProxiedUrl = $thumbProxyUrl  . $img->getThumbRel( 
$thumbName );
+
+   $req = MWHttpRequest::factory( $thumbProxiedUrl );
+   $secret = $img->getRepo()->getThumbProxySecret();
+
+   // Pass a secret key shared with the proxied service if any
+   if ( strlen( $secret ) ) {
+   $req->setHeader( 'X-Swift-Secret', $secret );
+   }
+   
+   // Send request to proxied service
+   $status = $req->execute();
+
+   // Simply serve the response from the proxied service as-is
+   header( 'HTTP/1.1 ' . $req->getStatus() );
+
+   $headers = $req->getResponseHeaders();
+
+   foreach ( $headers as $key => $values ) {
+   foreach ( $values as $value ) {
+   header( $key . ': ' . $value, false );
+   }
+   }
+
+   echo $req->getContent();
+
+   // No local fallback when in proxy mode
+   return;
+   } else {
+   // Generate the thumbnail locally
+   list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, 
$thumbName, $thumbPath );
+   }
 
/** @var MediaTransformOutput|MediaTransformError|bool $thumb */
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WIP: add default shell restrictions

2018-01-06 Thread MaxSem (Code Review)

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

Change subject: WIP: add default shell restrictions
..

WIP: add default shell restrictions

Before it's too late, let's boil the oceans
and just do it. This patch assumes that old code
calling wfShellExec() doesn't know about restrictions
so it doesn't restrict anything. New code, however,
needs to specify its restrictions or deal with defaults.

Change-Id: I58963901087202d4a405bcdb6bd12758bb6b0ff7
---
M includes/DefaultSettings.php
M includes/GlobalFunctions.php
M includes/ServiceWiring.php
M includes/shell/CommandFactory.php
M includes/shell/Shell.php
5 files changed, 28 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/402578/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8091428..34d2ca5 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -38,6 +38,8 @@
  * @file
  */
 
+use MediaWiki\Shell\Shell;
+
 /**
  * @cond file_level_code
  * This is not a valid entry point, perform no further processing unless
@@ -8305,6 +8307,14 @@
  */
 $wgShellRestrictionMethod = false;
 
+/**
+ * Default shell execution restriction. Does not apply to legacy calls to 
wfShellExec()
+ * Does not use Shell::RESTRICT_DEFAULT to isolate library changes from 
configuration.
+ *
+ * @since 1.31
+ */
+$wgShellDefaultRestriction = Shell::NO_ROOT | Shell::NO_NETWORK | 
Shell::NO_LOCALSETTINGS;
+
 /** @} */ # End shell }
 
 ///**
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 310adeb..94b0086 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2315,6 +2315,8 @@
->limits( $limits )
->includeStderr( $includeStderr )
->profileMethod( $profileMethod )
+   // For b/c
+   ->restrict( Shell::RESTRICT_NONE )
->execute();
} catch ( ProcOpenError $ex ) {
$retval = -1;
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 246b838..7798412 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -445,8 +445,9 @@
];
$cgroup = $config->get( 'ShellCgroup' );
$restrictionMethod = $config->get( 'ShellRestrictionMethod' );
+   $restriction = $config->get( 'ShellDefaultRestriction' );
 
-   $factory = new CommandFactory( $limits, $cgroup, 
$restrictionMethod );
+   $factory = new CommandFactory( $limits, $cgroup, 
$restrictionMethod, $restriction );
$factory->setLogger( LoggerFactory::getInstance( 'exec' ) );
$factory->logStderr();
 
diff --git a/includes/shell/CommandFactory.php 
b/includes/shell/CommandFactory.php
index 78f1d80..036aa63 100644
--- a/includes/shell/CommandFactory.php
+++ b/includes/shell/CommandFactory.php
@@ -46,6 +46,9 @@
 */
private $restrictionMethod;
 
+   /** @var int */
+   private $defaultRestriction;
+
/**
 * @var string|bool
 */
@@ -58,7 +61,7 @@
 * @param string|bool $cgroup See {@see Command::cgroup()}
 * @param string|bool $restrictionMethod
 */
-   public function __construct( array $limits, $cgroup, $restrictionMethod 
) {
+   public function __construct( array $limits, $cgroup, 
$restrictionMethod, $defaultRestriction ) {
$this->limits = $limits;
$this->cgroup = $cgroup;
if ( $restrictionMethod === 'autodetect' ) {
@@ -71,6 +74,7 @@
} else {
$this->restrictionMethod = $restrictionMethod;
}
+   $this->defaultRestriction = $defaultRestriction;
$this->setLogger( new NullLogger() );
}
 
@@ -108,6 +112,7 @@
return $command
->limits( $this->limits )
->cgroup( $this->cgroup )
-   ->logStderr( $this->doLogStderr );
+   ->logStderr( $this->doLogStderr )
+   ->restrict( $this->defaultRestriction );
}
 }
diff --git a/includes/shell/Shell.php b/includes/shell/Shell.php
index d57bf4f..a3f0cbb 100644
--- a/includes/shell/Shell.php
+++ b/includes/shell/Shell.php
@@ -101,6 +101,13 @@
const NO_LOCALSETTINGS = 32;
 
/**
+* Don't apply any restrictions
+*
+* @since 1.31
+*/
+   const RESTRICT_NONE = 0;
+
+   /**
 * Returns a new instance of Command class
 *
 * @param string|string[] $command String or array of strings 
representing the command to

-- 
To view, visit

[MediaWiki-commits] [Gerrit] mediawiki...Special404[master]: Extension registration

2018-01-06 Thread Gabrielchihonglee (Code Review)

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

Change subject: Extension registration
..

Extension registration

Updating the extension Special404 to  match with the latest extension 
registration requirements by addting the extension.json file.

Bug: T184334
Change-Id: I9863e3d5b03d9c559ebf45d54261835e32ba5fd4
---
A extension.json
1 file changed, 23 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Special404 
refs/changes/77/402577/1

diff --git a/extension.json b/extension.json
new file mode 100644
index 000..d9c550a
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,23 @@
+{
+   "name": "Special404",
+   "author": "Daniel Friesen",
+   "url": "https://www.mediawiki.org/wiki/Extension:Special404;,
+   "descriptionmsg": "special404-desc",
+   "license-name": "GPL-2.0+",
+   "type": "specialpage",
+   "SpecialPages": {
+   "Error404": "Special404"
+   },
+   "MessagesDirs": {
+   "Special404": [
+   "i18n"
+   ]
+   },
+   "ExtensionMessagesFiles": {
+   "Special404Alias": "Special404.alias.php"
+   },
+   "AutoloadClasses": {
+   "Special404": "Special404_body.php"
+   },
+   "manifest_version": 2
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9863e3d5b03d9c559ebf45d54261835e32ba5fd4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Special404
Gerrit-Branch: master
Gerrit-Owner: Gabrielchihonglee 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix dropping of temp tables on SQLite and PG.

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Fix dropping of temp tables on SQLite and PG.
..


Fix dropping of temp tables on SQLite and PG.

Also addresses other compatibility issues with PG mentioned
in comments on I7a4071072.

Bug: T184333
Change-Id: I478aa1aee15fdef99630c65a37b1af5f3f8cce14
---
M tests/phpunit/MediaWikiTestCase.php
M tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql
2 files changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/tests/phpunit/MediaWikiTestCase.php 
b/tests/phpunit/MediaWikiTestCase.php
index 10f5d41..08e4562 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -1393,9 +1393,8 @@
$this->ensureMockDatabaseConnection( $db );
 
foreach ( $tables as $tbl ) {
-   $tmp = self::$useTemporaryTables ? ' TEMPORARY ' : '';
$tbl = $db->tableName( $tbl );
-   $db->query( "DROP $tmp TABLE IF EXISTS $tbl", 
__METHOD__ );
+   $db->query( "DROP TABLE IF EXISTS $tbl", __METHOD__ );
 
if ( $tbl === 'page' ) {
// Forget about the pages since they don't
diff --git a/tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql 
b/tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql
index e5ef5c6..43e8e9b 100644
--- a/tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql
+++ b/tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql
@@ -5,9 +5,9 @@
 ) /*$wgDBTableOptions*/;
 
 CREATE TABLE /*_*/imagelinks (
-  il_from int(10) unsigned NOT NULL DEFAULT 0,
-  il_from_namespace int(11) NOT NULL DEFAULT 0,
-  il_to varbinary(255) NOT NULL DEFAULT '',
+  il_from int NOT NULL DEFAULT 0,
+  il_from_namespace int NOT NULL DEFAULT 0,
+  il_to varchar(255) NOT NULL DEFAULT '',
   il_frobniz varchar(255) NOT NULL DEFAULT 'FROB',
   PRIMARY KEY (il_from,il_to)
 ) /*$wgDBTableOptions*/;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I478aa1aee15fdef99630c65a37b1af5f3f8cce14
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jjanes 
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] operations/puppet[production]: snapshot testbed role for deployment-prep

2018-01-06 Thread ArielGlenn (Code Review)

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

Change subject: snapshot testbed role for deployment-prep
..


snapshot testbed role for deployment-prep

One caveat: it requires application of a second role,
role::beta::mediawiki, as do all instances in eployment-prep
that have mediawiki scapped to them.

Change-Id: I513f4edaa7decebe01702b4f587860952c2b1d81
---
A modules/role/manifests/dumps/generation/worker/beta_testbed.pp
1 file changed, 23 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/dumps/generation/worker/beta_testbed.pp 
b/modules/role/manifests/dumps/generation/worker/beta_testbed.pp
new file mode 100644
index 000..09cfed2
--- /dev/null
+++ b/modules/role/manifests/dumps/generation/worker/beta_testbed.pp
@@ -0,0 +1,23 @@
+# == Class role::dumps::generation::worker::beta_testbed
+#
+# Set up a dumps snapshot instance as a testbed.
+#
+# Because this class uses mediawiki, the class
+# role::beta::mediawiki must be applied to the instance
+# as well.  The role can't be included in this class for
+# style reasons.
+#
+# You should be using at least a m1.medium instance,
+# giving some extra lvm space locally mounted on
+# which to write the dumps.
+#
+# filtertags: labs-project-deployment-prep
+class role::dumps::generation::worker::beta_testbed {
+include standard
+
+include profile::dumps::generation::worker::common
+
+system::role { 'dumps::generation::worker::beta_testbed':
+description => 'beta testbed for dumps of XML/SQL wiki content',
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I513f4edaa7decebe01702b4f587860952c2b1d81
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: snapshot testbed role for deployment-prep

2018-01-06 Thread ArielGlenn (Code Review)

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

Change subject: snapshot testbed role for deployment-prep
..

snapshot testbed role for deployment-prep

One caveat: it requires application of a second role,
role::beta::mediawiki, as do all instances in eployment-prep
that have mediawiki scapped to them.

Change-Id: I513f4edaa7decebe01702b4f587860952c2b1d81
---
A modules/role/manifests/dumps/generation/worker/beta_testbed.pp
1 file changed, 23 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/402576/1

diff --git a/modules/role/manifests/dumps/generation/worker/beta_testbed.pp 
b/modules/role/manifests/dumps/generation/worker/beta_testbed.pp
new file mode 100644
index 000..09cfed2
--- /dev/null
+++ b/modules/role/manifests/dumps/generation/worker/beta_testbed.pp
@@ -0,0 +1,23 @@
+# == Class role::dumps::generation::worker::beta_testbed
+#
+# Set up a dumps snapshot instance as a testbed.
+#
+# Because this class uses mediawiki, the class
+# role::beta::mediawiki must be applied to the instance
+# as well.  The role can't be included in this class for
+# style reasons.
+#
+# You should be using at least a m1.medium instance,
+# giving some extra lvm space locally mounted on
+# which to write the dumps.
+#
+# filtertags: labs-project-deployment-prep
+class role::dumps::generation::worker::beta_testbed {
+include standard
+
+include profile::dumps::generation::worker::common
+
+system::role { 'dumps::generation::worker::beta_testbed':
+description => 'beta testbed for dumps of XML/SQL wiki content',
+}
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I513f4edaa7decebe01702b4f587860952c2b1d81
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Do not use python-stdnum 1.8 on Windows OSs

2018-01-06 Thread Dalba (Code Review)

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

Change subject: Do not use python-stdnum 1.8 on Windows OSs
..

Do not use python-stdnum 1.8 on Windows OSs

Bug: T184335
Change-Id: Ief2c48d7366fa79c05b354f1ba7bea365a02ec69
---
M requirements.txt
M setup.py
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/75/402575/1

diff --git a/requirements.txt b/requirements.txt
index 7d1d29d..cc042a2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -49,7 +49,8 @@
 unicodecsv ; python_version < '3' and python_version >= '2.7'
 
 # cosmetic_changes and scripts/isbn
-python-stdnum
+python-stdnum!=1.8 ; os_name == 'nt'
+python-stdnum ; os_name != 'nt'
 
 # GUI
 Pillow<3.5.0 ; python_version < '2.7'
diff --git a/setup.py b/setup.py
index 00972fc..c23f839 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,7 @@
 extra_deps = {
 # Core library dependencies
 'eventstreams': ['sseclient'],
-'isbn': ['python-stdnum'],
+'isbn': ['python-stdnum' if os.name != 'nt' else 'python-stdnum!=1.8'],
 'Graphviz': ['pydot>=1.0.28'],
 'Google': ['google>=1.7'],
 'IRC': [irc_dep],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Use tabs in .phpcs.xml

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Use tabs in .phpcs.xml
..


Use tabs in .phpcs.xml

Use dot for file to scan also the root for php files

Change-Id: Iee8a93f6aa1f15ccadcd351bdcfb477bc277ca88
---
M .phpcs.xml
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Kreuz (WMDE): Looks good to me, approved



diff --git a/.phpcs.xml b/.phpcs.xml
index f148e13..7cdd517 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,7 +1,7 @@
 
 
-  
-  includes
-  
-  
+   
+   .
+   
+   
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee8a93f6aa1f15ccadcd351bdcfb477bc277ca88
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PluggableAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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...QuickSurveys[master]: Remove .gitkeep files in non-empty folders

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Remove .gitkeep files in non-empty folders
..


Remove .gitkeep files in non-empty folders

.gitkeep files are used to keep empty folders in git,
but the folders here are not empty, so the file are not needed.

Change-Id: Idc1c1a8792ae91671b42bb8eec7cfcfb8598cbcb
---
D includes/.gitkeep
D resources/.gitkeep
2 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Kreuz (WMDE): Looks good to me, approved



diff --git a/includes/.gitkeep b/includes/.gitkeep
deleted file mode 100644
index e69de29..000
--- a/includes/.gitkeep
+++ /dev/null
diff --git a/resources/.gitkeep b/resources/.gitkeep
deleted file mode 100644
index e69de29..000
--- a/resources/.gitkeep
+++ /dev/null

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc1c1a8792ae91671b42bb8eec7cfcfb8598cbcb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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...FlaggedRevs[master]: Use namespaced version of IDatabase and fix param doc

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Use namespaced version of IDatabase and fix param doc
..


Use namespaced version of IDatabase and fix param doc

Change-Id: I44b03c2c7d5a2ffec32188693893afd01fc1af3d
---
M backend/FRDependencyUpdate.php
M backend/FlaggableWikiPage.php
2 files changed, 4 insertions(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Kreuz (WMDE): Looks good to me, approved



diff --git a/backend/FRDependencyUpdate.php b/backend/FRDependencyUpdate.php
index 5f552b8..edc3364 100644
--- a/backend/FRDependencyUpdate.php
+++ b/backend/FRDependencyUpdate.php
@@ -3,6 +3,9 @@
  * Class containing update methods for tracking links that
  * are only in the stable version of pages. Used only for caching.
  */
+
+use Wikimedia\Rdbms\IDatabase;
+
 class FRDependencyUpdate {
protected $title;
protected $sLinks;
diff --git a/backend/FlaggableWikiPage.php b/backend/FlaggableWikiPage.php
index 49d05f6..ab314da 100644
--- a/backend/FlaggableWikiPage.php
+++ b/backend/FlaggableWikiPage.php
@@ -379,7 +379,7 @@
 
/**
 * Set the page field data loaded from some source
-* @param \Database|string $data Database row object or "fromdb"
+* @param stdClass|string $data Database row object or "fromdb"
 * @return void
 */
public function loadPageData( $data = 'fromdb' ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44b03c2c7d5a2ffec32188693893afd01fc1af3d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
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...codesniffer[master]: Fix Undefined index: scope_opener in IfElseStructureSniff

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Fix Undefined index: scope_opener in IfElseStructureSniff
..


Fix Undefined index: scope_opener in IfElseStructureSniff

Bug: T183828
Change-Id: I17aa4604735b44a4fedd5d0261f8918d0b2e6ab2
---
M MediaWiki/Sniffs/ControlStructures/IfElseStructureSniff.php
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Kreuz (WMDE): Looks good to me, approved



diff --git a/MediaWiki/Sniffs/ControlStructures/IfElseStructureSniff.php 
b/MediaWiki/Sniffs/ControlStructures/IfElseStructureSniff.php
index 4a593f3..fa19043 100644
--- a/MediaWiki/Sniffs/ControlStructures/IfElseStructureSniff.php
+++ b/MediaWiki/Sniffs/ControlStructures/IfElseStructureSniff.php
@@ -32,8 +32,11 @@
$tokens = $phpcsFile->getTokens();
$prevToken = $tokens[$stackPtr - 1];
$nextToken = $tokens[$stackPtr + 1];
-   $scopeOpener = $tokens[$stackPtr]['scope_opener'];
-   $isAlternativeIfSyntax = $tokens[$scopeOpener]['code'] === 
T_COLON;
+   $isAlternativeIfSyntax = false;
+   if ( isset( $tokens[$stackPtr]['scope_opener'] ) ) {
+   $scopeOpener = $tokens[$stackPtr]['scope_opener'];
+   $isAlternativeIfSyntax = $tokens[$scopeOpener]['code'] 
=== T_COLON;
+   }
 
// single space expected before else and elseif structure
if ( !$isAlternativeIfSyntax &&

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I17aa4604735b44a4fedd5d0261f8918d0b2e6ab2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Legoktm 
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] operations/puppet[production]: restructure the snapshot dumps data directory setup

2018-01-06 Thread ArielGlenn (Code Review)

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

Change subject: restructure the snapshot dumps data directory setup
..


restructure the snapshot dumps data directory setup

Account for nfs mounts, labs lvm setups, or local partitions.
Toss the attempted labs data lvm profile created earlier today,
now there's labs specific code in a common profile (eww) but
that's the breaks.

Change-Id: I02cb6353edc49b2bd4cd0e21d36c9a2e1c309456
---
M hieradata/common.yaml
M modules/profile/manifests/dumps/generation/worker/common.pp
D modules/profile/manifests/dumps/generation/worker/labs_localdisk.pp
A modules/snapshot/manifests/dumps/datamount.pp
D modules/snapshot/manifests/dumps/nfsmount.pp
5 files changed, 47 insertions(+), 46 deletions(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 71a9a87..24678c8 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -350,6 +350,7 @@
 external:
   - odysseus.ip6.fi.muni.cz
   - poincare.acc.umu.se
+dumps_datadir_mount_type: nfs
 dumps_nfs_server: dumpsdata1001.eqiad.wmnet
 dumps_managed_subdirs: []
 
diff --git a/modules/profile/manifests/dumps/generation/worker/common.pp 
b/modules/profile/manifests/dumps/generation/worker/common.pp
index b1d9150..ac5e011 100644
--- a/modules/profile/manifests/dumps/generation/worker/common.pp
+++ b/modules/profile/manifests/dumps/generation/worker/common.pp
@@ -1,6 +1,7 @@
 class profile::dumps::generation::worker::common(
 $nfs_server = hiera('dumps_nfs_server'),
 $managed_subdirs = hiera('dumps_managed_subdirs'),
+$datadir_mount_type = hiera('dumps_datadir_mount_type'),
 $php = hiera('snapshot::dumps::php'),
 ) {
 # mw packages and dependencies
@@ -12,13 +13,15 @@
 
 class { '::dumpsuser': }
 
-snapshot::dumps::nfsmount { 'dumpsdatamount':
+snapshot::dumps::datamount { 'dumpsdatamount':
 mountpoint  => $xmldumpsmount,
+mount_type  => $datadir_mount_type,
 server  => $nfs_server,
 managed_subdirs => $managed_subdirs,
 user=> 'dumpsgen',
 group   => 'dumpsgen',
 }
+
 # dataset server config files,
 # stages files, dblists, html templates
 class { '::snapshot::dumps::dirs':
diff --git 
a/modules/profile/manifests/dumps/generation/worker/labs_localdisk.pp 
b/modules/profile/manifests/dumps/generation/worker/labs_localdisk.pp
deleted file mode 100644
index 447fb65..000
--- a/modules/profile/manifests/dumps/generation/worker/labs_localdisk.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Provide space for writing dumps to local filesystem
-#
-# filtertags: labs-common
-class profile::dumps::generation::worker::labs_localdisk {
-$xmldumpsmount = '/mnt/dumpsdata'
-
-labs_lvm::volume { 'data-local-disk':
-mountat => $xmldumpsmount,
-}
-}
diff --git a/modules/snapshot/manifests/dumps/datamount.pp 
b/modules/snapshot/manifests/dumps/datamount.pp
new file mode 100644
index 000..42adc14
--- /dev/null
+++ b/modules/snapshot/manifests/dumps/datamount.pp
@@ -0,0 +1,42 @@
+define snapshot::dumps::datamount(
+$mountpoint = undef,
+$mount_type = undef,
+$server = undef,
+$managed_subdirs = [],
+$user = undef,
+$group = undef,
+) {
+if ($mount_type == 'local' or $mount_type == 'nfs') {
+file { [ $mountpoint ]:
+ensure => 'directory',
+}
+}
+elsif ($mount_type == 'labslvm') {
+labs_lvm::volume { 'data-local-disk':
+mountat => $mountpoint,
+}
+}
+
+if ($mount_type == 'nfs') {
+require_package('nfs-common')
+
+mount { $mountpoint:
+ensure   => 'mounted',
+device   => "${server}:/data",
+fstype   => 'nfs',
+name => $mountpoint,
+options  => 'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
+require  => File[$mountpoint],
+remounts => false,
+}
+}
+
+if ($managed_subdirs) {
+file { $managed_subdirs:
+ensure => 'directory',
+mode   => '0755',
+owner  => $user,
+group  => $group,
+}
+}
+}
diff --git a/modules/snapshot/manifests/dumps/nfsmount.pp 
b/modules/snapshot/manifests/dumps/nfsmount.pp
deleted file mode 100644
index 86c7f21..000
--- a/modules/snapshot/manifests/dumps/nfsmount.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-define snapshot::dumps::nfsmount(
-$mountpoint = undef,
-$server = undef,
-$managed_subdirs = [],
-$user = undef,
-$group = undef,
-) {
-require_package('nfs-common')
-
-file { [ $mountpoint ]:
-ensure => 'directory',
-}
-
-if (defined('$server') and $server != '') {
-mount { $mountpoint:
-ensure   => 'mounted',
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: restructure the snapshot dumps data directory setup

2018-01-06 Thread ArielGlenn (Code Review)

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

Change subject: restructure the snapshot dumps data directory setup
..

restructure the snapshot dumps data directory setup

Account for nfs mounts, labs lvm setups, or local partitions.
Toss the attempted labs data lvm profile created earlier today,
now there's labs specific code in a common profile (eww) but
that's the breaks.

Change-Id: I02cb6353edc49b2bd4cd0e21d36c9a2e1c309456
---
M hieradata/common.yaml
M modules/profile/manifests/dumps/generation/worker/common.pp
D modules/profile/manifests/dumps/generation/worker/labs_localdisk.pp
A modules/snapshot/manifests/dumps/datamount.pp
D modules/snapshot/manifests/dumps/nfsmount.pp
5 files changed, 47 insertions(+), 46 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/402574/1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 71a9a87..24678c8 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -350,6 +350,7 @@
 external:
   - odysseus.ip6.fi.muni.cz
   - poincare.acc.umu.se
+dumps_datadir_mount_type: nfs
 dumps_nfs_server: dumpsdata1001.eqiad.wmnet
 dumps_managed_subdirs: []
 
diff --git a/modules/profile/manifests/dumps/generation/worker/common.pp 
b/modules/profile/manifests/dumps/generation/worker/common.pp
index b1d9150..ac5e011 100644
--- a/modules/profile/manifests/dumps/generation/worker/common.pp
+++ b/modules/profile/manifests/dumps/generation/worker/common.pp
@@ -1,6 +1,7 @@
 class profile::dumps::generation::worker::common(
 $nfs_server = hiera('dumps_nfs_server'),
 $managed_subdirs = hiera('dumps_managed_subdirs'),
+$datadir_mount_type = hiera('dumps_datadir_mount_type'),
 $php = hiera('snapshot::dumps::php'),
 ) {
 # mw packages and dependencies
@@ -12,13 +13,15 @@
 
 class { '::dumpsuser': }
 
-snapshot::dumps::nfsmount { 'dumpsdatamount':
+snapshot::dumps::datamount { 'dumpsdatamount':
 mountpoint  => $xmldumpsmount,
+mount_type  => $datadir_mount_type,
 server  => $nfs_server,
 managed_subdirs => $managed_subdirs,
 user=> 'dumpsgen',
 group   => 'dumpsgen',
 }
+
 # dataset server config files,
 # stages files, dblists, html templates
 class { '::snapshot::dumps::dirs':
diff --git 
a/modules/profile/manifests/dumps/generation/worker/labs_localdisk.pp 
b/modules/profile/manifests/dumps/generation/worker/labs_localdisk.pp
deleted file mode 100644
index 447fb65..000
--- a/modules/profile/manifests/dumps/generation/worker/labs_localdisk.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# Provide space for writing dumps to local filesystem
-#
-# filtertags: labs-common
-class profile::dumps::generation::worker::labs_localdisk {
-$xmldumpsmount = '/mnt/dumpsdata'
-
-labs_lvm::volume { 'data-local-disk':
-mountat => $xmldumpsmount,
-}
-}
diff --git a/modules/snapshot/manifests/dumps/datamount.pp 
b/modules/snapshot/manifests/dumps/datamount.pp
new file mode 100644
index 000..374bf6e
--- /dev/null
+++ b/modules/snapshot/manifests/dumps/datamount.pp
@@ -0,0 +1,42 @@
+define snapshot::dumps::datamount(
+$mountpoint = undef,
+$mount_type = undef,
+$server = undef,
+$managed_subdirs = [],
+$user = undef,
+$group = undef,
+) {
+if ($mount_type == 'local' or $mount_type == 'nfs') {
+file { [ $mountpoint ]:
+ensure => 'directory',
+}
+}
+elsif ($mount_type == 'labslvm') {
+labs_lvm::volume { 'data-local-disk':
+mountat => $mountpoint,
+}
+}
+
+if ($mount_type == 'nfs') {
+require_package('nfs-common')
+
+mount { $mountpoint:
+ensure   => 'mounted',
+device   => "${server}:/data",
+fstype   => 'nfs',
+name => $mountpoint,
+options  => 'bg,hard,tcp,rsize=8192,wsize=8192,intr,nfsvers=3',
+require  => File[$mountpoint],
+remounts => false,
+}
+}
+
+if (defined($managed_subdirs) and $managed_subdirs) {
+file { $managed_subdirs:
+ensure => 'directory',
+mode   => '0755',
+owner  => $user,
+group  => $group,
+}
+}
+}
diff --git a/modules/snapshot/manifests/dumps/nfsmount.pp 
b/modules/snapshot/manifests/dumps/nfsmount.pp
deleted file mode 100644
index 86c7f21..000
--- a/modules/snapshot/manifests/dumps/nfsmount.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-define snapshot::dumps::nfsmount(
-$mountpoint = undef,
-$server = undef,
-$managed_subdirs = [],
-$user = undef,
-$group = undef,
-) {
-require_package('nfs-common')
-
-file { [ $mountpoint ]:
-ensure => 'directory',
-}
-
-if (defined('$server') and $server != '') {
-mount { $mountpoint:
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix dropping of temp tables on SQLite and PG.

2018-01-06 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402573 )

Change subject: Fix dropping of temp tables on SQLite and PG.
..

Fix dropping of temp tables on SQLite and PG.

Also addresses other compatibility issues with PG mentioned
in comments on I7a4071072.

Bug: T184333
Change-Id: I478aa1aee15fdef99630c65a37b1af5f3f8cce14
---
M tests/phpunit/MediaWikiTestCase.php
M tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql
2 files changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/402573/1

diff --git a/tests/phpunit/MediaWikiTestCase.php 
b/tests/phpunit/MediaWikiTestCase.php
index 10f5d41..08e4562 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -1393,9 +1393,8 @@
$this->ensureMockDatabaseConnection( $db );
 
foreach ( $tables as $tbl ) {
-   $tmp = self::$useTemporaryTables ? ' TEMPORARY ' : '';
$tbl = $db->tableName( $tbl );
-   $db->query( "DROP $tmp TABLE IF EXISTS $tbl", 
__METHOD__ );
+   $db->query( "DROP TABLE IF EXISTS $tbl", __METHOD__ );
 
if ( $tbl === 'page' ) {
// Forget about the pages since they don't
diff --git a/tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql 
b/tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql
index e5ef5c6..43e8e9b 100644
--- a/tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql
+++ b/tests/phpunit/tests/MediaWikiTestCaseSchemaTest.sql
@@ -5,9 +5,9 @@
 ) /*$wgDBTableOptions*/;
 
 CREATE TABLE /*_*/imagelinks (
-  il_from int(10) unsigned NOT NULL DEFAULT 0,
-  il_from_namespace int(11) NOT NULL DEFAULT 0,
-  il_to varbinary(255) NOT NULL DEFAULT '',
+  il_from int NOT NULL DEFAULT 0,
+  il_from_namespace int NOT NULL DEFAULT 0,
+  il_to varchar(255) NOT NULL DEFAULT '',
   il_frobniz varchar(255) NOT NULL DEFAULT 'FROB',
   PRIMARY KEY (il_from,il_to)
 ) /*$wgDBTableOptions*/;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I478aa1aee15fdef99630c65a37b1af5f3f8cce14
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInsertFile[master]: Use SPDX 3.0 license identifier

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ib27d02a23a567218363ad3bef31aae0f3aa033d8
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 8cb2738..9c7e4ec 100644
--- a/extension.json
+++ b/extension.json
@@ -9,7 +9,7 @@
],
"descriptionmsg": "bs-insertfile-desc",
"type": "bluespice",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"bsgExtensions": {
"BlueSpiceInsertFile": {
"className": "InsertFile",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib27d02a23a567218363ad3bef31aae0f3aa033d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInsertFile
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
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...BlueSpiceInsertMagic[master]: Use SPDX 3.0 license identifier

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ida170cf2f03196c254db2bccf73160437f31
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 04db7b7..e3016c8 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceInsertMagic",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/InsertMagic;,
"author": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida170cf2f03196c254db2bccf73160437f31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInsertMagic
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
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...BlueSpiceInsertLink[master]: Use SPDX 3.0 license identifier

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I71dbfa7a763352faa00a50dd1635558c0c88daf4
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 6c2a325..f67fce2 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceInsertLink",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/InsertLink;,
"author": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71dbfa7a763352faa00a50dd1635558c0c88daf4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInsertLink
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
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...BlueSpiceUEModulePDF[master]: Use SPDX 3.0 license identifier

2018-01-06 Thread jenkins-bot (Code Review)

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

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I2594549825557a08b5b207635bc515cbac03e4ee
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 3e3233c..a7aca93 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceUEModulePDF",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/UEModulePDF;,
"author": "Robert Vogel",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2594549825557a08b5b207635bc515cbac03e4ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceUEModulePDF
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 >

1 - 100 of 155 matches

Mail list logo