date:20170826

[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: Babel: Parse wikitext of "babel-portal" message

2017-08-26 Thread Putnik (Code Review)

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

Change subject: Babel: Parse wikitext of "babel-portal" message
..

Babel: Parse wikitext of "babel-portal" message

This allows you to use language constructs and templates that return
custom link to the target page, without having to create redirects.

Change-Id: Iaea644fdbd7ba3191e83a1bad232d4982a51b24e
---
M BabelBox/LanguageBabelBox.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Babel 
refs/changes/64/374064/1

diff --git a/BabelBox/LanguageBabelBox.php b/BabelBox/LanguageBabelBox.php
index d49e957..783062f 100644
--- a/BabelBox/LanguageBabelBox.php
+++ b/BabelBox/LanguageBabelBox.php
@@ -71,7 +71,7 @@
public function render() {
$code = $this->code;
 
-   $portal = wfMessage( 'babel-portal', $code 
)->inContentLanguage()->plain();
+   $portal = wfMessage( 'babel-portal', $code 
)->inContentLanguage()->text();
if ( $portal !== '' ) {
$portal = "[[$portal|$code]]";
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaea644fdbd7ba3191e83a1bad232d4982a51b24e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Babel
Gerrit-Branch: master
Gerrit-Owner: Putnik 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Add repr string to EventStreams

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Add repr string to EventStreams
..


Add repr string to EventStreams

Change-Id: I0d571f7c9f39b848d67812128d95a21c30b019b4
---
M pywikibot/comms/eventstreams.py
1 file changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/pywikibot/comms/eventstreams.py b/pywikibot/comms/eventstreams.py
index 2236481..55128f4 100644
--- a/pywikibot/comms/eventstreams.py
+++ b/pywikibot/comms/eventstreams.py
@@ -69,6 +69,19 @@
 kwargs.setdefault('timeout', config.socket_timeout)
 self.sse_kwargs = kwargs
 
+def __repr__(self):
+"""Return representation string."""
+kwargs = self.sse_kwargs.copy()
+if self._site != Site():
+kwargs['site'] = self._site
+if self._stream:
+kwargs['stream'] = self._stream
+kwargs.pop('url')
+if kwargs['timeout'] == config.socket_timeout:
+kwargs.pop('timeout')
+return '{0}({1})'.format(self.__class__.__name__, ', '.join(
+'%s=%r' % x for x in kwargs.items()))
+
 @property
 def url(self):
 """Get the EventStream's url.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d571f7c9f39b848d67812128d95a21c30b019b4
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Merlijn van Deen 
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/mediawiki-config[master]: Rename Wikisaurus namespace on Wiktionary to "Thesaurus"

2017-08-26 Thread GeoffreyT2000 (Code Review)

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

Change subject: Rename Wikisaurus namespace on Wiktionary to "Thesaurus"
..

Rename Wikisaurus namespace on Wiktionary to "Thesaurus"

This will rename the "Wikisaurus" namespace to "Thesaurus" on Wiktionary. The 
old name will be preserved as an alias.

Bug: T174264
Change-Id: Ibfbec8b167b24669a80e123fe791c85d2f4cfdc5
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 8013276..4c82126 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -3475,7 +3475,9 @@
'WV' => NS_PROJECT,
],
'+enwiktionary' => [
-   'WS' => 110, // Wikisaurus
+   'WS' => 110, // Thesaurus
+   'Wikisaurus' => 110, // T174264
+   'Wikisaurus_talk' => 111,
'WT' => NS_PROJECT,
'CAT' => NS_CATEGORY, // T123187
'T' => NS_TEMPLATE, // T123187
@@ -6394,8 +6396,8 @@
107 => 'Rhymes_talk',
108 => 'Transwiki',
109 => 'Transwiki_talk',
-   110 => 'Wikisaurus',
-   111 => 'Wikisaurus_talk',
+   110 => 'Thesaurus', // T174264
+   111 => 'Thesaurus_talk',
# 112 => 'WT', // Removed per T24104
# 113 => 'WT_talk',
114 => 'Citations',

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

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

___
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: Depool db1055 because hardware issues

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: mariadb: Depool db1055 because hardware issues
..


mariadb: Depool db1055 because hardware issues

Raid seems to have gone to WriteThrough.

Change-Id: I4b909efc020368d55056f06b8e38b5b6985ce173
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 60a5d41..a6bb585 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -104,7 +104,7 @@
'db1052' => 0,   # B3 2.8TB  96GB, master
'db1067' => 0,   # D1 2.8TB 160GB, old master
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
-   'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
+   # 'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 10,  # D1 2.8TB 160GB, api
'db1072' => 50,  # B2 2.8TB 160GB, api
@@ -250,23 +250,23 @@
's1' => [
'watchlist' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'recentchanges' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'recentchangeslinked' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'contributions' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'logpager' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'dump' => [
'db1065' => 1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b909efc020368d55056f06b8e38b5b6985ce173
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
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/mediawiki-config[master]: mariadb: Depool db1055 because hardware issues

2017-08-26 Thread Jcrespo (Code Review)

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

Change subject: mariadb: Depool db1055 because hardware issues
..

mariadb: Depool db1055 because hardware issues

Raid seems to have gone to WriteThrough.

Change-Id: I4b909efc020368d55056f06b8e38b5b6985ce173
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 60a5d41..a6bb585 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -104,7 +104,7 @@
'db1052' => 0,   # B3 2.8TB  96GB, master
'db1067' => 0,   # D1 2.8TB 160GB, old master
'db1051' => 50,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
-   'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
+   # 'db1055' => 50,  # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 10,  # D1 2.8TB 160GB, api
'db1072' => 50,  # B2 2.8TB 160GB, api
@@ -250,23 +250,23 @@
's1' => [
'watchlist' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'recentchanges' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'recentchangeslinked' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'contributions' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'logpager' => [
'db1051' => 1,
-   'db1055' => 1,
+   # 'db1055' => 1,
],
'dump' => [
'db1065' => 1,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b909efc020368d55056f06b8e38b5b6985ce173
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...CodeMirror[master]: Use MyLanguage for betafeature info link.

2017-08-26 Thread Quiddity (Code Review)

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

Change subject: Use MyLanguage for betafeature info link.
..

Use MyLanguage for betafeature info link.

Bug: T145904
Change-Id: I093d3b0fa859b1e7616edf7749af94ddcc902b85
---
M CodeMirror.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror 
refs/changes/61/374061/2

diff --git a/CodeMirror.hooks.php b/CodeMirror.hooks.php
index 84afb94..ef61fbf 100644
--- a/CodeMirror.hooks.php
+++ b/CodeMirror.hooks.php
@@ -76,7 +76,7 @@
'ltr' => $wgExtensionAssetsPath . 
'/CodeMirror/resources/images/codemirror-beta-ltr.svg',
'rtl' => $wgExtensionAssetsPath . 
'/CodeMirror/resources/images/codemirror-beta-rtl.svg'
],
-   'info-link' => 
'https://meta.wikimedia.org/wiki/' .
+   'info-link' => 
'https://meta.wikimedia.org/wiki/Special:MyLanguage/' .

'Community_Tech/Wikitext_editor_syntax_highlighting',
'discussion-link' => 
'https://www.mediawiki.org/wiki/' .
'Extension_talk:CodeMirror'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I093d3b0fa859b1e7616edf7749af94ddcc902b85
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Quiddity 
Gerrit-Reviewer: Niharika29 

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

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: phpunit: replace deprecated strict=true

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: phpunit: replace deprecated strict=true
..


phpunit: replace deprecated strict=true

Each run shows:
Warning: Deprecated configuration setting "strict" used

strict is deprecated in PHPUnit 4.8, internally it adds five options +
one to mark its use as deprecated:

$result['reportUselessTests']  = $flag;
$result['strictCoverage']  = $flag;
$result['disallowTestOutput']  = $flag;
$result['enforceTimeLimit']= $flag;
$result['disallowTodoAnnotatedTests']  = $flag;
$result['deprecatedStrictModeSetting'] = true;

In phpunit.xml replace strict=yes and add the appropriate options.

Remove verbose=true and rename data provider to avoid risky test

Change-Id: Ibcc8b0704bbf84e39c883a014817b0248703c65a
---
M MediaWiki/Tests/MediaWikiStandardTest.php
M phpunit.xml.dist
2 files changed, 11 insertions(+), 7 deletions(-)

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



diff --git a/MediaWiki/Tests/MediaWikiStandardTest.php 
b/MediaWiki/Tests/MediaWikiStandardTest.php
index 81db88f..f4bf5d7 100644
--- a/MediaWiki/Tests/MediaWikiStandardTest.php
+++ b/MediaWiki/Tests/MediaWikiStandardTest.php
@@ -50,7 +50,7 @@
 * file against an expected output.
 * @return array $tests The test string[].
 */
-   public static function testProvider() {
+   public static function fileDataProvider() {
$tests = [];
 
$standard = dirname( __DIR__ );
@@ -77,7 +77,7 @@
/**
 * _testFile
 *
-* @dataProvider testProvider
+* @dataProvider fileDataProvider
 *
 * @param string $file The path string of file.
 * @param string $standard The standard string.
@@ -89,11 +89,12 @@
$expect = $this->prepareOutput( file_get_contents( 
$expectedOutputFile ) );
$this->assertEquals( $expect, $outputStr );
}
+
/**
 * @return array $tests The array of test.
 */
-   public static function testFixProvider() {
-   $tests = self::testProvider();
+   public static function fixDataProvider() {
+   $tests = self::fileDataProvider();
foreach ( array_keys( $tests ) as $idx ) {
$fixed = $tests[$idx][0] . ".fixed";
if ( file_exists( $fixed ) ) {
@@ -108,7 +109,7 @@
}
 
/**
-* @dataProvider testFixProvider
+* @dataProvider fixDataProvider
 * @param string $file The path of file.
 * @param string $standard The standard string.
 * @param string $fixedFile The path of fixed file.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d056159..4e4554f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -5,8 +5,11 @@
 convertNoticesToExceptions="true"
 convertWarningsToExceptions="true"
 mapTestClassNameToCoveredClassName="false"
-strict="false"
-verbose="false"
+beStrictAboutOutputDuringTests="true"
+beStrictAboutTestSize="true"
+beStrictAboutTestsThatDoNotTestAnything="true"
+checkForUnintentionallyCoveredCode="true"
+disallowTodoAnnotatedTests="true"
 bootstrap="./phpunit.bootstrap.php">



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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcc8b0704bbf84e39c883a014817b0248703c65a
Gerrit-PatchSet: 2
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...codesniffer[master]: Check spacing after type in @return

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Check spacing after type in @return
..


Check spacing after type in @return

The return type should followed by one space

Change-Id: I377beda4ff352c795952d2a9ff14db20626e2576
---
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/generic_pass.php
4 files changed, 38 insertions(+), 6 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 4ed767a..4cbe817 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -239,6 +239,7 @@
// The first word of the return type is the actual type
$exploded = explode( ' ', $content, 2 );
$type = $exploded[0];
+   $comment = isset( $exploded[1] ) ? $exploded[1] : null;
$fixType = false;
// Check for unneeded punctation
$matches = [];
@@ -274,10 +275,31 @@
}
}
}
+   // Check spacing after type
+   if ( $comment !== null ) {
+   $expectedSpaces = 1;
+   $currentSpaces = strspn( $comment, ' ' ) + 1;
+   if ( $currentSpaces !== $expectedSpaces ) {
+   $data = [
+   $expectedSpaces,
+   $currentSpaces,
+   ];
+   $fix = $phpcsFile->addFixableError(
+   'Expected %s spaces after 
return type; %s found',
+   $retType,
+   'SpacingAfterReturnType',
+   $data
+   );
+   if ( $fix ) {
+   $fixType = true;
+   $comment = substr( $comment, 
$currentSpaces - 1 );
+   }
+   }
+   }
if ( $fixType ) {
$phpcsFile->fixer->replaceToken(
$retType,
-   implode( '|', $explodedType ) . ( 
isset( $exploded[1] ) ? ' ' . $exploded[1] : '' )
+   implode( '|', $explodedType ) . ( 
$comment !== null ? ' ' . $comment : '' )
);
}
} else {
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php 
b/MediaWiki/Tests/files/Commenting/commenting_function.php
index e2ded82..154c615 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php
@@ -84,9 +84,9 @@
}
 
/**
-* @param  bool $aBool A bool
-* @paramint $anInt An int
-* @returnbool And some text
+* @param  bool$aBoolA bool
+* @paramint$anIntAn int
+* @returnboolAnd some text
 */
public function testTypesSpacing( $aBool, $anInt ) {
return $aBool;
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect 
b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
index 9b2dcca..b991e0e 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
@@ -52,10 +52,20 @@
  |   | (MediaWiki.Commenting.FunctionComment.NotShortIntReturn)
   87 | ERROR | [x] Expected 1 spaces before parameter type; 2 found
  |   | 
(MediaWiki.Commenting.FunctionComment.SpacingBeforeParamType)
+  87 | ERROR | [x] Expected 1 spaces after parameter type; 4 found
+ |   | (MediaWiki.Commenting.FunctionComment.SpacingAfterParamType)
+  87 | ERROR | [x] Expected 1 spaces after parameter name; 4 found
+ |   | (MediaWiki.Commenting.FunctionComment.SpacingAfterParamName)
   88 | ERROR | [x] Expected 1 spaces before parameter type; 4 found
  |   | 
(MediaWiki.Commenting.FunctionComment.SpacingBeforeParamType)
+  88 | ERROR | [x]

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Check for unneeded punctation in @param and @return

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Check for unneeded punctation in @param and @return
..


Check for unneeded punctation in @param and @return

After a return type there should be no colon or other punctation
(except [] for arrays and {} when javadoc style is used).
The same is for the variable name after @param.

Change-Id: Ie555ec1c0648fe09990c403853ea9548a4919531
---
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, 67 insertions(+), 9 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 3411f79..4ed767a 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -238,9 +238,24 @@
}
// The first word of the return type is the actual type
$exploded = explode( ' ', $content, 2 );
-   $explodedType = explode( '|', $exploded[0] );
+   $type = $exploded[0];
$fixType = false;
+   // Check for unneeded punctation
+   $matches = [];
+   if ( preg_match( '/^(.*)((?:(?![\[\]\{\}])\p{P})+)$/', 
$type, $matches ) ) {
+   $fix = $phpcsFile->addFixableError(
+   'Return type should not end with 
punctuation "%s"',
+   $retType,
+   'NotPunctuationReturn',
+   [ $matches[2] ]
+   );
+   $type = $matches[1];
+   if ( $fix ) {
+   $fixType = true;
+   }
+   }
// Check the type for short types
+   $explodedType = explode( '|', $type );
foreach ( $explodedType as $index => $singleType ) {
if ( isset( 
self::$shortTypeMapping[$singleType] ) ) {
$newType = 
self::$shortTypeMapping[$singleType];
@@ -410,7 +425,6 @@
if ( $param['var'] === '' ) {
continue;
}
-   $foundParams[] = $param['var'];
// Check number of spaces before type (after @param)
$spaces = 1;
if ( $param['param_space'] !== $spaces ) {
@@ -442,28 +456,48 @@
);
}
}
+   $var = $param['var'];
+   // Check for unneeded punctation
+   $matches = [];
+   if ( preg_match( 
'/^(.*?)((?:(?![\[\]\{\}])\p{P})+)(?addFixableError(
+   'Param name should not end with 
punctuation "%s"',
+   $param['tag'],
+   'NotPunctuationParam',
+   [ $matches[2] ]
+   );
+   $var = $matches[1];
+   if ( $fix ) {
+   $this->replaceParamComment(
+   $phpcsFile,
+   $param,
+   [ 'var' => $var ]
+   );
+   }
+   }
// Make sure the param name is correct.
if ( isset( $realParams[$pos] ) === true ) {
$realName = $realParams[$pos]['name'];
-   if ( $realName !== $param['var'] ) {
+   if ( $realName !== $var ) {
$code = 'ParamNameNoMatch';
$data = [
-   $param['var'],
+   $var,
$realName,
];
$error = 'Doc comment for parameter %s 
does not match ';
-   if ( strtolower(

[MediaWiki-commits] [Gerrit] labs...stewardbots[master]: Show user rights expiry in user rights notification message

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Show user rights expiry in user rights notification message
..


Show user rights expiry in user rights notification message

Bug: T164204
Change-Id: I572153dc5566378e55713dcb137f08828adeeb2a
---
M StewardBot/StewardBot.py
1 file changed, 41 insertions(+), 1 deletion(-)

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



diff --git a/StewardBot/StewardBot.py b/StewardBot/StewardBot.py
index aad2e29..d7e2b7c 100644
--- a/StewardBot/StewardBot.py
+++ b/StewardBot/StewardBot.py
@@ -3,6 +3,7 @@
 
 from ircbot import SingleServerIRCBot
 from irclib import nm_to_n
+from datetime import datetime
 import MySQLdb
 import os
 import random
@@ -11,6 +12,8 @@
 import sys
 import threading
 import time
+import urllib
+import json
 
 import config
 
@@ -1073,6 +1076,43 @@
 state1 = found.group('state1')
 state2 = found.group('state2')
 extra = found.group('extra')
+# check expiry via api
+urlapi = 
("https://meta.wikimedia.org/w/api.php?action=query=json=logevents=rights=User:;
 + usertarget + "=1")
+response = urllib.urlopen(urlapi)
+data = json.loads(response.read())
+oldright = data['query']['logevents'][0]['params']['oldgroups']
+newright = data['query']['logevents'][0]['params']['newgroups']
+lennewrights = len(newright) + 1
+lenoldrights = len(oldright) + 1
+chrightsn = ""
+chrightso = ""
+n = 1
+o = 1
+while o < lenoldrights:
+oldrightfield = 
data['query']['logevents'][0]['params']['oldgroups'][o-1]
+oldrightfieldexpiry = 
data['query']['logevents'][0]['params']['oldmetadata'][o-1]['expiry']
+if oldrightfieldexpiry != "infinity":
+chrightso = chrightso + oldrightfield + " (expiry: " + 
datetime.strptime(oldrightfieldexpiry, "%Y-%m-%dT%H:%M:%SZ").strftime('%H:%M, 
%d %B %Y') + ")"
+else:
+chrightso = chrightso + oldrightfield
+if o != lenoldrights - 1:
+chrightso = chrightso + ", "
+o = o+1
+if chrightso == "":
+chrightso = "(none)"
+while n < lennewrights:
+newrightfield = 
data['query']['logevents'][0]['params']['newgroups'][n-1]
+newrightfieldexpiry = 
data['query']['logevents'][0]['params']['newmetadata'][n-1]['expiry']
+if newrightfieldexpiry != "infinity":
+chrightsn = chrightsn + newrightfield + " (expiry: " + 
datetime.strptime(newrightfieldexpiry, "%Y-%m-%dT%H:%M:%SZ").strftime('%H:%M, 
%d %B %Y') + ")"
+else:
+chrightsn = chrightsn + newrightfield
+if n != lennewrights - 1:
+chrightsn = chrightsn + ", "
+n = n+1
+if chrightsn == "":
+chrightsn = "(none)"
+# end of check expiry
 if extra:
 print "!!! There are extra parameters!"
 comment = found.group('comment')
@@ -1092,7 +1132,7 @@
 bott = "06(bot) "
 bot1.msg(
 "%s%s03%s changed user rights for %s from 04%s to 
04%s%s" %
-(selff, bott, usersource, usertarget, state1, state2, 
comment))
+(selff, bott, usersource, usertarget, chrightso, 
chrightsn, comment))
 elif "Special:Log/gblblock" in a:
 if "gblock2" in a:
 # [[Special:Log/gblblock]] gblock2  * Pathoschild *  
globally blocked [[User:190.198.116.53]] (anonymous only, expires 15:18, 28 
April 2009): crosswiki abuse, likely proxy

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I572153dc5566378e55713dcb137f08828adeeb2a
Gerrit-PatchSet: 4
Gerrit-Project: labs/tools/stewardbots
Gerrit-Branch: master
Gerrit-Owner: Melos 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: Melos 
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...UniversalLanguageSelector[master]: Use Special:MyLanguage in help link for betafeature info

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Use Special:MyLanguage in help link for betafeature info
..


Use Special:MyLanguage in help link for betafeature info

Bug: T145904
Change-Id: I41eae6b4afc6c9cafcb096776304bea8df7293a5
---
M UniversalLanguageSelector.hooks.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index 8bf809c..bd9b936 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -424,7 +424,8 @@
'rtl' => 
"$imagesDir/compact-links-rtl.svg",
],
'info-link' =>
-   
'https://www.mediawiki.org/wiki/Universal_Language_Selector/Compact_Language_Links',
+   
'https://www.mediawiki.org/wiki/Special:MyLanguage/' .
+   
'Universal_Language_Selector/Compact_Language_Links',
'discussion-link' =>

'https://www.mediawiki.org/wiki/Talk:Universal_Language_Selector/Compact_Language_Links',
];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41eae6b4afc6c9cafcb096776304bea8df7293a5
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Quiddity 
Gerrit-Reviewer: Amire80 
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...ContentTranslation[master]: Use Special:MyLanguage in help link for betafeature info

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Use Special:MyLanguage in help link for betafeature info
..


Use Special:MyLanguage in help link for betafeature info

Bug: T145904
Change-Id: Ic4cb720a8f3110702e20d2a1345380fa472ff93e
---
M ContentTranslation.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index 6ffa75e..42bd6d8 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -121,7 +121,7 @@
'ltr' => "$imageDir/cx-icon-ltr.svg",
'rtl' => "$imageDir/cx-icon-rtl.svg",
],
-   'info-link' => 
'https://www.mediawiki.org/wiki/Content_translation',
+   'info-link' => 
'https://www.mediawiki.org/wiki/Special:MyLanguage/Content_translation',
'discussion-link' => 
'https://www.mediawiki.org/wiki/Talk:Content_translation',
'requirements' => [
'javascript' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4cb720a8f3110702e20d2a1345380fa472ff93e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Quiddity 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Santhosh 
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...UniversalLanguageSelector[master]: Align `border-radius` values with WikimediaUI

2017-08-26 Thread VolkerE (Code Review)

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

Change subject: Align `border-radius` values with WikimediaUI
..

Align `border-radius` values with WikimediaUI

Aligning `border-radius` values with WikimediaUI design, which
sets value to `2px`.

Change-Id: I7fd7bc5290fe781bfa02c3d5b74071b68cb22660
---
M resources/css/ext.uls.inputsettings.less
M resources/css/ext.uls.interface.less
M resources/css/ext.uls.languagesettings.less
M resources/css/ext.uls.less
4 files changed, 8 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/59/374059/1

diff --git a/resources/css/ext.uls.inputsettings.less 
b/resources/css/ext.uls.inputsettings.less
index 055f1bb..a9f8093 100644
--- a/resources/css/ext.uls.inputsettings.less
+++ b/resources/css/ext.uls.inputsettings.less
@@ -26,8 +26,8 @@
 
 .uls-ime-menu-settings-item {
background-color: #f8f9fa;
-   border-radius: 0 0 5px 5px;
border-top: 1px solid #c8ccd1;
+   border-radius: 0 0 2px 2px;
margin-top: 6px;
padding: 4px 2px;
color: #444;
diff --git a/resources/css/ext.uls.interface.less 
b/resources/css/ext.uls.interface.less
index 18edb1c..cf5031f 100644
--- a/resources/css/ext.uls.interface.less
+++ b/resources/css/ext.uls.interface.less
@@ -6,7 +6,7 @@
.vertical-gradient( #fbfbfb, #f0f0f0 );
padding-left: 10px;
line-height: 1.2em;
-   border-radius: 0 0 5px 5px;
+   border-radius: 0 0 2px 2px;
 }
 
 #uls-settings-block div.display-settings-block,
diff --git a/resources/css/ext.uls.languagesettings.less 
b/resources/css/ext.uls.languagesettings.less
index 72ea100..99352b9 100644
--- a/resources/css/ext.uls.languagesettings.less
+++ b/resources/css/ext.uls.languagesettings.less
@@ -6,7 +6,7 @@
border-top: 1px solid #c8ccd1;
padding-left: 10px;
line-height: 1.2em;
-   border-radius: 0 0 5px 5px;
+   border-radius: 0 0 2px 2px;
 }
 
 .uls-menu h3 {
diff --git a/resources/css/ext.uls.less b/resources/css/ext.uls.less
index e1b51c6..26537c7 100644
--- a/resources/css/ext.uls.less
+++ b/resources/css/ext.uls.less
@@ -2,20 +2,20 @@
 
 /* Overrides to follow MediaWiki style */
 .uls-menu {
-   border-radius: 4px;
+   border-radius: 2px;
/* Ensure base font size is same in different skins */
font-size: medium;
 }
 
 .uls-search,
 .uls-language-settings-close-block {
-   border-top-right-radius: 4px;
-   border-top-left-radius: 4px;
+   border-top-right-radius: 2px;
+   border-top-left-radius: 2px;
 }
 
 .uls-language-list {
-   border-bottom-right-radius: 4px;
-   border-bottom-left-radius: 4px;
+   border-bottom-right-radius: 2px;
+   border-bottom-left-radius: 2px;
 }
 
 .uls-menu.callout {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fd7bc5290fe781bfa02c3d5b74071b68cb22660
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use MyLanguage for info link.

2017-08-26 Thread Quiddity (Code Review)

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

Change subject: Use MyLanguage for info link.
..

Use MyLanguage for info link.

Change-Id: Ic4cb720a8f3110702e20d2a1345380fa472ff93e
---
M ContentTranslation.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/58/374058/2

diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index 6ffa75e..42bd6d8 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -121,7 +121,7 @@
'ltr' => "$imageDir/cx-icon-ltr.svg",
'rtl' => "$imageDir/cx-icon-rtl.svg",
],
-   'info-link' => 
'https://www.mediawiki.org/wiki/Content_translation',
+   'info-link' => 
'https://www.mediawiki.org/wiki/Special:MyLanguage/Content_translation',
'discussion-link' => 
'https://www.mediawiki.org/wiki/Talk:Content_translation',
'requirements' => [
'javascript' => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4cb720a8f3110702e20d2a1345380fa472ff93e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Quiddity 
Gerrit-Reviewer: Santhosh 

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Use MyLanguage for info link.

2017-08-26 Thread Quiddity (Code Review)

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

Change subject: Use MyLanguage for info link.
..

Use MyLanguage for info link.

Change-Id: I41eae6b4afc6c9cafcb096776304bea8df7293a5
---
M UniversalLanguageSelector.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/57/374057/2

diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index 8bf809c..ede887e 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -424,7 +424,7 @@
'rtl' => 
"$imagesDir/compact-links-rtl.svg",
],
'info-link' =>
-   
'https://www.mediawiki.org/wiki/Universal_Language_Selector/Compact_Language_Links',
+   
'https://www.mediawiki.org/wiki/Special:MyLanguage/Universal_Language_Selector/Compact_Language_Links',
'discussion-link' =>

'https://www.mediawiki.org/wiki/Talk:Universal_Language_Selector/Compact_Language_Links',
];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41eae6b4afc6c9cafcb096776304bea8df7293a5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Quiddity 
Gerrit-Reviewer: Amire80 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: importDump.php: Declare uploadCount property

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: importDump.php: Declare uploadCount property
..


importDump.php: Declare uploadCount property

Bug: T174255
Change-Id: Ic5014821a8f10ab29b729104cd7d4e434085e2f2
---
M maintenance/importDump.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index 802619e..206c7ee 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -37,6 +37,7 @@
public $revCount = 0;
public $dryRun = false;
public $uploads = false;
+   protected $uploadCount = 0;
public $imageBasePath = false;
public $nsFilter = false;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5014821a8f10ab29b729104cd7d4e434085e2f2
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: TTO 
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] mediawiki...TwoColConflict[master]: Use Special:MyLanguage in help link for betafeature info

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Use Special:MyLanguage in help link for betafeature info
..


Use Special:MyLanguage in help link for betafeature info

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

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



diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index 2c28007..9dcb5b8 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -71,7 +71,7 @@
'rtl' => 
"$extensionAssetsPath/TwoColConflict/resources/TwoColConflict-beta-features-rtl.svg",
],
'info-link'
-   => 
'https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View',
+   => 
'https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Two_Column_Edit_Conflict_View',
'discussion-link'
=> 
'https://www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View',
];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ce5f9753803d79700d08240c50b5a41e661cb41
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Quiddity 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: WMDE-Fisch 
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]: Installer: Fix "Array to string conversion" notice

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Installer: Fix "Array to string conversion" notice
..


Installer: Fix "Array to string conversion" notice

PHP Notice: Array to string conversion in .../includes/installer/Installer.php 
on line 1392

Follows-up fd8d75c1fd26e.

Bug: T174258
Change-Id: I6f8497a74a83aec183684bcb441191c32c67ccde
---
M includes/installer/Installer.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index ae80c8b..52be321 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -1389,7 +1389,7 @@
}
}
closedir( $dh );
-   natcasesort( $exts );
+   uksort( $exts, 'strnatcasecmp' );
 
return $exts;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6f8497a74a83aec183684bcb441191c32c67ccde
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MarkAHershberger 
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...Popups[master]: Use MyLanguage for info link.

2017-08-26 Thread Quiddity (Code Review)

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

Change subject: Use MyLanguage for info link.
..

Use MyLanguage for info link.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/56/374056/2

diff --git a/includes/PopupsHooks.php b/includes/PopupsHooks.php
index 9f2ac52..747705c 100644
--- a/includes/PopupsHooks.php
+++ b/includes/PopupsHooks.php
@@ -53,7 +53,7 @@
'ltr' => 
"$wgExtensionAssetsPath/Popups/images/popups-ltr.svg",
'rtl' => 
"$wgExtensionAssetsPath/Popups/images/popups-rtl.svg",
],
-   'info-link' => 
'https://www.mediawiki.org/wiki/Beta_Features/Hovercards',
+   'info-link' => 
'https://www.mediawiki.org/wiki/Special:MyLanguage/Beta_Features/Hovercards',
'discussion-link' => 
'https://www.mediawiki.org/wiki/Talk:Beta_Features/Hovercards',
'requirements' => [
'javascript' => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59c0b952cb44b31d0918c3d4659d47f2ddec7761
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Quiddity 
Gerrit-Reviewer: Pmiazga 

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

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Use MyLanguage help link.

2017-08-26 Thread Quiddity (Code Review)

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

Change subject: Use MyLanguage help link.
..

Use MyLanguage help link.

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/55/374055/2

diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index 2c28007..9dcb5b8 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -71,7 +71,7 @@
'rtl' => 
"$extensionAssetsPath/TwoColConflict/resources/TwoColConflict-beta-features-rtl.svg",
],
'info-link'
-   => 
'https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View',
+   => 
'https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Two_Column_Edit_Conflict_View',
'discussion-link'
=> 
'https://www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View',
];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ce5f9753803d79700d08240c50b5a41e661cb41
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Quiddity 
Gerrit-Reviewer: WMDE-Fisch 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move phabricator conf files outside of source tree

2017-08-26 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374054 )

Change subject: Move phabricator conf files outside of source tree
..

Move phabricator conf files outside of source tree

Problem: scap doesn't keep untracked files

SCAP deployments wipe out untracked files in the deployed source
tree. Our current phabricator puppetization involves a lot of
untracked files within /srv/phab/ which are managed by puppet.

This has the consequence that every scap deployment requires a full
puppet run to regenerate these config files. SCAP does not provide
a clean way to deal with this and even if we run puppet from a hook,
it would be slow. Accepting the slowness, we would also need to give
the deploy user ability to sudo as root.

Solution: Move untracked files outside of the source tree

After discussing this with @thcipriani, we decided that the best
approach would be to change puppet instead of adding a new feature
to scap to keep untracked files. I still think that would be nice
to have in scap, however, it's not trivial given that scap does a
fresh clone of the repo for every deployment.

bug: 172847
Change-Id: I439b41692e9c54848410d442bb54b4627713fb71
---
M modules/phabricator/manifests/conf_env.pp
M modules/phabricator/manifests/init.pp
M modules/phabricator/manifests/redirector.pp
3 files changed, 29 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/374054/1

diff --git a/modules/phabricator/manifests/conf_env.pp 
b/modules/phabricator/manifests/conf_env.pp
index 9904fee..6a673e1 100644
--- a/modules/phabricator/manifests/conf_env.pp
+++ b/modules/phabricator/manifests/conf_env.pp
@@ -11,7 +11,7 @@
 $owner  = 'root',
 $group  = 'root',
 ) {
-file { 
"${phabricator::phabdir}/phabricator/conf/local/${environment}.json":
+file { "${phabricator::confdir}/local/${environment}.json":
 owner   => $owner,
 group   => $group,
 mode=> '0640',
diff --git a/modules/phabricator/manifests/init.pp 
b/modules/phabricator/manifests/init.pp
index 1ad819e..17e0c9d 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -53,6 +53,7 @@
 
 class phabricator (
 $phabdir  = '/srv/phab',
+$confdir = '/srv/phab/phabricator/conf',
 $timezone = 'UTC',
 $trusted_proxies  = [],
 $libraries= [],
@@ -236,7 +237,21 @@
 notify  => Service['apache2'],
 }
 
-file { "${phabdir}/phabricator/conf/local/local.json":
+file { $confdir:
+ensure => 'directory',
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
+
+file { "${confdir}/local":
+ensure => 'directory',
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
+
+file { "${confdir}/local/local.json":
 content => template('phabricator/local.json.erb'),
 require => $base_requirements,
 owner   => 'root',
diff --git a/modules/phabricator/manifests/redirector.pp 
b/modules/phabricator/manifests/redirector.pp
index dcdf54a..d750159 100644
--- a/modules/phabricator/manifests/redirector.pp
+++ b/modules/phabricator/manifests/redirector.pp
@@ -15,12 +15,22 @@
 $phab_host   = 'phabricator.wikimedia.org',
 $alt_host= 'phab.wmfusercontent.org'
 ) {
+$preamble = "${phabricator::confdir}/preamble.php"
+$redirect_config = "${phabricator::confdir}/redirect_config.json"
+
 file { "${rootdir}/phabricator/support/preamble.php":
+ensure => 'link',
+target => $preamble
+}
+file { $preamble:
 content => template('phabricator/preamble.php.erb'),
-require => File["${rootdir}/phabricator/support/redirect_config.json"],
 }
 
-file { "${rootdir}/phabricator/support/redirect_config.json":
+file { $redirect_config:
 content => template('phabricator/redirect_config.json.erb'),
 }
+file { "${rootdir}/phabricator/support/redirect_config.json":
+ensure => 'link',
+target => $redirect_config,
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I439b41692e9c54848410d442bb54b4627713fb71
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: Add Mediawiki-extension-SendGrid work board to wikibugs

2017-08-26 Thread D3r1ck01 (Code Review)

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

Change subject: Add Mediawiki-extension-SendGrid work board to wikibugs
..

Add Mediawiki-extension-SendGrid work board to wikibugs

Adding the SendGrid mediawiki extension phabricator work board
to wikibugs so activities can be pushed to the #wiki-dev-africa
IRC channel on freenode.

Bug: T174260
Change-Id: I81353a5470371b598e99c63d98179a658a34b89a
---
M channels.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/53/374053/1

diff --git a/channels.yaml b/channels.yaml
index 62927ed..16a553c 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -292,6 +292,7 @@
 
 "#wiki-dev-africa":
 - Africa-Wikimedia-Developers
+- MediaWiki-extensions-SendGrid
 
 firehose-channel: '#mediawiki-feed'
 default-channel: '#wikimedia-dev'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81353a5470371b598e99c63d98179a658a34b89a
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
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...Wikibase[master]: Added monolingual languages per requests..

2017-08-26 Thread Zoranzoki21 (Code Review)

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

Change subject: Added monolingual languages per requests..
..

Added monolingual languages per requests..

List of languages:
1. ami (amis)
2. ssf (Thao)
3. fos (Siraya)
4. ppu (Papora / Hoanya)
5. pwn (Paiwan)
6. bnn (Bunun)
7. uun (Pazeh)
8. trv (Seediq / Taroko)
9. pyu (Puyuma)

Bug: T174238
Bug: T174236
Bug: T174234
Bug: T174233
Bug: T174231
Bug: T174230
Bug: T174229
Bug: T174228
Bug: T174227
Change-Id: I65f743c4a2210a25fcf870a0feb9eec24e7d8b20
---
M repo/includes/WikibaseRepo.php
1 file changed, 27 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/52/374052/2

diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 3605d54..d653e1e 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1882,6 +1882,33 @@
 
// T167811
'xpu',
+
+   // T174238
+   'ami',
+
+   // T174236
+   'ssf',
+
+   // T174234
+   'fos',
+
+   // T174233
+   'ppu',
+
+   // T174231
+   'pwn',
+
+   // T174230
+   'bnn',
+
+   // T174229
+   'uun',
+
+   // T174228
+   'trv',
+
+   // T174227
+   'pyu',
] )
),
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65f743c4a2210a25fcf870a0feb9eec24e7d8b20
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 

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

[MediaWiki-commits] [Gerrit] labs...stewardbots[master]: Show user rights expiry in user rights notification message

2017-08-26 Thread Melos (Code Review)

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

Change subject: Show user rights expiry in user rights notification message
..

Show user rights expiry in user rights notification message

Bug: T164204
Change-Id: I572153dc5566378e55713dcb137f08828adeeb2a
---
M StewardBot/StewardBot.py
1 file changed, 38 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/stewardbots 
refs/changes/51/374051/1

diff --git a/StewardBot/StewardBot.py b/StewardBot/StewardBot.py
index aad2e29..50eb440 100644
--- a/StewardBot/StewardBot.py
+++ b/StewardBot/StewardBot.py
@@ -1073,6 +1073,43 @@
 state1 = found.group('state1')
 state2 = found.group('state2')
 extra = found.group('extra')
+#check expiry via api
+urlapi = 
("https://meta.wikimedia.org/w/api.php?action=query=json=logevents=rights=User:;
 + usertarget + "=1")
+response = urllib.urlopen(urlapi)
+data = json.loads(response.read())
+oldright = data 
['query']['logevents'][0]['params']['oldgroups']
+newright = data 
['query']['logevents'][0]['params']['newgroups']
+lennewrights = len( newright ) + 1
+lenoldrights = len( oldright ) + 1
+chrightsn = ""
+chrightso = ""
+n= 1
+o =1
+while o < lenoldrights :
+oldrightfield = data 
['query']['logevents'][0]['params']['oldgroups'][o-1]
+oldrightfieldexpiry = data 
['query']['logevents'][0]['params']['oldmetadata'][o-1]['expiry']
+if oldrightfieldexpiry != "infinity" :
+chrightso = chrightso + oldrightfield + " (expiry: " + 
datetime.strptime( oldrightfieldexpiry , "%Y-%m-%dT%H:%M:%SZ" 
).strftime('%H:%M, %d %B %Y')  + ")"
+else:
+chrightso = chrightso + oldrightfield
+if  o  != lenoldrights - 1  :
+chrightso = chrightso + ", "
+o = o+1
+if chrightso == "" :
+chrightso = "(none)"
+while n < lennewrights :
+newrightfield = data 
['query']['logevents'][0]['params']['newgroups'][n-1]
+newrightfieldexpiry = data 
['query']['logevents'][0]['params']['newmetadata'][n-1]['expiry']
+if newrightfieldexpiry != "infinity" :
+chrightsn = chrightsn + newrightfield + " (expiry: " + 
datetime.strptime( newrightfieldexpiry , "%Y-%m-%dT%H:%M:%SZ" 
).strftime('%H:%M, %d %B %Y')  + ")"
+else:
+chrightsn = chrightsn + newrightfield
+if  n  != lennewrights - 1  :
+chrightsn = chrightsn + ", "
+n = n+1
+if chrightsn == "":
+chrightsn = "(none)"
+# end of check expiry
 if extra:
 print "!!! There are extra parameters!"
 comment = found.group('comment')
@@ -1092,7 +1129,7 @@
 bott = "06(bot) "
 bot1.msg(
 "%s%s03%s changed user rights for %s from 04%s to 
04%s%s" %
-(selff, bott, usersource, usertarget, state1, state2, 
comment))
+(selff, bott, usersource, usertarget, chrightso, 
chrightsn, comment))
 elif "Special:Log/gblblock" in a:
 if "gblock2" in a:
 # [[Special:Log/gblblock]] gblock2  * Pathoschild *  
globally blocked [[User:190.198.116.53]] (anonymous only, expires 15:18, 28 
April 2009): crosswiki abuse, likely proxy

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I572153dc5566378e55713dcb137f08828adeeb2a
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/stewardbots
Gerrit-Branch: master
Gerrit-Owner: Melos 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga/base: screen monitoring by default. whitelist copper, ...

2017-08-26 Thread Dzahn (Code Review)

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

Change subject: icinga/base: screen monitoring by default. whitelist copper, 
terbium
..

icinga/base: screen monitoring by default. whitelist copper, terbium

Enable screen/tmux monitoring for all hosts by default, except whitelist
copper and terbium per the original ticket.

Any others to remove?

Bug: T165348
Change-Id: Ib34a53205235eb9310a32731f1383e6a77985ee7
---
A hieradata/hosts/copper.yaml
M hieradata/hosts/netmon2001.yaml
A hieradata/hosts/terbium.yaml
M modules/base/manifests/monitoring/host.pp
4 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/374050/1

diff --git a/hieradata/hosts/copper.yaml b/hieradata/hosts/copper.yaml
new file mode 100644
index 000..4bfa7b0
--- /dev/null
+++ b/hieradata/hosts/copper.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/hieradata/hosts/netmon2001.yaml b/hieradata/hosts/netmon2001.yaml
index f9409f6..370806d 100644
--- a/hieradata/hosts/netmon2001.yaml
+++ b/hieradata/hosts/netmon2001.yaml
@@ -1,2 +1 @@
 do_acme: false
-monitor_screens: true
diff --git a/hieradata/hosts/terbium.yaml b/hieradata/hosts/terbium.yaml
new file mode 100644
index 000..4bfa7b0
--- /dev/null
+++ b/hieradata/hosts/terbium.yaml
@@ -0,0 +1 @@
+monitor_screens: false
diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index a7bd6c5..1aa33e9 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -148,7 +148,7 @@
 }
 }
 
-if hiera('monitor_screens', false) {
+if hiera('monitor_screens', true) {
 
 file { '/usr/local/lib/nagios/plugins/check_long_procs':
 ensure => present,

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

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

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix directory

2017-08-26 Thread Paladox (Code Review)

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

Change subject: Fix directory
..


Fix directory

Change-Id: I7fd3355e119500b7142c9a9c390246a6bc69b5ca
---
M manifests/web.pp
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/manifests/web.pp b/manifests/web.pp
index 55a9a2c..4ab9bc8 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -101,7 +101,7 @@
 group  => 'icingaweb2',
 }
 
-file { '/etc/icingaweb2/modules/director/config.ini':
+file { '/etc/icingaweb2/modules/director':
 ensure => 'directory',
 owner  => 'www-data',
 group  => 'icingaweb2',
@@ -112,7 +112,7 @@
 content => template('icinga2/config.ini.erb'),
 owner  => 'www-data',
 group  => 'icingaweb2',
-require => File['/etc/icingaweb2/modules/director/config.ini'],
+require => File['/etc/icingaweb2/modules/director'],
 }
 
 file { '/etc/icingaweb2/modules/director/kickstart.ini':
@@ -120,7 +120,7 @@
 content => template('icinga2/kickstart.ini.erb'),
 owner  => 'www-data',
 group  => 'icingaweb2',
-require => File['/etc/icingaweb2/modules/director/config.ini'],
+require => File['/etc/icingaweb2/modules/director'],
 }
 
 file { '/etc/icingaweb2/modules/monitoring/backends.ini':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fd3355e119500b7142c9a9c390246a6bc69b5ca
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix directory

2017-08-26 Thread Paladox (Code Review)

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

Change subject: Fix directory
..

Fix directory

Change-Id: I7fd3355e119500b7142c9a9c390246a6bc69b5ca
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/49/374049/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fd3355e119500b7142c9a9c390246a6bc69b5ca
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix apt package

2017-08-26 Thread Paladox (Code Review)

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

Change subject: Fix apt package
..


Fix apt package

Change-Id: I14810a769e160672ea770e23d8baf3babbca42d5
---
M manifests/web.pp
1 file changed, 18 insertions(+), 2 deletions(-)

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



diff --git a/manifests/web.pp b/manifests/web.pp
index 0e78b19..55a9a2c 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -20,8 +20,7 @@
 include ::icinga2
 
 package { [ 'icingaweb2', 'icingaweb2-module-monitoring',
-'icingaweb2-module-doc', 'icingaweb2-module-director',
-'icingacli' ] :
+'icingaweb2-module-doc', 'icingacli' ] :
 ensure => present,
 require => Apt::Repository['icinga2'],
 }
@@ -103,10 +102,17 @@
 }
 
 file { '/etc/icingaweb2/modules/director/config.ini':
+ensure => 'directory',
+owner  => 'www-data',
+group  => 'icingaweb2',
+}
+
+file { '/etc/icingaweb2/modules/director/config.ini':
 ensure => present,
 content => template('icinga2/config.ini.erb'),
 owner  => 'www-data',
 group  => 'icingaweb2',
+require => File['/etc/icingaweb2/modules/director/config.ini'],
 }
 
 file { '/etc/icingaweb2/modules/director/kickstart.ini':
@@ -114,6 +120,7 @@
 content => template('icinga2/kickstart.ini.erb'),
 owner  => 'www-data',
 group  => 'icingaweb2',
+require => File['/etc/icingaweb2/modules/director/config.ini'],
 }
 
 file { '/etc/icingaweb2/modules/monitoring/backends.ini':
@@ -137,6 +144,15 @@
 group  => 'icingaweb2',
 }
 
+#git::clone { 'beta-mediawiki-core':
+#directory => "${stage_dir}/php-master",
+#origin=> 'https://gerrit.wikimedia.org/r/p/mediawiki/core.git',
+#branch=> 'master',
+#owner => 'root',
+#group => 'root',
+#require   => Package['icingaweb2'],
+#}
+
 # install the Icinga Apache site
 include ::apache::mod::rewrite
 include ::apache::mod::authnz_ldap

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14810a769e160672ea770e23d8baf3babbca42d5
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix apt package

2017-08-26 Thread Paladox (Code Review)

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

Change subject: Fix apt package
..

Fix apt package

Change-Id: I14810a769e160672ea770e23d8baf3babbca42d5
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/48/374048/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14810a769e160672ea770e23d8baf3babbca42d5
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix director install

2017-08-26 Thread Paladox (Code Review)

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

Change subject: Fix director install
..


Fix director install

Change-Id: Ie5fa164dbeccd8f7efee406245e18f6b61b58479
---
M manifests/init.pp
M manifests/plugins.pp
M manifests/web.pp
A templates/api-users.conf.erb
A templates/config.ini.erb
R templates/gerrit-icinga.wmflabs.org.erb
A templates/kickstart.ini.erb
A templates/zones.conf.erb
8 files changed, 107 insertions(+), 50 deletions(-)

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



diff --git a/manifests/init.pp b/manifests/init.pp
index bfc7bdb..c56e708 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,6 +16,7 @@
 $icinga_ido_user_name = hiera('icinga_ido_user_name'),
 $icinga_ido_password = hiera('icinga_ido_password'),
 $os = hiera('icinga_apt_dist'),
+$icinga_api_password = hiera('icinga_api_password'),
 ) {
 apt::repository { 'icinga2':
 uri=> 'http://packages.icinga.com/debian',
@@ -69,82 +70,98 @@
 }
 
 file { '/etc/icinga2/constants.conf':
-ensure => present,
+ensure  => present,
 content => template('icinga2/constants.conf.erb'),
-owner  => 'root',
-group  => 'root',
+owner   => 'root',
+group   => 'root',
+notify  => Base::Service_unit['icinga2'],
+}
+
+file { '/etc/icinga2/zones.conf':
+ensure  => present,
+content => template('icinga2/zones.conf.erb'),
+owner   => 'root',
+group   => 'root',
+notify  => Base::Service_unit['icinga2'],
+}
+
+file { '/etc/icinga2/conf.d/api-users.conf':
+ensure  => present,
+content => template('icinga2/api-users.conf.erb'),
+owner   => 'root',
+group   => 'root',
 notify  => Base::Service_unit['icinga2'],
 }
 
 file { '/etc/icinga2/conf.d/apt.conf':
-ensure => present,
+ensure  => present,
 content => template('icinga2/apt.conf.erb'),
-owner  => 'root',
-group  => 'root',
+owner   => 'root',
+group   => 'root',
 notify  => Base::Service_unit['icinga2'],
 }
 
 file { '/etc/icinga2/conf.d/commands.conf':
-ensure => present,
+ensure  => present,
 content => template('icinga2/commands.conf.erb'),
-owner  => 'root',
-group  => 'root',
+owner   => 'root',
+group   => 'root',
 notify  => Base::Service_unit['icinga2'],
 }
 
 file { '/etc/icinga2/conf.d/downtimes.conf':
-ensure => present,
+ensure  => present,
 content => template('icinga2/downtimes.conf.erb'),
-owner  => 'root',
-group  => 'root',
-notify => Base::Service_unit['icinga2'],
+owner   => 'root',
+group   => 'root',
+notify  => Base::Service_unit['icinga2'],
 }
 
 file { '/etc/icinga2/conf.d/groups.conf':
-ensure => present,
+ensure  => present,
 content => template('icinga2/groups.conf.erb'),
-owner  => 'root',
-group  => 'root',
-notify => Base::Service_unit['icinga2'],
+owner   => 'root',
+group   => 'root',
+notify  => Base::Service_unit['icinga2'],
 }
 
 file { '/etc/icinga2/conf.d/hosts.conf':
-ensure => present,
+ensure  => present,
 content => template('icinga2/hosts.conf.erb'),
-owner  => 'root',
-group  => 'root',
+owner   => 'root',
+group   => 'root',
 notify  => Base::Service_unit['icinga2'],
 }
 
 file { '/etc/icinga2/conf.d/notifications.conf':
-ensure => present,
+ensure  => present,
 content => template('icinga2/notifications.conf.erb'),
-owner  => 'root',
-group  => 'root',
+owner   => 'root',
+group   => 'root',
 notify  => Base::Service_unit['icinga2'],
 }
 
 file { '/etc/icinga2/conf.d/satellite.conf':
-ensure => present,
+ensure  => present,
 content => template('icinga2/satellite.conf.erb'),
-owner  => 'root',
-group  => 'root',
+owner   => 'root',
+group   => 'root',
 notify  => Base::Service_unit['icinga2'],
 }
 
 file { '/etc/icinga2/conf.d/services.conf':
-ensure => present,
+ensure  => present,
 content => template('icinga2/services.conf.erb'),
-owner  => 'root',
-group  => 'root',
+owner   => 'root',
+group   => 'root',
 notify  => Base::Service_unit['icinga2'],
 }
 
 file { '/etc/icinga2/conf.d/templates.conf':
-ensure => present,
+ensure  => present,
 content => template('icinga2/templates.conf.erb'),
-owner  => 'root',
-group  => 'root',
+owner   => 'root',
+group   => 'root',

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Fix director install

2017-08-26 Thread Paladox (Code Review)

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

Change subject: Fix director install
..

Fix director install

Change-Id: Ie5fa164dbeccd8f7efee406245e18f6b61b58479
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/46/374046/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5fa164dbeccd8f7efee406245e18f6b61b58479
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix php notice

2017-08-26 Thread MarkAHershberger (Code Review)

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

Change subject: Fix php notice
..

Fix php notice

PHP Notice: Array to string conversion in .../includes/installer/Installer.php 
on line 1392

Bug: T174258
Change-Id: I6f8497a74a83aec183684bcb441191c32c67ccde
---
M includes/installer/Installer.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/47/374047/1

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index ae80c8b..52be321 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -1389,7 +1389,7 @@
}
}
closedir( $dh );
-   natcasesort( $exts );
+   uksort( $exts, 'strnatcasecmp' );
 
return $exts;
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Accomodate dump files that don't come directly from dumpBack...

2017-08-26 Thread MarkAHershberger (Code Review)

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

Change subject: Accomodate dump files that don't come directly from 
dumpBackup.php
..

Accomodate dump files that don't come directly from dumpBackup.php

Bug: T174257
Change-Id: I581d29b37b2b0030838563e247a635b0defe3bbd
---
M includes/import/WikiImporter.php
M languages/i18n/en.json
2 files changed, 22 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/45/374045/1

diff --git a/includes/import/WikiImporter.php b/includes/import/WikiImporter.php
index 2099709..b69dc92 100644
--- a/includes/import/WikiImporter.php
+++ b/includes/import/WikiImporter.php
@@ -996,14 +996,24 @@
$text = isset( $uploadInfo['text'] ) ? $uploadInfo['text'] : '';
 
$revision->setTitle( $pageInfo['_title'] );
-   $revision->setID( $pageInfo['id'] );
-   $revision->setTimestamp( $uploadInfo['timestamp'] );
+   if ( isset( $pageInfo['id'] ) ) {
+   $revision->setID( $pageInfo['id'] );
+   }
+   if ( isset( $uploadInfo['timestamp'] ) ) {
+   $revision->setTimestamp( $uploadInfo['timestamp'] );
+   }
$revision->setText( $text );
+   if ( !isset( $uploadInfo['filename'] ) ) {
+   $this->notice( 'import-error-need-filename', 
$pageInfo['_title'] );
+   $uploadInfo['filename'] = 
$pageInfo['_title']->getDBKey();
+   }
$revision->setFilename( $uploadInfo['filename'] );
if ( isset( $uploadInfo['archivename'] ) ) {
$revision->setArchiveName( $uploadInfo['archivename'] );
}
-   $revision->setSrc( $uploadInfo['src'] );
+   if ( isset( $uploadInfo['src'] ) ) {
+   $revision->setSrc( $uploadInfo['src'] );
+   }
if ( isset( $uploadInfo['fileSrc'] ) ) {
$revision->setFileSrc( $uploadInfo['fileSrc'],
!empty( $uploadInfo['isTempSrc'] ) );
@@ -1011,14 +1021,20 @@
if ( isset( $uploadInfo['sha1base36'] ) ) {
$revision->setSha1Base36( $uploadInfo['sha1base36'] );
}
-   $revision->setSize( intval( $uploadInfo['size'] ) );
-   $revision->setComment( $uploadInfo['comment'] );
+   if ( isset( $uploadInfo['size'] ) ) {
+   $revision->setSize( intval( $uploadInfo['size'] ) );
+   }
+   if ( isset( $uploadInfo['comment'] ) ) {
+   $revision->setComment( $uploadInfo['comment'] );
+   }
 
if ( isset( $uploadInfo['contributor']['ip'] ) ) {
$revision->setUserIP( $uploadInfo['contributor']['ip'] 
);
}
if ( isset( $uploadInfo['contributor']['username'] ) ) {
$revision->setUsername( 
$uploadInfo['contributor']['username'] );
+   } else {
+   $revision->setUsername( __CLASS__ );
}
$revision->setNoUpdates( $this->mNoUpdates );
 
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index a44b3cf..96c0952 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2765,6 +2765,7 @@
"import-error-invalid": "Page \"$1\" was not imported because the name 
to which it would be imported is invalid on this wiki.",
"import-error-unserialize": "Revision $2 of page \"$1\" could not be 
unserialized. The revision was reported to use content model $3 serialized as 
$4.",
"import-error-bad-location": "Revision $2 using content model $3 cannot 
be stored on \"$1\" on this wiki, since that model is not supported on that 
page.",
+   "import-error-need-filename": "No filename supplied for $1, using 
title.",
"import-options-wrong": "Wrong {{PLURAL:$2|option|options}}: 
$1",
"import-rootpage-invalid": "Given root page is an invalid title.",
"import-rootpage-nosubpage": "Namespace \"$1\" of the root page does 
not allow subpages.",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Declare uploadCount property

2017-08-26 Thread MarkAHershberger (Code Review)

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

Change subject: Declare uploadCount property
..

Declare uploadCount property

Bug: T174255
Change-Id: Ic5014821a8f10ab29b729104cd7d4e434085e2f2
---
M maintenance/importDump.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/44/374044/1

diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index 802619e..206c7ee 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -37,6 +37,7 @@
public $revCount = 0;
public $dryRun = false;
public $uploads = false;
+   protected $uploadCount = 0;
public $imageBasePath = false;
public $nsFilter = false;
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Replace $( document ).ready(...) by $(...)

2017-08-26 Thread Fomafix (Code Review)

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

Change subject: Replace $( document ).ready(...) by $(...)
..

Replace $( document ).ready(...) by $(...)

In jQuery 3 $(document).ready(...) is deprecated.
https://jquery.com/upgrade-guide/3.0/#deprecated-document-ready-handlers-other-than-jquery-function

Change-Id: Ib1cc74f126751cb0672d00a564458c039548d111
---
M resources/jquery/jquery.lazyload.js
M resources/mw.UploadWizardPage.js
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/43/374043/1

diff --git a/resources/jquery/jquery.lazyload.js 
b/resources/jquery/jquery.lazyload.js
index b22b1e5..5cd1cf1 100644
--- a/resources/jquery/jquery.lazyload.js
+++ b/resources/jquery/jquery.lazyload.js
@@ -160,7 +160,7 @@
 }
 
 /* Force initial check if images should appear. */
-$(document).ready(function() {
+$(function() {
 update();
 });
 
diff --git a/resources/mw.UploadWizardPage.js b/resources/mw.UploadWizardPage.js
index fabdbab..09ccc5a 100644
--- a/resources/mw.UploadWizardPage.js
+++ b/resources/mw.UploadWizardPage.js
@@ -51,7 +51,7 @@
uploadWizard.createInterface( '#upload-wizard' );
};
 
-   $( document ).ready( function () {
+   $( function () {
// show page.
mw.UploadWizardPage();
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1cc74f126751cb0672d00a564458c039548d111
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ExtensionRegistry: Add 'override' merge strategy

2017-08-26 Thread EddieGP (Code Review)

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

Change subject: ExtensionRegistry: Add 'override' merge strategy
..

ExtensionRegistry: Add 'override' merge strategy

That merge strategy just let's setting from LocalSettings.php override
anything that was specified in extension.json instead of merging arrays.

Bug: T142663
Change-Id: If6c7733c23c52bd77e291a1a436f0a81f37d71f3
---
M includes/registration/ExtensionRegistry.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/42/374042/1

diff --git a/includes/registration/ExtensionRegistry.php 
b/includes/registration/ExtensionRegistry.php
index eac04a9..f3f467b 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -310,6 +310,9 @@
case 'array_merge':
$GLOBALS[$key] = array_merge( $val, 
$GLOBALS[$key] );
break;
+   case 'override':
+   // Do nothing.
+   break;
default:
throw new UnexpectedValueException( 
"Unknown merge strategy '$mergeStrategy'" );
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: "PHP Warning: XMLReader::open(): Unable to open source data"...

2017-08-26 Thread MarkAHershberger (Code Review)

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

Change subject: "PHP Warning: XMLReader::open(): Unable to open source data" on 
JPG data
..

"PHP Warning: XMLReader::open(): Unable to open source data" on JPG data

MimeAnalyzer::doGuessMimeType() uses XmlTypeCheck to find the type of
a file. When the file does not contain XML data (e.g JPEG data) the
following is emitted:

PHP Warning:  XMLReader::open(): Unable to open source data

suppressWarnings() should be used or the getimagesize() check should be done 
earlier.

Bug: T174254
Change-Id: I2d4f1991490c6989e54527c03dd9146e87e175a0
---
M includes/libs/mime/MimeAnalyzer.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/374041/1

diff --git a/includes/libs/mime/MimeAnalyzer.php 
b/includes/libs/mime/MimeAnalyzer.php
index 4d860bb..826cc37 100644
--- a/includes/libs/mime/MimeAnalyzer.php
+++ b/includes/libs/mime/MimeAnalyzer.php
@@ -760,7 +760,9 @@
/**
 * look for XML formats (XHTML and SVG)
 */
+   MediaWiki\suppressWarnings();
$xml = new XmlTypeCheck( $file );
+   MediaWiki\restoreWarnings();
if ( $xml->wellFormed ) {
$xmlTypes = $this->xmlTypes;
if ( isset( $xmlTypes[$xml->getRootElement()] ) ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Declare uploadCount property

2017-08-26 Thread MarkAHershberger (Code Review)

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

Change subject: Declare uploadCount property
..

Declare uploadCount property

Bug: T174255
Change-Id: Ic5014821a8f10ab29b729104cd7d4e434085e2f2
---
M maintenance/importDump.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/40/374040/1

diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index f0e0555..38d786b 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -37,6 +37,7 @@
public $revCount = 0;
public $dryRun = false;
public $uploads = false;
+   protected $uploadCount = 0;
public $imageBasePath = false;
public $nsFilter = false;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5014821a8f10ab29b729104cd7d4e434085e2f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: MarkAHershberger 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: Fix/hack ErrorPageError to work from non-UI contexts

2017-08-26 Thread MarkAHershberger (Code Review)

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

Change subject: Fix/hack ErrorPageError to work from non-UI contexts
..

Fix/hack ErrorPageError to work from non-UI contexts

Right now, ErrorPageError *assumes* you're never running on the cli
or the API. It's kinda a crappy superclass to use for errors unless
you're 1000% sure you'll never hit that code path. Yay assumptions!

Ideally, all of this report() crap is cleaned up and unified across
the like 1192902117 places we have it spread out, but for now just
detect the scenario and delegate back to MWException, which does the
right thing

Bug: T168337
Change-Id: Ia2f490528e128527a7a5ef1f4f5eea36ec9ee810
---
M includes/exception/ErrorPageError.php
M tests/phpunit/includes/exception/ErrorPageErrorTest.php
2 files changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/38/374038/1

diff --git a/includes/exception/ErrorPageError.php 
b/includes/exception/ErrorPageError.php
index 2f502d8..97ba56b 100644
--- a/includes/exception/ErrorPageError.php
+++ b/includes/exception/ErrorPageError.php
@@ -53,9 +53,12 @@
}
 
public function report() {
-   global $wgOut;
-
-   $wgOut->showErrorPage( $this->title, $this->msg, $this->params 
);
-   $wgOut->output();
+   if ( self::isCommandLine() || defined( 'MW_API' ) ) {
+   parent::report();
+   } else {
+   global $wgOut;
+   $wgOut->showErrorPage( $this->title, $this->msg, 
$this->params );
+   $wgOut->output();
+   }
}
 }
diff --git a/tests/phpunit/includes/exception/ErrorPageErrorTest.php 
b/tests/phpunit/includes/exception/ErrorPageErrorTest.php
index 71398e3..e72865f 100644
--- a/tests/phpunit/includes/exception/ErrorPageErrorTest.php
+++ b/tests/phpunit/includes/exception/ErrorPageErrorTest.php
@@ -43,6 +43,7 @@
$mock->expects( $this->once() )
->method( 'output' );
$this->setMwGlobals( 'wgOut', $mock );
+   $this->setMwGlobals( 'wgCommandLineMode', false );
 
$e = new ErrorPageError( $title, $mockMessage, $params );
$e->report();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2f490528e128527a7a5ef1f4f5eea36ec9ee810
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: MarkAHershberger 
Gerrit-Reviewer: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_28]: "PHP Warning: XMLReader::open(): Unable to open source data"...

2017-08-26 Thread MarkAHershberger (Code Review)

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

Change subject: "PHP Warning: XMLReader::open(): Unable to open source data" on 
JPG data
..

"PHP Warning: XMLReader::open(): Unable to open source data" on JPG data

MimeAnalyzer::doGuessMimeType() uses XmlTypeCheck to find the type of
a file. When the file does not contain XML data (e.g JPEG data) the
following is emitted:

PHP Warning:  XMLReader::open(): Unable to open source data

suppressWarnings() should be used or the getimagesize() check should be done 
earlier.

Bug: T174254
Change-Id: I2d4f1991490c6989e54527c03dd9146e87e175a0
---
M includes/libs/mime/MimeAnalyzer.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/39/374039/1

diff --git a/includes/libs/mime/MimeAnalyzer.php 
b/includes/libs/mime/MimeAnalyzer.php
index 5f4d7c9..8621f43 100644
--- a/includes/libs/mime/MimeAnalyzer.php
+++ b/includes/libs/mime/MimeAnalyzer.php
@@ -743,7 +743,9 @@
/**
 * look for XML formats (XHTML and SVG)
 */
+   MediaWiki\suppressWarnings();
$xml = new XmlTypeCheck( $file );
+   MediaWiki\restoreWarnings();
if ( $xml->wellFormed ) {
$xmlTypes = $this->xmlTypes;
if ( isset( $xmlTypes[$xml->getRootElement()] ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d4f1991490c6989e54527c03dd9146e87e175a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: MarkAHershberger 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [Fix] Update isbn.py

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: [Fix] Update isbn.py
..


[Fix] Update isbn.py

This file was forgotten and not included in
Ib43948d70d6c4e957043a862bdbf3c9d27eee03a.

Change-Id: I1d61d46050342e56e171dd3edf1204d3992d1101
---
M scripts/isbn.py
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/scripts/isbn.py b/scripts/isbn.py
index 9679d33..d7eb397 100755
--- a/scripts/isbn.py
+++ b/scripts/isbn.py
@@ -1540,6 +1540,8 @@
 
 """ISBN bot to be run on Wikibase sites."""
 
+use_from_page = None
+
 def __init__(self, generator, **kwargs):
 """Constructor."""
 self.availableOptions.update({
@@ -1549,7 +1551,7 @@
 self.isbn_10_prop_id = kwargs.pop('prop-isbn-10', None)
 self.isbn_13_prop_id = kwargs.pop('prop-isbn-13', None)
 
-super(IsbnWikibaseBot, self).__init__(use_from_page=None, **kwargs)
+super(IsbnWikibaseBot, self).__init__(**kwargs)
 
 self.generator = generator
 if self.isbn_10_prop_id is None:
@@ -1558,7 +1560,7 @@
 self.isbn_13_prop_id = self.get_property_by_name('ISBN-13')
 self.comment = i18n.twtranslate(pywikibot.Site(), 'isbn-formatting')
 
-def treat(self, page, item):
+def treat_page_and_item(self, page, item):
 """Treat a page."""
 change_messages = []
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d61d46050342e56e171dd3edf1204d3992d1101
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
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] mediawiki...CheckUser[master]: Migrate from .bind() to .on()

2017-08-26 Thread Huji (Code Review)

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

Change subject: Migrate from .bind() to .on()
..

Migrate from .bind() to .on()

This is to comply with the jQuery upgrade

Change-Id: I69b5fd8b0c60ff711e94ea0fadef71036a2e72c2
---
M modules/ext.checkuser.cidr.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CheckUser 
refs/changes/37/374037/1

diff --git a/modules/ext.checkuser.cidr.js b/modules/ext.checkuser.cidr.js
index 55a3448..f07bfd1 100644
--- a/modules/ext.checkuser.cidr.js
+++ b/modules/ext.checkuser.cidr.js
@@ -252,7 +252,7 @@
 
 $( function () {
updateCIDRresult();
-   $( '#mw-checkuser-iplist' ).bind( 'keyup click', function () {
+   $( '#mw-checkuser-iplist' ).on( 'keyup click', function () {
updateCIDRresult();
} );
 } );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69b5fd8b0c60ff711e94ea0fadef71036a2e72c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Huji 

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

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Always verify an extension exists, even if the mechanism is ...

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Always verify an extension exists, even if the mechanism is 
forced
..


Always verify an extension exists, even if the mechanism is forced

When an extension is loaded with a forced mechanism, it was not verified the
extension really exists; it is now the case.

Bug: T168807
Change-Id: I8146406a9a5139b8d86dcffd18c342fc16a2b94c
---
M src/MediaWikiFarmConfiguration.php
M tests/phpunit/ConfigurationTest.php
M tests/phpunit/data/config/extensionssettings.php
3 files changed, 40 insertions(+), 19 deletions(-)

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



diff --git a/src/MediaWikiFarmConfiguration.php 
b/src/MediaWikiFarmConfiguration.php
index 458a247..9d70f51 100644
--- a/src/MediaWikiFarmConfiguration.php
+++ b/src/MediaWikiFarmConfiguration.php
@@ -424,32 +424,45 @@
$setting = 'wgUse' . preg_replace( 
'/[^a-zA-Z0-9_\x7f\xff]/', '', $key );
$value =& $this->configuration['settings'][$setting];
 
+   # Extension is deactivated
if( $value === false ) {
$status = null;
unset( $this->configuration['extensions'][$key] 
);
-   } elseif( $ExtensionRegistry === null || $value === 
'composer' ) {
-   if( $this->detectComposer( $type, $name ) ) {
-   $status = 'composer';
-   $value = true;
-   } elseif( $value === 'composer' ) {
-   $value = false;
-   unset( 
$this->configuration['extensions'][$key] );
-   }
-   } elseif( $value === 'require_once' || $value === 
'wfLoad' . ucfirst( $type ) ) {
+
+   # Mechanism Composer wanted
+   } elseif( $value === 'composer' && 
$this->detectComposer( $type, $name ) ) {
+   $status = 'composer';
+   $value = true;
+
+   # MediaWiki still not loaded: we must wait before 
taking a decision
+   } elseif( $ExtensionRegistry === null ) {
+   # nop
+
+   # Mechanism require_once wanted
+   } elseif( $value === 'require_once' && 
$this->detectLoadingMechanism( $type, $name, true ) == $value ) {
$status = $value;
$value = true;
-   // @codingStandardsIgnoreLine 
MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures
-   } elseif( $status = $this->detectLoadingMechanism( 
$type, $name ) ) {
+
+   # Mechanism wfLoadSkin/wfLoadExtension wanted
+   } elseif( $value === 'wfLoad' . ucfirst( $type ) && 
$this->detectLoadingMechanism( $type, $name ) == $value ) {
+   $status = $value;
$value = true;
+
+   # Any mechanism to load the extension
+   // @codingStandardsIgnoreLine 
MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures
+   } elseif( $value === true && $status = 
$this->detectLoadingMechanism( $type, $name ) ) {
+   # nop
+
+   # Missing extension or wrong configuration value
} elseif( $key != 'ExtensionMediaWikiFarm' ) {
-   if( $value ) {
-   $this->farm->log[] = "Requested but 
missing $type $name for wiki " .
-   $this->farm->getVariable( 
'$WIKIID' ) . ' in version ' .
-   $this->farm->getVariable( 
'$VERSION' );
-   }
+   $this->farm->log[] = "Requested but missing 
$type $name for wiki " .
+   $this->farm->getVariable( '$WIKIID' ) . 
' in version ' .
+   $this->farm->getVariable( '$VERSION' );
$value = false;
$status = null;
unset( $this->configuration['extensions'][$key] 
);
+
+   # MediaWikiFarm is specific because in a non-standard 
location
} else {
$status = $ExtensionRegistry ? 
'wfLoadExtension' : 'require_once';
}
@@

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: phpunit: replace deprecated strict=true

2017-08-26 Thread Umherirrender (Code Review)

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

Change subject: phpunit: replace deprecated strict=true
..

phpunit: replace deprecated strict=true

Each run shows:
Warning: Deprecated configuration setting "strict" used

strict is deprecated in PHPUnit 4.8, internally it adds five options +
one to mark its use as deprecated:

$result['reportUselessTests']  = $flag;
$result['strictCoverage']  = $flag;
$result['disallowTestOutput']  = $flag;
$result['enforceTimeLimit']= $flag;
$result['disallowTodoAnnotatedTests']  = $flag;
$result['deprecatedStrictModeSetting'] = true;

In phpunit.xml replace strict=yes and add the appropriate options.

Remove verbose=true and rename data provider to avoid risky test

Change-Id: Ibcc8b0704bbf84e39c883a014817b0248703c65a
---
M MediaWiki/Tests/MediaWikiStandardTest.php
M phpunit.xml.dist
2 files changed, 11 insertions(+), 7 deletions(-)


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

diff --git a/MediaWiki/Tests/MediaWikiStandardTest.php 
b/MediaWiki/Tests/MediaWikiStandardTest.php
index 81db88f..f4bf5d7 100644
--- a/MediaWiki/Tests/MediaWikiStandardTest.php
+++ b/MediaWiki/Tests/MediaWikiStandardTest.php
@@ -50,7 +50,7 @@
 * file against an expected output.
 * @return array $tests The test string[].
 */
-   public static function testProvider() {
+   public static function fileDataProvider() {
$tests = [];
 
$standard = dirname( __DIR__ );
@@ -77,7 +77,7 @@
/**
 * _testFile
 *
-* @dataProvider testProvider
+* @dataProvider fileDataProvider
 *
 * @param string $file The path string of file.
 * @param string $standard The standard string.
@@ -89,11 +89,12 @@
$expect = $this->prepareOutput( file_get_contents( 
$expectedOutputFile ) );
$this->assertEquals( $expect, $outputStr );
}
+
/**
 * @return array $tests The array of test.
 */
-   public static function testFixProvider() {
-   $tests = self::testProvider();
+   public static function fixDataProvider() {
+   $tests = self::fileDataProvider();
foreach ( array_keys( $tests ) as $idx ) {
$fixed = $tests[$idx][0] . ".fixed";
if ( file_exists( $fixed ) ) {
@@ -108,7 +109,7 @@
}
 
/**
-* @dataProvider testFixProvider
+* @dataProvider fixDataProvider
 * @param string $file The path of file.
 * @param string $standard The standard string.
 * @param string $fixedFile The path of fixed file.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d056159..4e4554f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -5,8 +5,11 @@
 convertNoticesToExceptions="true"
 convertWarningsToExceptions="true"
 mapTestClassNameToCoveredClassName="false"
-strict="false"
-verbose="false"
+beStrictAboutOutputDuringTests="true"
+beStrictAboutTestSize="true"
+beStrictAboutTestsThatDoNotTestAnything="true"
+checkForUnintentionallyCoveredCode="true"
+disallowTodoAnnotatedTests="true"
 bootstrap="./phpunit.bootstrap.php">



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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcc8b0704bbf84e39c883a014817b0248703c65a
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...Quiz[master]: Add ability for proposal positions to be shuffled on load

2017-08-26 Thread Harjotsingh (Code Review)

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

Change subject: Add ability for proposal positions to be shuffled on load
..

Add ability for proposal positions to be shuffled on load

Currently the quiz extension only shuffles the order of questions using Js.
This change adds shuffling feature for proposal for each questions by using
shuffle function of Php.It is achieved by using shuffleanswer parameter for
quiz.

Bug: T170799
Change-Id: I7bdeade1fb5359e0db2051a48a2e51831f673ba7
---
M Question.php
M Quiz.class.php
M tests/phpunit/QuestionTest.php
3 files changed, 60 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz 
refs/changes/35/374035/1

diff --git a/Question.php b/Question.php
index 29fcd2f..a26a3ef 100644
--- a/Question.php
+++ b/Question.php
@@ -9,12 +9,13 @@
 * @param $questionId Integer: the Identifier of the question used to 
generate input names.
 * @param $parser Parser the wikitext parser.
 */
-   public function __construct( $beingCorrected, $caseSensitive, 
$questionId, &$parser ) {
+   public function __construct( $beingCorrected, $caseSensitive, 
$questionId, $shuffle, &$parser ) {
global $wgRequest;
$this->mRequest = &$wgRequest;
$this->mQuestionId = $questionId;
$this->mBeingCorrected = $beingCorrected;
$this->mCaseSensitive = $caseSensitive;
+   $this->shuffleAnswers = $shuffle;
$this->mParser = $parser;
$this->mState = ( $beingCorrected ) ? 'NA' : '';
$this->mType = 'multipleChoice';
@@ -161,12 +162,15 @@
// Parameters used in some special cases.
$expectOn = 0;
$attemptChecker = 0;
+   $lines = [];
+   $proposalCount = -1;
$checkedCount = 0;
foreach ( $raws as $proposalId => $raw ) {
$text = null;
$colSpan = '';
$signesOutput = '';
if ( preg_match( $this->mProposalPattern, $raw, 
$matches ) ) {
+   $proposalCount++;
$rawClass = 'proposal';
// Insulate the proposal signes.
$text = array_pop( $matches );
@@ -274,18 +278,61 @@
$colSpan = ' colspan="13"';
}
if ( $text ) {
-   $output .= '' . 
"\n";
-   $output .= $signesOutput;
-   $output .= '';
-   $output .= $this->mParser->recursiveTagParse( 
$text );
-   $output .= '';
-   $output .= '' . "\n";
+   $lineOutput = '';
+   $lineOutput = '' 
. "\n";
+   $lineOutput .= $signesOutput;
+   $lineOutput .= '';
+   $lineOutput .= 
$this->mParser->recursiveTagParse( $text );
+   $lineOutput .= '';
+   $lineOutput .= '' . "\n";
+   if ( $rawClass === 'correction selected' || 
$rawClass === 'correction unselected' ) {
+   if ( $proposalCount === -1 ) {
+   // Add to output directly
+   $output .= $lineOutput;
+   } else {
+   // Add feedback to previous 
proposal
+   $lines[ $proposalCount ] .= 
$lineOutput;
+   }
+   } else {
+   // Add lineOutput for proposal
+   $lines[ $proposalCount ] = $lineOutput;
+   }
}
}
// A single choice object with no correct proposal is a syntax 
error.
if ( isset( $typeId ) && $typeId == 'sn' && $expectOn == 0 ) {
$this->setState( 'error' );
}
+   //Finding order
+   $order = '';
+   if ( $this->mBeingCorrected ) {
+   $order = $this->mRequest->getVal( $this->mQuestionId . 
'|order' );
+   } else {
+   if ( $this->shuffleAnswers ) {
+   $order = '';
+   for( $i = 0; $i <= $proposalCount; ) {
+

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Always verify an extension exists, even if the mechanism is ...

2017-08-26 Thread Seb35 (Code Review)

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

Change subject: Always verify an extension exists, even if the mechanism is 
forced
..

Always verify an extension exists, even if the mechanism is forced

When an extension is loaded with a forced mechanism, it was not verified the
extension really exists; it is now the case.

Bug: T168807
Change-Id: I8146406a9a5139b8d86dcffd18c342fc16a2b94c
---
M src/MediaWikiFarmConfiguration.php
M tests/phpunit/ConfigurationTest.php
M tests/phpunit/data/config/extensionssettings.php
3 files changed, 40 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/34/374034/1

diff --git a/src/MediaWikiFarmConfiguration.php 
b/src/MediaWikiFarmConfiguration.php
index 458a247..9d70f51 100644
--- a/src/MediaWikiFarmConfiguration.php
+++ b/src/MediaWikiFarmConfiguration.php
@@ -424,32 +424,45 @@
$setting = 'wgUse' . preg_replace( 
'/[^a-zA-Z0-9_\x7f\xff]/', '', $key );
$value =& $this->configuration['settings'][$setting];
 
+   # Extension is deactivated
if( $value === false ) {
$status = null;
unset( $this->configuration['extensions'][$key] 
);
-   } elseif( $ExtensionRegistry === null || $value === 
'composer' ) {
-   if( $this->detectComposer( $type, $name ) ) {
-   $status = 'composer';
-   $value = true;
-   } elseif( $value === 'composer' ) {
-   $value = false;
-   unset( 
$this->configuration['extensions'][$key] );
-   }
-   } elseif( $value === 'require_once' || $value === 
'wfLoad' . ucfirst( $type ) ) {
+
+   # Mechanism Composer wanted
+   } elseif( $value === 'composer' && 
$this->detectComposer( $type, $name ) ) {
+   $status = 'composer';
+   $value = true;
+
+   # MediaWiki still not loaded: we must wait before 
taking a decision
+   } elseif( $ExtensionRegistry === null ) {
+   # nop
+
+   # Mechanism require_once wanted
+   } elseif( $value === 'require_once' && 
$this->detectLoadingMechanism( $type, $name, true ) == $value ) {
$status = $value;
$value = true;
-   // @codingStandardsIgnoreLine 
MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures
-   } elseif( $status = $this->detectLoadingMechanism( 
$type, $name ) ) {
+
+   # Mechanism wfLoadSkin/wfLoadExtension wanted
+   } elseif( $value === 'wfLoad' . ucfirst( $type ) && 
$this->detectLoadingMechanism( $type, $name ) == $value ) {
+   $status = $value;
$value = true;
+
+   # Any mechanism to load the extension
+   // @codingStandardsIgnoreLine 
MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures
+   } elseif( $value === true && $status = 
$this->detectLoadingMechanism( $type, $name ) ) {
+   # nop
+
+   # Missing extension or wrong configuration value
} elseif( $key != 'ExtensionMediaWikiFarm' ) {
-   if( $value ) {
-   $this->farm->log[] = "Requested but 
missing $type $name for wiki " .
-   $this->farm->getVariable( 
'$WIKIID' ) . ' in version ' .
-   $this->farm->getVariable( 
'$VERSION' );
-   }
+   $this->farm->log[] = "Requested but missing 
$type $name for wiki " .
+   $this->farm->getVariable( '$WIKIID' ) . 
' in version ' .
+   $this->farm->getVariable( '$VERSION' );
$value = false;
$status = null;
unset( $this->configuration['extensions'][$key] 
);
+
+   # MediaWikiFarm is specific because in a non-standard 
location
} else {
$status = $ExtensionRegistry ? 
'wfLoadExtension' : 'require_once';
}
@@ -513,9 +526,10 @@
 *
 *

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add monolingual language code ami (Amis)

2017-08-26 Thread Zoranzoki21 (Code Review)

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

Change subject: Add monolingual language code ami (Amis)
..

Add monolingual language code ami (Amis)

Bug: T174238
Change-Id: If3b57156ca8e10fa9e4eebdc202e85467fc9894d
---
M repo/includes/WikibaseRepo.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/33/374033/2

diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 3605d54..51a1fcd 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -1882,6 +1882,9 @@
 
// T167811
'xpu',
+  
+   // T174238
+   'ami',
] )
),
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3b57156ca8e10fa9e4eebdc202e85467fc9894d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 

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

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Bug: a Composer extension could not be deactivated

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Bug: a Composer extension could not be deactivated
..


Bug: a Composer extension could not be deactivated

In the case of a Composer extension was marked as not to be activated
(value false), this value was not taken into account and the extension
was activated. It worked (a Composer extension not wanted is deactivated)
when it was never marked in the configuration.

Change-Id: Ida82bbc45c9cb2ad094e6cd416044a995f1304cf
---
M src/MediaWikiFarmConfiguration.php
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/src/MediaWikiFarmConfiguration.php 
b/src/MediaWikiFarmConfiguration.php
index 4da1b5d..458a247 100644
--- a/src/MediaWikiFarmConfiguration.php
+++ b/src/MediaWikiFarmConfiguration.php
@@ -424,7 +424,10 @@
$setting = 'wgUse' . preg_replace( 
'/[^a-zA-Z0-9_\x7f\xff]/', '', $key );
$value =& $this->configuration['settings'][$setting];
 
-   if( $ExtensionRegistry === null || $value === 
'composer' ) {
+   if( $value === false ) {
+   $status = null;
+   unset( $this->configuration['extensions'][$key] 
);
+   } elseif( $ExtensionRegistry === null || $value === 
'composer' ) {
if( $this->detectComposer( $type, $name ) ) {
$status = 'composer';
$value = true;
@@ -436,7 +439,7 @@
$status = $value;
$value = true;
// @codingStandardsIgnoreLine 
MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures
-   } elseif( $value !== false && ( $status = 
$this->detectLoadingMechanism( $type, $name ) ) ) {
+   } elseif( $status = $this->detectLoadingMechanism( 
$type, $name ) ) {
$value = true;
} elseif( $key != 'ExtensionMediaWikiFarm' ) {
if( $value ) {
@@ -445,6 +448,7 @@
$this->farm->getVariable( 
'$VERSION' );
}
$value = false;
+   $status = null;
unset( $this->configuration['extensions'][$key] 
);
} else {
$status = $ExtensionRegistry ? 
'wfLoadExtension' : 'require_once';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida82bbc45c9cb2ad094e6cd416044a995f1304cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Seb35 
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...MediaWikiFarm[master]: Bug: a Composer extension could not be deactivated

2017-08-26 Thread Seb35 (Code Review)

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

Change subject: Bug: a Composer extension could not be deactivated
..

Bug: a Composer extension could not be deactivated

In the case of a Composer extension was marked as not to be activated
(value false), this value was not taken into account and the extension
was activated. It worked (a Composer extension not wanted is deactivated)
when it was never marked in the configuration.

Change-Id: Ida82bbc45c9cb2ad094e6cd416044a995f1304cf
---
M src/MediaWikiFarmConfiguration.php
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/31/374031/1

diff --git a/src/MediaWikiFarmConfiguration.php 
b/src/MediaWikiFarmConfiguration.php
index 4da1b5d..458a247 100644
--- a/src/MediaWikiFarmConfiguration.php
+++ b/src/MediaWikiFarmConfiguration.php
@@ -424,7 +424,10 @@
$setting = 'wgUse' . preg_replace( 
'/[^a-zA-Z0-9_\x7f\xff]/', '', $key );
$value =& $this->configuration['settings'][$setting];
 
-   if( $ExtensionRegistry === null || $value === 
'composer' ) {
+   if( $value === false ) {
+   $status = null;
+   unset( $this->configuration['extensions'][$key] 
);
+   } elseif( $ExtensionRegistry === null || $value === 
'composer' ) {
if( $this->detectComposer( $type, $name ) ) {
$status = 'composer';
$value = true;
@@ -436,7 +439,7 @@
$status = $value;
$value = true;
// @codingStandardsIgnoreLine 
MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures
-   } elseif( $value !== false && ( $status = 
$this->detectLoadingMechanism( $type, $name ) ) ) {
+   } elseif( $status = $this->detectLoadingMechanism( 
$type, $name ) ) {
$value = true;
} elseif( $key != 'ExtensionMediaWikiFarm' ) {
if( $value ) {
@@ -445,6 +448,7 @@
$this->farm->getVariable( 
'$VERSION' );
}
$value = false;
+   $status = null;
unset( $this->configuration['extensions'][$key] 
);
} else {
$status = $ExtensionRegistry ? 
'wfLoadExtension' : 'require_once';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida82bbc45c9cb2ad094e6cd416044a995f1304cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [Fix] Update isbn.py

2017-08-26 Thread Code Review

Matěj Suchánek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374030 )

Change subject: [Fix] Update isbn.py
..

[Fix] Update isbn.py

This file was forgotten and not included in
Ib43948d70d6c4e957043a862bdbf3c9d27eee03a.

Change-Id: I1d61d46050342e56e171dd3edf1204d3992d1101
---
M scripts/isbn.py
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/30/374030/1

diff --git a/scripts/isbn.py b/scripts/isbn.py
index 9679d33..1ba055b 100755
--- a/scripts/isbn.py
+++ b/scripts/isbn.py
@@ -1539,6 +1539,7 @@
 class IsbnWikibaseBot(WikidataBot):
 
 """ISBN bot to be run on Wikibase sites."""
+use_from_page = None
 
 def __init__(self, generator, **kwargs):
 """Constructor."""
@@ -1549,7 +1550,7 @@
 self.isbn_10_prop_id = kwargs.pop('prop-isbn-10', None)
 self.isbn_13_prop_id = kwargs.pop('prop-isbn-13', None)
 
-super(IsbnWikibaseBot, self).__init__(use_from_page=None, **kwargs)
+super(IsbnWikibaseBot, self).__init__(**kwargs)
 
 self.generator = generator
 if self.isbn_10_prop_id is None:
@@ -1558,7 +1559,7 @@
 self.isbn_13_prop_id = self.get_property_by_name('ISBN-13')
 self.comment = i18n.twtranslate(pywikibot.Site(), 'isbn-formatting')
 
-def treat(self, page, item):
+def treat_page_and_item(self, page, item):
 """Treat a page."""
 change_messages = []
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d61d46050342e56e171dd3edf1204d3992d1101
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 

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

[MediaWiki-commits] [Gerrit] mediawiki...CategoryTree[master]: Avoid href="#" for

2017-08-26 Thread Fomafix (Code Review)

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

Change subject: Avoid href="#" for 
..

Avoid href="#" for 

The href="#" shows a status line and allows to open a new tab on middle
click.

Add tabindex="0" and role="button" instead to still allow to focus the
element with the keyboard.

Add JavaScript event handler for the return key of the keyboard to still
allow to trigger the event with the keyboard.

Change-Id: I3f4c14d335f3a06bc67f148558e5b9a1534671bf
---
M modules/ext.categoryTree.js
1 file changed, 11 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CategoryTree 
refs/changes/29/374029/1

diff --git a/modules/ext.categoryTree.js b/modules/ext.categoryTree.js
index fa3c4b6..3e4e1fa 100644
--- a/modules/ext.categoryTree.js
+++ b/modules/ext.categoryTree.js
@@ -89,10 +89,17 @@
 
$retryLink = $( '' )
.text( mw.msg( 'categorytree-retry' ) )
-   .attr( 'href', '#' )
-   .click( function ( e ) {
-   e.preventDefault();
-   loadChildren( $link, $children 
);
+   .attr( {
+   role: 'button',
+   tabindex: 0,
+   } )
+   .on( 'click keypress', function ( e ) {
+   if (
+   e.type === 'click' ||
+   e.type === 'keypress' 
&& e.which === 13
+   ) {
+   loadChildren( $link, 
$children );
+   }
} );
 
$children

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f4c14d335f3a06bc67f148558e5b9a1534671bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CategoryTree
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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

[MediaWiki-commits] [Gerrit] mediawiki...ExtensionDistributor[master]: Add alt="" to download arrow to improve HTML validity

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Add alt="" to download arrow to improve HTML validity
..


Add alt="" to download arrow to improve HTML validity

Bug: T173375
Change-Id: Ie5504fec2cecc881c25b394d062d542b9d9c287d
---
M includes/specials/SpecialBaseDistributor.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialBaseDistributor.php 
b/includes/specials/SpecialBaseDistributor.php
index a0c78af..0e26ab5 100644
--- a/includes/specials/SpecialBaseDistributor.php
+++ b/includes/specials/SpecialBaseDistributor.php
@@ -316,7 +316,7 @@
$linkRenderer->makeLink(
$this->getPageTitle(),
new HtmlArmor(
-   Xml::element( 'img', [ 'src' => 
$downloadImg ] ) .
+   Xml::element( 'img', [ 'src' => 
$downloadImg, 'alt' => '' ] ) .
// extdist-want-more-extensions, 
extdist-want-more-skins
$this->msg( $this->msgKey( 
'extdist-want-more-$TYPE' ) )->escaped()
)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5504fec2cecc881c25b394d062d542b9d9c287d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
Gerrit-Branch: master
Gerrit-Owner: Samtar 
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...codesniffer[master]: Clean up test helpers

2017-08-26 Thread Legoktm (Code Review)

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

Change subject: Clean up test helpers
..

Clean up test helpers

* Merge MediaWikiTestHelper and TestHelper into one Helper class
* Fix namespacing of MediaWiki/Tests directory
* Add GPL file headers, code has significantly changed and been
  re-written by Erik and myself since it was copied from CakePHP

Change-Id: I148f94e43a8e78e992daf9499128ed7bf0f65eff
---
A MediaWiki/Tests/Helper.php
M MediaWiki/Tests/MediaWikiStandardTest.php
D MediaWiki/Tests/MediaWikiTestHelper.php
D TestHelper.php
M phpunit.bootstrap.php
5 files changed, 120 insertions(+), 143 deletions(-)


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

diff --git a/MediaWiki/Tests/Helper.php b/MediaWiki/Tests/Helper.php
new file mode 100644
index 000..93b6980
--- /dev/null
+++ b/MediaWiki/Tests/Helper.php
@@ -0,0 +1,99 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+namespace MediaWiki\Sniffs\Tests;
+
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Files\DummyFile;
+use PHP_CodeSniffer\Reporter;
+use PHP_CodeSniffer\Ruleset;
+
+class Helper {
+
+   protected $rootDir;
+
+   protected $dirName;
+
+   protected $phpcs;
+
+   public function __construct() {
+   $this->rootDir = dirname( __DIR__ );
+   $this->dirName = basename( $this->rootDir );
+   }
+
+   /**
+* Run PHPCS on a file.
+*
+* @param string $file To run.
+* @param string $standard To run against.
+* @return string $result The output from phpcs.
+*/
+   public function runPhpCs( $file, $standard = '' ) {
+   if ( empty( $standard ) ) {
+   $standard = $this->rootDir . '/ruleset.xml';
+   }
+
+   $config = new Config();
+   $config->standards = [ $standard ];
+   $config->files = [ $file ];
+   $config->encoding = 'utf-8';
+   $config->reports = [ 'full' => null ];
+   $config->colors = false;
+   $config->reportWidth = 0;
+   $config->showSources = true;
+
+   $ruleset = new Ruleset( $config );
+   $dummy = new DummyFile( file_get_contents( $file ), $ruleset, 
$config );
+   $reporter = new Reporter( $config );
+   $dummy->process();
+   $reporter->cacheFileReport( $dummy );
+   ob_start();
+   $reporter->printReport( 'full' );
+   $result = ob_get_contents();
+   ob_end_clean();
+   return $result;
+   }
+
+   /**
+* @param string $file The path of file.
+* @param string $standard The standard string.
+* @return string
+*/
+   public function runPhpCbf( $file, $standard = '' ) {
+   if ( empty( $standard ) ) {
+   $standard = $this->rootDir . '/ruleset.xml';
+   }
+   $config = new Config();
+   $config->standards = [ $standard ];
+   $config->files = [ $file ];
+   $config->encoding = 'utf-8';
+
+   $ruleset = new Ruleset( $config );
+   $dummy = new DummyFile( file_get_contents( $file ), $ruleset, 
$config );
+
+   $dummy->process();
+   if ( $dummy->getFixableCount() ) {
+   $dummy->fixer->fixFile();
+   return $dummy->fixer->getContents();
+   } else {
+   return file_get_contents( $file );
+   }
+   }
+}
diff --git a/MediaWiki/Tests/MediaWikiStandardTest.php 
b/MediaWiki/Tests/MediaWikiStandardTest.php
index 81db88f..5ffad59 100644
--- a/MediaWiki/Tests/MediaWikiStandardTest.php
+++ b/MediaWiki/Tests/MediaWikiStandardTest.php
@@ -1,34 +1,29 @@
 http://git.io/vkirb
- * From repository: https://github.com/cakephp/cakephp-codesniffer
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * @license MIT
- * CakePHP(tm) : The Rapid Development PHP Framework (http://cakephp.org)
- * Copyright (c) 2005-2013, Cake Software Foundation, Inc.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Add sniff to ensure the class name matches the filename

2017-08-26 Thread Legoktm (Code Review)

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

Change subject: Add sniff to ensure the class name matches the filename
..

Add sniff to ensure the class name matches the filename

Bug: T174244
Change-Id: I3e89ab66dc06972ac04e7a36d17edfc574ef3ac0
---
A MediaWiki/Sniffs/Files/ClassMatchesFilenameSniff.php
1 file changed, 60 insertions(+), 0 deletions(-)


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

diff --git a/MediaWiki/Sniffs/Files/ClassMatchesFilenameSniff.php 
b/MediaWiki/Sniffs/Files/ClassMatchesFilenameSniff.php
new file mode 100644
index 000..d264f46
--- /dev/null
+++ b/MediaWiki/Sniffs/Files/ClassMatchesFilenameSniff.php
@@ -0,0 +1,60 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+namespace MediaWiki\Sniffs\Files;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+class ClassMatchesFilenameSniff implements Sniff {
+
+   /**
+* Tokens to process
+*
+* @return array
+*/
+   public function register() {
+   return [ T_CLASS, T_INTERFACE, T_TRAIT ];
+   }
+
+   /**
+* Check the class name against the filename
+*
+* @param File $phpcsFile File being checked
+* @param int $stackPtr Position
+*/
+   public function process( File $phpcsFile, $stackPtr ) {
+   $fname = $phpcsFile->getFilename();
+   if ( $fname === 'STDIN' ) {
+   return;
+   }
+   $exp = explode( '/', $fname );
+   $base = end( $exp );
+   $name = $phpcsFile->getDeclarationName( $stackPtr );
+   if ( $base !== "$name.php" ) {
+   $phpcsFile->addError(
+   "Class name '$name' does not match filename 
'$base'",
+   $stackPtr,
+   'NotMatch'
+   );
+   }
+   }
+
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e89ab66dc06972ac04e7a36d17edfc574ef3ac0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
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...codesniffer[master]: Use local OneClassPerFile sniff for only one class/interface...

2017-08-26 Thread Legoktm (Code Review)

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

Change subject: Use local OneClassPerFile sniff for only one 
class/interface/trait
..

Use local OneClassPerFile sniff for only one class/interface/trait

The separate three upstream sniffs would still have allowed a class and
an interface to be in a file together, which still violates PSR-4.

Temporarily copy in the upstream sniff with the suggested modification
until there is an upstream sniff that also handles this.

See .

Bug: T173798
Change-Id: Iaae359362aff0b3630f7ca69109b64c64bc50016
---
A MediaWiki/Sniffs/Files/OneClassPerFileSniff.php
M MediaWiki/Tests/files/Commenting/commenting_function.php.expect
M MediaWiki/Tests/files/Usage/extend_class_usage.php.expect
M 
MediaWiki/Tests/files/VariableAnalysis/used_global_variables_regression.php.expect
M MediaWiki/Tests/files/WhiteSpace/space_before_class_brace.php.expect
M MediaWiki/ruleset.xml
6 files changed, 55 insertions(+), 16 deletions(-)


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

diff --git a/MediaWiki/Sniffs/Files/OneClassPerFileSniff.php 
b/MediaWiki/Sniffs/Files/OneClassPerFileSniff.php
new file mode 100644
index 000..9126f99
--- /dev/null
+++ b/MediaWiki/Sniffs/Files/OneClassPerFileSniff.php
@@ -0,0 +1,42 @@
+
+ * @copyright 2010-2014 Andy Grunwald
+ * @license   
https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace MediaWiki\Sniffs\Files;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+class OneClassPerFileSniff implements Sniff {
+
+   /**
+* Returns an array of tokens this test wants to listen for.
+*
+* @return array
+*/
+   public function register() {
+   return [ T_CLASS, T_INTERFACE, T_TRAIT ];
+   }
+
+   /**
+* Processes this sniff, when one of its tokens is encountered.
+*
+* @param File $phpcsFile File being scanned
+* @param int $stackPtr Position
+*
+* @return void
+*/
+   public function process( File $phpcsFile, $stackPtr ) {
+   $nextClass = $phpcsFile->findNext( $this->register(), ( 
$stackPtr + 1 ) );
+   if ( $nextClass !== false ) {
+   $error = 'Only one class is allowed in a file';
+   $phpcsFile->addError( $error, $nextClass, 
'MultipleFound' );
+   }
+   }
+
+}
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect 
b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
index 151a38e..3c90e75 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
@@ -57,7 +57,7 @@
   89 | ERROR | [x] Expected 1 spaces before return type; 4 found
  |   | 
(MediaWiki.Commenting.FunctionComment.SpacingBeforeReturnType)
   96 | ERROR | [ ] Only one class is allowed in a file
- |   | (Generic.Files.OneClassPerFile.MultipleFound)
+ |   | (MediaWiki.Files.OneClassPerFile.MultipleFound)
  163 | ERROR | [ ] Only one class is allowed in a file
- |   | (Generic.Files.OneClassPerFile.MultipleFound)
+ |   | (MediaWiki.Files.OneClassPerFile.MultipleFound)
 PHPCBF CAN FIX THE 20 MARKED SNIFF VIOLATIONS AUTOMATICALLY
diff --git a/MediaWiki/Tests/files/Usage/extend_class_usage.php.expect 
b/MediaWiki/Tests/files/Usage/extend_class_usage.php.expect
index 8c1d88d..d0ca636 100644
--- a/MediaWiki/Tests/files/Usage/extend_class_usage.php.expect
+++ b/MediaWiki/Tests/files/Usage/extend_class_usage.php.expect
@@ -2,14 +2,14 @@
 | | wfMessage() .
 | | (MediaWiki.Usage.ExtendClassUsage.FunctionVarUsage)
  27 | ERROR   | Only one class is allowed in a file
-| | (Generic.Files.OneClassPerFile.MultipleFound)
+| | (MediaWiki.Files.OneClassPerFile.MultipleFound)
  51 | ERROR   | Only one class is allowed in a file
-| | (Generic.Files.OneClassPerFile.MultipleFound)
+| | (MediaWiki.Files.OneClassPerFile.MultipleFound)
  64 | WARNING | Should use function $this->getUser() rather than variable
 | | $wgUser .
 | | (MediaWiki.Usage.ExtendClassUsage.FunctionVarUsage)
  75 | ERROR   | Only one class is allowed in a file
-| | (Generic.Files.OneClassPerFile.MultipleFound)
+| | (MediaWiki.Files.OneClassPerFile.MultipleFound)
  93 | WARNING | Should use function $this->getRequest() rather than
 | | variable $wgRequest .
 | | (MediaWiki.Usage.ExtendClassUsage.FunctionVarUsage)
diff --git 
a/MediaWiki/Tests/files/VariableAnalysis/used_global_variables_regression.php.expect

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Check spacing before type in @param and @return

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Check spacing before type in @param and @return
..


Check spacing before type in @param and @return

There should be one space after a @param or @return

Change-Id: I2e364a90e0439bee2de15fa34b08d273dd8769a1
---
M MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
M MediaWiki/Sniffs/Commenting/IllegalSingleLineCommentSniff.php
M MediaWiki/Sniffs/NamingConventions/LowerCamelFunctionsNameSniff.php
M MediaWiki/Sniffs/Usage/SuperGlobalsUsageSniff.php
M MediaWiki/Sniffs/WhiteSpace/SpaceBeforeClassBraceSniff.php
M MediaWiki/Sniffs/WhiteSpace/SpaceBeforeControlStructureBraceSniff.php
M MediaWiki/Sniffs/WhiteSpace/SpaceyParenthesisSniff.php
M MediaWiki/Tests/MediaWikiStandardTest.php
M MediaWiki/Tests/MediaWikiTestHelper.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
M MediaWiki/Tests/files/Usage/dir_usage.php
M MediaWiki/Tests/files/Usage/dir_usage.php.fixed
M MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis.php
M MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis.php.fixed
M MediaWiki/Tests/files/generic_namespace_pass.php
M MediaWiki/Tests/files/generic_pass.php
18 files changed, 110 insertions(+), 48 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 2df6d3b..3411f79 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -210,6 +210,26 @@
}
}
if ( $return !== null ) {
+   $retTypeSpacing = $return + 1;
+   if ( $tokens[$retTypeSpacing]['code'] === 
T_DOC_COMMENT_WHITESPACE ) {
+   $expectedSpaces = 1;
+   $currentSpaces = strlen( 
$tokens[$retTypeSpacing]['content'] );
+   if ( $currentSpaces !== $expectedSpaces ) {
+   $data = [
+   $expectedSpaces,
+   $currentSpaces,
+   ];
+   $fix = $phpcsFile->addFixableError(
+   'Expected %s spaces before 
return type; %s found',
+   $retTypeSpacing,
+   'SpacingBeforeReturnType',
+   $data
+   );
+   if ( $fix ) {
+   
$phpcsFile->fixer->replaceToken( $retTypeSpacing, ' ' );
+   }
+   }
+   }
$retType = $return + 2;
$content = $tokens[$retType]['content'];
if ( empty( $content ) === true || 
$tokens[$retType]['code'] !== T_DOC_COMMENT_STRING ) {
@@ -306,12 +326,16 @@
if ( $tokens[$tag]['content'] !== '@param' ) {
continue;
}
+   $paramSpace = 0;
$type = '';
$typeSpace = 0;
$var = '';
$varSpace = 0;
$comment = '';
$commentFirst = '';
+   if ( $tokens[( $tag + 1 )]['code'] === 
T_DOC_COMMENT_WHITESPACE ) {
+   $paramSpace = strlen( $tokens[( $tag + 1 
)]['content'] );
+   }
if ( $tokens[( $tag + 2 )]['code'] === 
T_DOC_COMMENT_STRING ) {
$matches = [];
preg_match( 
'/([^$&.]+)(?:((?:\.\.\.)?(?:\$|&)[^\s]+)(?:(\s+)(.*))?)?/',
@@ -364,6 +388,7 @@
'var' => $var,
'comment' => $comment,
'comment_first' => $commentFirst,
+   'param_space' => $paramSpace,
'type_space' => $typeSpace,
'var_space' => $varSpace,
];
@@ -386,6 +411,19 @@
continue;
}
$foundParams[] = $param['var'];
+   // Check number of spaces before type (after @param)
+   $spaces = 1;
+   if (

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Enforce "short" type definitions in multi types in function ...

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Enforce "short" type definitions in multi types in function 
comments
..


Enforce "short" type definitions in multi types in function comments

The type of @param can have multi types separated by a pipe.
Check each type in the multi type defintion against integer/boolean
Also check for array types

Bug: T145162
Change-Id: I8721d9d05392b941fa93c19952e5ee6725dcd5e9
---
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, 116 insertions(+), 45 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 fdfbe93..2df6d3b 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -38,6 +38,18 @@
];
 
/**
+* Mapping for swap short types
+*
+* @var array
+*/
+   private static $shortTypeMapping = [
+   'boolean' => 'bool',
+   'boolean[]' => 'bool[]',
+   'integer' => 'int',
+   'integer[]' => 'int[]',
+   ];
+
+   /**
 * Returns an array of tokens this test wants to listen for.
 *
 * @return array
@@ -206,29 +218,32 @@
}
// The first word of the return type is the actual type
$exploded = explode( ' ', $content, 2 );
-   $first = $exploded[0];
-   if ( $first === 'boolean' ) {
-   $fix = $phpcsFile->addFixableError(
-   'Short type of "bool" should be used 
for @return tag',
-   $retType,
-   'NotShortBoolReturn'
-   );
-   if ( $fix === true ) {
-   $phpcsFile->fixer->replaceToken(
-   $retType, 'bool' . ( isset( 
$exploded[1] ) ? ' ' . $exploded[1] : '' )
+   $explodedType = explode( '|', $exploded[0] );
+   $fixType = false;
+   // Check the type for short types
+   foreach ( $explodedType as $index => $singleType ) {
+   if ( isset( 
self::$shortTypeMapping[$singleType] ) ) {
+   $newType = 
self::$shortTypeMapping[$singleType];
+   // grep: NotShortIntReturn, 
NotShortIntArrayReturn,
+   // NotShortBoolReturn, 
NotShortBoolArrayReturn
+   $code = 'NotShort' . ucfirst( 
str_replace( '[]', 'Array', $newType ) ) . 'Return';
+   $fix = $phpcsFile->addFixableError(
+   'Short type of "%s" should be 
used for @return tag',
+   $retType,
+   $code,
+   [ $newType ]
);
+   if ( $fix ) {
+   $explodedType[$index] = 
$newType;
+   $fixType = true;
+   }
}
-   } elseif ( $first === 'integer' ) {
-   $fix = $phpcsFile->addFixableError(
-   'Short type of "int" should be used for 
@return tag',
+   }
+   if ( $fixType ) {
+   $phpcsFile->fixer->replaceToken(
$retType,
-   'NotShortIntReturn'
+   implode( '|', $explodedType ) . ( 
isset( $exploded[1] ) ? ' ' . $exploded[1] : '' )
);
-   if ( $fix === true ) {
-   $phpcsFile->fixer->replaceToken(
-   $retType, 'int' . ( isset( 
$exploded[1] ) ? ' ' . $exploded[1] : '' )
-   );
-   }
}
} else {
$error = 'Missing @return tag in function comment';
@@

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Do not mess long function comments on composer fix

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Do not mess long function comments on composer fix
..


Do not mess long function comments on composer fix

A multiline comment is combined into one line and that line was used on
when using phpcbf. This results in repeat of comments.

Also refactor the replacement of @param into new function
replaceParamComment

Change-Id: Iad55d497a1ebf57b4c91705e0a28fa7c8a5aa625
---
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, 60 insertions(+), 37 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 7dee5a0..fdfbe93 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -296,6 +296,7 @@
$var = '';
$varSpace = 0;
$comment = '';
+   $commentFirst = '';
if ( $tokens[( $tag + 2 )]['code'] === 
T_DOC_COMMENT_STRING ) {
$matches = [];
preg_match( 
'/([^$&.]+)(?:((?:\.\.\.)?(?:\$|&)[^\s]+)(?:(\s+)(.*))?)?/',
@@ -315,7 +316,8 @@
}
if ( isset( $matches[4] ) === true ) {
$varSpace = strlen( $matches[3] 
);
-   $comment = $matches[4];
+   $commentFirst = $matches[4];
+   $comment = $commentFirst;
// Any strings until the next 
tag belong to this comment.
if ( isset( 
$tokens[$commentStart]['comment_tags'][( $pos + 1 )] ) === true ) {
$end = 
$tokens[$commentStart]['comment_tags'][( $pos + 1 )];
@@ -346,6 +348,7 @@
'type' => $type,
'var' => $var,
'comment' => $comment,
+   'comment_first' => $commentFirst,
'type_space' => $typeSpace,
'var_space' => $varSpace,
];
@@ -379,12 +382,11 @@
];
$fix = $phpcsFile->addFixableError( $error, 
$param['tag'], 'SpacingAfterParamType', $data );
if ( $fix === true ) {
-   $content = $param['type'];
-   $content .= str_repeat( ' ', $spaces );
-   $content .= $param['var'];
-   $content .= str_repeat( ' ', 
$param['var_space'] );
-   $content .= $param['comment'];
-   $phpcsFile->fixer->replaceToken( ( 
$param['tag'] + 2 ), $content );
+   $this->replaceParamComment(
+   $phpcsFile,
+   $param,
+   [ 'type_space' => $spaces ]
+   );
}
}
// Make sure the param name is correct.
@@ -418,12 +420,11 @@
'NotShortBoolParam'
);
if ( $fix === true ) {
-   $content  = 'bool';
-   $content .= str_repeat( ' ', 
$param['type_space'] );
-   $content .= $param['var'];
-   $content .= str_repeat( ' ', 
$param['var_space'] );
-   $content .= $param['comment'];
-   $phpcsFile->fixer->replaceToken( ( 
$param['tag'] + 2 ), $content );
+   $this->replaceParamComment(
+   $phpcsFile,
+   $param,
+   [ 'type' => 'bool' ]
+   );
}
} elseif (

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Title::getSquidURLs() is deprecated

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Title::getSquidURLs() is deprecated
..


Title::getSquidURLs() is deprecated

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

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



diff --git a/Hooks.php b/Hooks.php
index c1b7529..c08af51 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -1337,7 +1337,7 @@
}
$urls = array_merge(
$urls,
-   $workflow->getOwnerTitle()->getSquidURLs()
+   $workflow->getOwnerTitle()->getCdnUrls()
);
 
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1fe30f9696445019dfef1e5d316838667d9788c3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Remove unused import

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: Remove unused import
..


Remove unused import

Change-Id: I791728d08032c03ebbaa84f4c621c9ccd164c3c0
---
M includes/LoginNotify.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index aa59964..828f25f 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -23,7 +23,6 @@
 use IP;
 use MediaWiki\Logger\LoggerFactory;
 use MWCryptRand;
-use ObjectCache;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LoggerAwareInterface;
 use RequestContext;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I791728d08032c03ebbaa84f4c621c9ccd164c3c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: Samwilson 
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...ExtensionDistributor[master]: Add alt text to tab

2017-08-26 Thread Samtar (Code Review)

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

Change subject: Add alt text to  tab
..

Add alt text to  tab

Per T173375, I have added a empty string alt text to the  tab to improve 
HTML validity

Bug: T173375
Change-Id: Ie5504fec2cecc881c25b394d062d542b9d9c287d
---
M includes/specials/SpecialBaseDistributor.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor 
refs/changes/25/374025/1

diff --git a/includes/specials/SpecialBaseDistributor.php 
b/includes/specials/SpecialBaseDistributor.php
index a0c78af..0e26ab5 100644
--- a/includes/specials/SpecialBaseDistributor.php
+++ b/includes/specials/SpecialBaseDistributor.php
@@ -316,7 +316,7 @@
$linkRenderer->makeLink(
$this->getPageTitle(),
new HtmlArmor(
-   Xml::element( 'img', [ 'src' => 
$downloadImg ] ) .
+   Xml::element( 'img', [ 'src' => 
$downloadImg, 'alt' => '' ] ) .
// extdist-want-more-extensions, 
extdist-want-more-skins
$this->msg( $this->msgKey( 
'extdist-want-more-$TYPE' ) )->escaped()
)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5504fec2cecc881c25b394d062d542b9d9c287d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
Gerrit-Branch: master
Gerrit-Owner: Samtar 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Update sitematrix

2017-08-26 Thread Urbanecm (Code Review)

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

Change subject: Update sitematrix
..

Update sitematrix

Change-Id: I7442ab5c10b327701b958411b9b5f67d562efedc
---
M lib/config/sitematrix.json
1 file changed, 11 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/23/374023/1

diff --git a/lib/config/sitematrix.json b/lib/config/sitematrix.json
index bb5996c..2d1b05f 100644
--- a/lib/config/sitematrix.json
+++ b/lib/config/sitematrix.json
@@ -499,7 +499,7 @@
"sitename": "ویکی‌پدیا"
}
],
-   "localname": "تۆرکجه"
+   "localname": "South Azerbaijani"
},
"20": {
"code": "ba",
@@ -557,7 +557,7 @@
"sitename": "Wikipedia"
}
],
-   "localname": "Bikol Central"
+   "localname": "Central Bikol"
},
"24": {
"code": "be",
@@ -607,7 +607,7 @@
"sitename": "Вікіпэдыя"
}
],
-   "localname": "беларуская (тарашкевіца)‎"
+   "localname": "Belarusian (Taraškievica orthography)"
},
"26": {
"code": "bg",
@@ -670,7 +670,7 @@
"closed": ""
}
],
-   "localname": "भोजपुरी"
+   "localname": "Bhojpuri"
},
"28": {
"code": "bi",
@@ -915,7 +915,7 @@
"sitename": "Wikipedia"
}
],
-   "localname": "буряад"
+   "localname": "Russia Buriat"
},
"38": {
"code": "ca",
@@ -971,7 +971,7 @@
"sitename": "Wikipedia"
}
],
-   "localname": "Chavacano de Zamboanga"
+   "localname": "Chavacano"
},
"40": {
"code": "cdo",
@@ -1450,7 +1450,7 @@
"sitename": "विकिपिडिया"
}
],
-   "localname": "डोटेली"
+   "localname": "Doteli"
},
"62": {
"code": "dv",
@@ -3131,7 +3131,7 @@
"sitename": "Wikipediya"
}
],
-   "localname": "Kabɩyɛ"
+   "localname": "Kabiye"
},
"128": {
"code": "kg",
@@ -3624,7 +3624,7 @@
"sitename": "Википедия"
}
],
-   "localname": "лакку"
+   "localname": "Lak"
},
"149": {
"code": "lez",
@@ -4585,7 +4585,7 @@
"sitename": "Wikipedia"
}
],
-   "localname": "Nouormand"
+   "localname": "Norman"
},
"194": {
"code": "nso",
@@ -5210,7 +5210,7 @@
"sitename": "Wikipedia"
}
],
-   "localname": "tarandíne"
+   "localname": "Tarantino"
},
"224": {
"code": "ru",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7442ab5c10b327701b958411b9b5f67d562efedc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: EventStreams.doc: Change `iter(stream).next` to `next(it...

2017-08-26 Thread jenkins-bot (Code Review)

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

Change subject: EventStreams.__doc__: Change `iter(stream).next` to 
`next(iter(stream))`
..


EventStreams.__doc__: Change `iter(stream).next` to `next(iter(stream))`

Python 3 generators don't have the next method. Use the built-in next function.

Change-Id: Iecf55f31ab41a6d2eb7fe0e23a544d2a40d3e408
---
M pywikibot/comms/eventstreams.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pywikibot/comms/eventstreams.py b/pywikibot/comms/eventstreams.py
index 0c8aece..061f4ac 100644
--- a/pywikibot/comms/eventstreams.py
+++ b/pywikibot/comms/eventstreams.py
@@ -42,7 +42,7 @@
 Usage:
 
 >>> stream = EventStreams(stream='recentchange')
->>> change = iter(stream).next()
+>>> change = next(iter(stream))
 >>> change
 {'comment': '/* wbcreateclaim-create:1| */ [[Property:P31]]: [[Q4167836]]',
  'wiki': 'wikidatawiki', 'type': 'edit', 'server_name': 'www.wikidata.org',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iecf55f31ab41a6d2eb7fe0e23a544d2a40d3e408
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Xqt 
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...UniversalLanguageSelector[master]: Replace outdated colors with WikimediaUI palette ones

2017-08-26 Thread VolkerE (Code Review)

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

Change subject: Replace outdated colors with WikimediaUI palette ones
..

Replace outdated colors with WikimediaUI palette ones

Replacing all colors with current WikimediaUI palette ones.
Also:
- changing two files over to LESS in order to
- make use of central gradient mixin instead of one with
  unnecessary vendor extensions and
- concatenating selectors in one occurrence.

Bug: T174167
Change-Id: I5d302f29b079f6abdba5abf3b58d6ba254e1a4ac
---
M extension.json
M resources/css/ext.uls-monobook.css
M resources/css/ext.uls.compactlinks.less
M resources/css/ext.uls.displaysettings.less
M resources/css/ext.uls.inputsettings.less
D resources/css/ext.uls.interface.css
A resources/css/ext.uls.interface.less
M resources/css/ext.uls.interlanguage.less
R resources/css/ext.uls.languagesettings.less
M resources/css/ext.uls.less
M resources/css/ext.uls.mixins.less
11 files changed, 73 insertions(+), 91 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/22/374022/1

diff --git a/extension.json b/extension.json
index 9c31ee8..2eda62a 100644
--- a/extension.json
+++ b/extension.json
@@ -199,7 +199,7 @@
},
"ext.uls.interface": {
"scripts": "js/ext.uls.interface.js",
-   "styles": "css/ext.uls.interface.css",
+   "styles": "css/ext.uls.interface.less",
"dependencies": [
"ext.uls.common",
"mediawiki.jqueryMsg",
@@ -219,7 +219,7 @@
},
"ext.uls.languagesettings": {
"scripts": "js/ext.uls.languagesettings.js",
-   "styles": "css/ext.uls.languagesettings.css",
+   "styles": "css/ext.uls.languagesettings.less",
"dependencies": [
"ext.uls.messages",
"ext.uls.preferences",
diff --git a/resources/css/ext.uls-monobook.css 
b/resources/css/ext.uls-monobook.css
index 409c3e1..4f6eeb2 100644
--- a/resources/css/ext.uls-monobook.css
+++ b/resources/css/ext.uls-monobook.css
@@ -1,3 +1,3 @@
-#pt-uls { /* stylelint-disable selector-no-id */
+#pt-uls { /* stylelint-disable-line selector-no-id */
text-transform: none;
 }
diff --git a/resources/css/ext.uls.compactlinks.less 
b/resources/css/ext.uls.compactlinks.less
index 70ded66..deeab1a 100644
--- a/resources/css/ext.uls.compactlinks.less
+++ b/resources/css/ext.uls.compactlinks.less
@@ -2,13 +2,11 @@
 @import 'ext.uls.mixins.less';
 
 /* stylelint-disable selector-no-id */
-
 #p-lang .body ul .uls-trigger,
 #p-lang .pBody ul .uls-trigger {
background-image: none;
padding: 0;
 }
-
 /* stylelint-enable selector-no-id */
 
 .mw-interlanguage-selector,
@@ -27,8 +25,8 @@
 
 .mw-interlanguage-selector:active,
 .mw-interlanguage-selector.selector-open {
-   color: #555;
-   background-color: #ccc;
+   background-color: #c8ccd1;
+   color: #54595d;
 }
 
 .interlanguage-uls-menu {
diff --git a/resources/css/ext.uls.displaysettings.less 
b/resources/css/ext.uls.displaysettings.less
index 5c1f72a..9e91e2d 100644
--- a/resources/css/ext.uls.displaysettings.less
+++ b/resources/css/ext.uls.displaysettings.less
@@ -4,7 +4,7 @@
background: transparent no-repeat left top;
.background-image-svg( '../images/display.svg', '../images/display.png' 
);
background-size: 20px auto;
-   color: #252525;
+   color: #222;
padding-left: 26px;
cursor: pointer;
 }
@@ -22,7 +22,7 @@
 }
 
 .ext-uls-sub-panel {
-   border-top: 1px solid #eee;
+   border-top: 1px solid #eaecf0;
padding-top: 25px;
top: -20px;
position: relative;
@@ -34,38 +34,30 @@
 }
 
 .uls-font-item {
-   border-bottom: 1px solid #eee;
-   background: #fbfbfb;
+   border-bottom: 1px solid #eaecf0;
+   background: #f8f9fa;
padding: 10px 0;
 
&:first-child {
-   border-top: 1px solid #eee;
+   border-top: 1px solid #eaecf0;
}
 }
 
 .uls-font-label,
-.uls-font-select {
+.uls-font-select,
+#uls-display-settings-anon-log-in-cta { /* stylelint-disable-line 
selector-no-id */
font-size: 10pt;
-}
-
-.uls-content-fonts:hover,
-.uls-ui-fonts:hover {
-   background-color: #f6f6f6;
-}
-
-.uls-font-label strong {
-   color: #252525;
 }
 
 .uls-font-label {
-   color: #555;
+   color: #54595d;
font-size: 10pt;
+}
+
+.uls-font-label strong {
+   color: #222;
 }
 
 .uls-display-settings-anon-label {
font-weight: bold;
-}
-
-#uls-display-settings-anon-log-in-cta { /* stylelint-disable-line 
selector-no-id */
-   font-size: 10pt;
 }
diff --git

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: EventStreams.doc: Change `iter(stream).next` to `next(it...

2017-08-26 Thread Dalba (Code Review)

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

Change subject: EventStreams.__doc__: Change `iter(stream).next` to 
`next(iter(stream))`
..

EventStreams.__doc__: Change `iter(stream).next` to `next(iter(stream))`

Python 3 generators don't have the next method. Use the built-in next function.

Change-Id: Iecf55f31ab41a6d2eb7fe0e23a544d2a40d3e408
---
M pywikibot/comms/eventstreams.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/02/374002/1

diff --git a/pywikibot/comms/eventstreams.py b/pywikibot/comms/eventstreams.py
index 0c8aece..061f4ac 100644
--- a/pywikibot/comms/eventstreams.py
+++ b/pywikibot/comms/eventstreams.py
@@ -42,7 +42,7 @@
 Usage:
 
 >>> stream = EventStreams(stream='recentchange')
->>> change = iter(stream).next()
+>>> change = next(iter(stream))
 >>> change
 {'comment': '/* wbcreateclaim-create:1| */ [[Property:P31]]: [[Q4167836]]',
  'wiki': 'wikidatawiki', 'type': 'edit', 'server_name': 'www.wikidata.org',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecf55f31ab41a6d2eb7fe0e23a544d2a40d3e408
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

65 matches

Mail list logo