date:20171224

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add @covers tags to miscellaneous tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to miscellaneous tests
..

Add @covers tags to miscellaneous tests

Change-Id: I7e65c1734aef01cd6395ee65204a0158d1635b0c
---
M tests/phpunit/includes/GlobalFunctions/GlobalTest.php
M tests/phpunit/includes/HtmlTest.php
M tests/phpunit/includes/LinkFilterTest.php
M tests/phpunit/includes/OutputPageTest.php
M tests/phpunit/includes/PagePropsTest.php
M tests/phpunit/includes/RevisionDbTestBase.php
M tests/phpunit/includes/TitleMethodsTest.php
M tests/phpunit/includes/TitleTest.php
M tests/phpunit/includes/poolcounter/PoolCounterTest.php
M tests/phpunit/includes/upload/UploadBaseTest.php
10 files changed, 47 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/68/400168/1

diff --git a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php 
b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
index d961e41..9d56150 100644
--- a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
+++ b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
@@ -752,6 +752,9 @@
);
}
 
+   /**
+* @covers ::wfMemcKey
+*/
public function testWfMemcKey() {
$cache = ObjectCache::getLocalClusterInstance();
$this->assertEquals(
@@ -760,6 +763,9 @@
);
}
 
+   /**
+* @covers ::wfForeignMemcKey
+*/
public function testWfForeignMemcKey() {
$cache = ObjectCache::getLocalClusterInstance();
$keyspace = $this->readAttribute( $cache, 'keyspace' );
@@ -769,6 +775,9 @@
);
}
 
+   /**
+* @covers ::wfGlobalCacheKey
+*/
public function testWfGlobalCacheKey() {
$cache = ObjectCache::getLocalClusterInstance();
$this->assertEquals(
diff --git a/tests/phpunit/includes/HtmlTest.php 
b/tests/phpunit/includes/HtmlTest.php
index e867f5e..7e32770 100644
--- a/tests/phpunit/includes/HtmlTest.php
+++ b/tests/phpunit/includes/HtmlTest.php
@@ -386,6 +386,9 @@
);
}
 
+   /**
+* @covers Html::namespaceSelector
+*/
public function testCanFilterOutNamespaces() {
$this->assertEquals(
'' . "\n" .
@@ -408,6 +411,9 @@
);
}
 
+   /**
+* @covers Html::namespaceSelector
+*/
public function testCanDisableANamespaces() {
$this->assertEquals(
'' . "\n" .
@@ -678,6 +684,9 @@
return $ret;
}
 
+   /**
+* @covers Html::input
+*/
public function testWrapperInput() {
$this->assertEquals(
'',
@@ -691,6 +700,9 @@
);
}
 
+   /**
+* @covers Html::check
+*/
public function testWrapperCheck() {
$this->assertEquals(
'',
@@ -709,6 +721,9 @@
);
}
 
+   /**
+* @covers Html::radio
+*/
public function testWrapperRadio() {
$this->assertEquals(
'',
@@ -727,6 +742,9 @@
);
}
 
+   /**
+* @covers Html::label
+*/
public function testWrapperLabel() {
$this->assertEquals(
'testlabel',
diff --git a/tests/phpunit/includes/LinkFilterTest.php 
b/tests/phpunit/includes/LinkFilterTest.php
index ed4958f..51b54d2 100644
--- a/tests/phpunit/includes/LinkFilterTest.php
+++ b/tests/phpunit/includes/LinkFilterTest.php
@@ -3,6 +3,7 @@
 use Wikimedia\Rdbms\LikeMatch;
 
 /**
+ * @covers LinkFilter
  * @group Database
  */
 class LinkFilterTest extends MediaWikiLangTestCase {
diff --git a/tests/phpunit/includes/OutputPageTest.php 
b/tests/phpunit/includes/OutputPageTest.php
index d5948ed..c348834 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -525,7 +525,7 @@
$this->assertTrue( $outputPage->haveCacheVaryCookies() );
}
 
-   /*
+   /**
 * @covers OutputPage::addCategoryLinks
 * @covers OutputPage::getCategories
 */
diff --git a/tests/phpunit/includes/PagePropsTest.php 
b/tests/phpunit/includes/PagePropsTest.php
index c96d987..f602cda 100644
--- a/tests/phpunit/includes/PagePropsTest.php
+++ b/tests/phpunit/includes/PagePropsTest.php
@@ -1,6 +1,8 @@
 assertEquals( $expected, 
$title->getOtherPage()->getPrefixedText() );
}
 
+   /**
+* @covers Title::clearCaches
+*/
public function testClearCaches() {
$linkCache = LinkCache::singleton();
 
diff --git a/tests/phpunit/includes/TitleTest.php 
b/tests/phpunit/includes/TitleTest.php

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add @covers tags to objectcache tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to objectcache tests
..

Add @covers tags to objectcache tests

Change-Id: I5db623a582a0424f50d939aaa14fe29da9358b4f
---
M tests/phpunit/includes/libs/objectcache/BagOStuffTest.php
M tests/phpunit/includes/objectcache/MemcachedBagOStuffTest.php
M tests/phpunit/includes/objectcache/RESTBagOStuffTest.php
3 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/400162/1

diff --git a/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php 
b/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php
index f2fe07d..4320d80 100644
--- a/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php
@@ -163,6 +163,9 @@
$this->assertTrue( $this->cache->add( $key, 'test' ) );
}
 
+   /**
+* @covers BagOStuff::get
+*/
public function testGet() {
$value = [ 'this' => 'is', 'a' => 'test' ];
 
diff --git a/tests/phpunit/includes/objectcache/MemcachedBagOStuffTest.php 
b/tests/phpunit/includes/objectcache/MemcachedBagOStuffTest.php
index 9cb2f94..7eb5582 100644
--- a/tests/phpunit/includes/objectcache/MemcachedBagOStuffTest.php
+++ b/tests/phpunit/includes/objectcache/MemcachedBagOStuffTest.php
@@ -70,6 +70,7 @@
 
/**
 * @dataProvider validKeyProvider
+* @covers MemcachedBagOStuff::validateKeyEncoding
 */
public function testValidateKeyEncoding( $key ) {
$this->assertSame( $key, $this->cache->validateKeyEncoding( 
$key ) );
@@ -86,6 +87,7 @@
 
/**
 * @dataProvider invalidKeyProvider
+* @covers MemcachedBagOStuff::validateKeyEncoding
 */
public function testValidateKeyEncodingThrowsException( $key ) {
$this->setExpectedException( 'Exception' );
diff --git a/tests/phpunit/includes/objectcache/RESTBagOStuffTest.php 
b/tests/phpunit/includes/objectcache/RESTBagOStuffTest.php
index f722fe1..4ef4aab 100644
--- a/tests/phpunit/includes/objectcache/RESTBagOStuffTest.php
+++ b/tests/phpunit/includes/objectcache/RESTBagOStuffTest.php
@@ -1,6 +1,8 @@
 https://gerrit.wikimedia.org/r/400162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5db623a582a0424f50d939aaa14fe29da9358b4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags to logging tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to logging tests
..

Add @covers tags to logging tests

Change-Id: Ibb14291a75423ddbb7502a5a0ee24ff0c554a876
---
M tests/phpunit/includes/logging/BlockLogFormatterTest.php
M tests/phpunit/includes/logging/DeleteLogFormatterTest.php
M tests/phpunit/includes/logging/ImportLogFormatterTest.php
M tests/phpunit/includes/logging/MergeLogFormatterTest.php
M tests/phpunit/includes/logging/MoveLogFormatterTest.php
M tests/phpunit/includes/logging/NewUsersLogFormatterTest.php
M tests/phpunit/includes/logging/PageLangLogFormatterTest.php
M tests/phpunit/includes/logging/PatrolLogFormatterTest.php
M tests/phpunit/includes/logging/ProtectLogFormatterTest.php
M tests/phpunit/includes/logging/RightsLogFormatterTest.php
M tests/phpunit/includes/logging/UploadLogFormatterTest.php
11 files changed, 31 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/400160/1

diff --git a/tests/phpunit/includes/logging/BlockLogFormatterTest.php 
b/tests/phpunit/includes/logging/BlockLogFormatterTest.php
index 4158ea2..03671ac 100644
--- a/tests/phpunit/includes/logging/BlockLogFormatterTest.php
+++ b/tests/phpunit/includes/logging/BlockLogFormatterTest.php
@@ -1,5 +1,8 @@
 https://gerrit.wikimedia.org/r/400160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb14291a75423ddbb7502a5a0ee24ff0c554a876
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags to media tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to media tests
..

Add @covers tags to media tests

Change-Id: Ibd3439f677dec5177b53317f113ed2aa8ddc2633
---
M tests/phpunit/includes/media/GIFTest.php
M tests/phpunit/includes/media/PNGTest.php
M tests/phpunit/includes/media/WebPTest.php
3 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/61/400161/1

diff --git a/tests/phpunit/includes/media/GIFTest.php 
b/tests/phpunit/includes/media/GIFTest.php
index aaa3ac4..7cd9caf 100644
--- a/tests/phpunit/includes/media/GIFTest.php
+++ b/tests/phpunit/includes/media/GIFTest.php
@@ -153,6 +153,7 @@
 * @param string $filename
 * @param float $expectedLength
 * @dataProvider provideGetLength
+* @covers GIFHandler::getLength
 */
public function testGetLength( $filename, $expectedLength ) {
$file = $this->dataFile( $filename, 'image/gif' );
diff --git a/tests/phpunit/includes/media/PNGTest.php 
b/tests/phpunit/includes/media/PNGTest.php
index 32d54df..4933f32 100644
--- a/tests/phpunit/includes/media/PNGTest.php
+++ b/tests/phpunit/includes/media/PNGTest.php
@@ -142,6 +142,7 @@
 * @param string $filename
 * @param float $expectedLength
 * @dataProvider provideGetLength
+* @covers PNGHandler::getLength
 */
public function testGetLength( $filename, $expectedLength ) {
$file = $this->dataFile( $filename, 'image/png' );
diff --git a/tests/phpunit/includes/media/WebPTest.php 
b/tests/phpunit/includes/media/WebPTest.php
index b8dadaf..ea06bbb 100644
--- a/tests/phpunit/includes/media/WebPTest.php
+++ b/tests/phpunit/includes/media/WebPTest.php
@@ -1,4 +1,8 @@
 https://gerrit.wikimedia.org/r/400161
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd3439f677dec5177b53317f113ed2aa8ddc2633
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags to parser tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to parser tests
..

Add @covers tags to parser tests

Change-Id: I7bce04bef5e981fd203ad819882482e72ca3f61b
---
M tests/phpunit/includes/parser/ParserOptionsTest.php
M tests/phpunit/includes/parser/SanitizerTest.php
2 files changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/400164/1

diff --git a/tests/phpunit/includes/parser/ParserOptionsTest.php 
b/tests/phpunit/includes/parser/ParserOptionsTest.php
index ad899bd..93ab35c 100644
--- a/tests/phpunit/includes/parser/ParserOptionsTest.php
+++ b/tests/phpunit/includes/parser/ParserOptionsTest.php
@@ -3,6 +3,9 @@
 use Wikimedia\TestingAccessWrapper;
 use Wikimedia\ScopedCallback;
 
+/**
+ * @covers ParserOptions
+ */
 class ParserOptionsTest extends MediaWikiTestCase {
 
private static function clearCache() {
diff --git a/tests/phpunit/includes/parser/SanitizerTest.php 
b/tests/phpunit/includes/parser/SanitizerTest.php
index d7e72e1..2cf9553 100644
--- a/tests/phpunit/includes/parser/SanitizerTest.php
+++ b/tests/phpunit/includes/parser/SanitizerTest.php
@@ -406,6 +406,7 @@
 
/**
 * @dataProvider provideIsReservedDataAttribute
+* @covers Sanitizer::isReservedDataAttribute
 */
public function testIsReservedDataAttribute( $attr, $expected ) {
$this->assertSame( $expected, 
Sanitizer::isReservedDataAttribute( $attr ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bce04bef5e981fd203ad819882482e72ca3f61b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags to page tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to page tests
..

Add @covers tags to page tests

Change-Id: Iadb7e8697e9992ca281b7dfe70cf832c82e194de
---
M tests/phpunit/includes/page/ImagePage404Test.php
M tests/phpunit/includes/page/ImagePageTest.php
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/63/400163/1

diff --git a/tests/phpunit/includes/page/ImagePage404Test.php 
b/tests/phpunit/includes/page/ImagePage404Test.php
index 48c4392..4faace2 100644
--- a/tests/phpunit/includes/page/ImagePage404Test.php
+++ b/tests/phpunit/includes/page/ImagePage404Test.php
@@ -28,6 +28,7 @@
}
 
/**
+* @covers ImagePage::getThumbSizes
 * @dataProvider providerGetThumbSizes
 * @param string $filename
 * @param int $expectedNumberThumbs How many thumbnails to show
diff --git a/tests/phpunit/includes/page/ImagePageTest.php 
b/tests/phpunit/includes/page/ImagePageTest.php
index 2b30cfa..8e49bf9 100644
--- a/tests/phpunit/includes/page/ImagePageTest.php
+++ b/tests/phpunit/includes/page/ImagePageTest.php
@@ -21,6 +21,7 @@
}
 
/**
+* @covers ImagePage::getDisplayWidthHeight
 * @dataProvider providerGetDisplayWidthHeight
 * @param array $dim Array [maxWidth, maxHeight, width, height]
 * @param array $expected Array [width, height] The width and height we 
expect to display at
@@ -65,6 +66,7 @@
}
 
/**
+* @covers ImagePage::getThumbSizes
 * @dataProvider providerGetThumbSizes
 * @param string $filename
 * @param int $expectedNumberThumbs How many thumbnails to show

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadb7e8697e9992ca281b7dfe70cf832c82e194de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags to specials tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to specials tests
..

Add @covers tags to specials tests

Change-Id: I626155b890580af38c09795b2b31f625fe942358
---
M tests/phpunit/includes/specials/ContribsPagerTest.php
M tests/phpunit/includes/specials/SpecialMIMESearchTest.php
M tests/phpunit/includes/specials/SpecialUncategorizedcategoriesTest.php
3 files changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/65/400165/1

diff --git a/tests/phpunit/includes/specials/ContribsPagerTest.php 
b/tests/phpunit/includes/specials/ContribsPagerTest.php
index 9366282..1147805 100644
--- a/tests/phpunit/includes/specials/ContribsPagerTest.php
+++ b/tests/phpunit/includes/specials/ContribsPagerTest.php
@@ -18,6 +18,7 @@
}
 
/**
+* @covers ContribsPager::processDateFilter
 * @dataProvider dateFilterOptionProcessingProvider
 * @param array $inputOpts Input options
 * @param array $expectedOpts Expected options
diff --git a/tests/phpunit/includes/specials/SpecialMIMESearchTest.php 
b/tests/phpunit/includes/specials/SpecialMIMESearchTest.php
index ede2791..a845938 100644
--- a/tests/phpunit/includes/specials/SpecialMIMESearchTest.php
+++ b/tests/phpunit/includes/specials/SpecialMIMESearchTest.php
@@ -3,6 +3,9 @@
  * @group Database
  */
 
+/**
+ * @covers MIMEsearchPage
+ */
 class SpecialMIMESearchTest extends MediaWikiTestCase {
 
/** @var MIMEsearchPage */
diff --git 
a/tests/phpunit/includes/specials/SpecialUncategorizedcategoriesTest.php 
b/tests/phpunit/includes/specials/SpecialUncategorizedcategoriesTest.php
index 64e78f2..2ecef79 100644
--- a/tests/phpunit/includes/specials/SpecialUncategorizedcategoriesTest.php
+++ b/tests/phpunit/includes/specials/SpecialUncategorizedcategoriesTest.php
@@ -5,6 +5,7 @@
 class UncategorizedCategoriesPageTest extends MediaWikiTestCase {
/**
 * @dataProvider provideTestGetQueryInfoData
+* @covers UncategorizedCategoriesPage::getQueryInfo
 */
public function testGetQueryInfo( $msgContent, $expected ) {
$msg = new RawMessage( $msgContent );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I626155b890580af38c09795b2b31f625fe942358
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags to utils tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to utils tests
..

Add @covers tags to utils tests

Change-Id: Iee44762696120c63fec986de1da76f12849f5957
---
M tests/phpunit/includes/utils/BatchRowUpdateTest.php
M tests/phpunit/includes/utils/MWCryptHKDFTest.php
2 files changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/67/400167/1

diff --git a/tests/phpunit/includes/utils/BatchRowUpdateTest.php 
b/tests/phpunit/includes/utils/BatchRowUpdateTest.php
index 017e97d..d80a61c 100644
--- a/tests/phpunit/includes/utils/BatchRowUpdateTest.php
+++ b/tests/phpunit/includes/utils/BatchRowUpdateTest.php
@@ -4,6 +4,10 @@
  * Tests for BatchRowUpdate and its components
  *
  * @group db
+ *
+ * @covers BatchRowUpdate
+ * @covers BatchRowIterator
+ * @covers BatchRowWriter
  */
 class BatchRowUpdateTest extends MediaWikiTestCase {
 
diff --git a/tests/phpunit/includes/utils/MWCryptHKDFTest.php 
b/tests/phpunit/includes/utils/MWCryptHKDFTest.php
index 86c19ae..ac638c6 100644
--- a/tests/phpunit/includes/utils/MWCryptHKDFTest.php
+++ b/tests/phpunit/includes/utils/MWCryptHKDFTest.php
@@ -4,6 +4,10 @@
  * @group HKDF
  */
 
+/**
+ * @covers CryptHKDF
+ * @covers MWCryptHKDF
+ */
 class MWCryptHKDFTest extends MediaWikiTestCase {
 
protected function setUp() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee44762696120c63fec986de1da76f12849f5957
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags to user tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to user tests
..

Add @covers tags to user tests

Change-Id: I9ec5644e6b780937492eb5e0ea9e27ebad15ad43
---
M tests/phpunit/includes/user/PasswordResetTest.php
M tests/phpunit/includes/user/UserTest.php
2 files changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/66/400166/1

diff --git a/tests/phpunit/includes/user/PasswordResetTest.php 
b/tests/phpunit/includes/user/PasswordResetTest.php
index 68b7959..1f578ab 100644
--- a/tests/phpunit/includes/user/PasswordResetTest.php
+++ b/tests/phpunit/includes/user/PasswordResetTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\Auth\AuthManager;
 
 /**
+ * @covers PasswordReset
  * @group Database
  */
 class PasswordResetTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/includes/user/UserTest.php 
b/tests/phpunit/includes/user/UserTest.php
index 2721c18..f004e79 100644
--- a/tests/phpunit/includes/user/UserTest.php
+++ b/tests/phpunit/includes/user/UserTest.php
@@ -903,6 +903,9 @@
$block->delete();
}
 
+   /**
+* @covers User::isPingLimitable
+*/
public function testIsPingLimitable() {
$request = new FauxRequest();
$request->setIP( '1.2.3.4' );
@@ -939,6 +942,7 @@
}
 
/**
+* @covers User::getExperienceLevel
 * @dataProvider provideExperienceLevel
 */
public function testExperienceLevel( $editCount, $memberSince, 
$expLevel ) {
@@ -968,6 +972,9 @@
$this->assertEquals( $expLevel, $user->getExperienceLevel() );
}
 
+   /**
+* @covers User::getExperienceLevel
+*/
public function testExperienceLevelAnon() {
$user = User::newFromName( '10.11.12.13', false );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ec5644e6b780937492eb5e0ea9e27ebad15ad43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] integration/config[master]: Run phan for mediawiki/skins/Modern

2017-12-24 Thread Phantom42 (Code Review)

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

Change subject: Run phan for mediawiki/skins/Modern
..

Run phan for mediawiki/skins/Modern

Bug: T179554
Change-Id: Ic9e8fdb1d7c8e1ac2f1d006d3493436b344fcec2
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/59/400159/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d25eb60..40800cc 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1999,6 +1999,7 @@
  - name: mw-checks-test
  - name: mwgate-npm
  - name: skin-tests
+ - name: extension-phan-generic
 
   - name: mediawiki/skins/MonoBook
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9e8fdb1d7c8e1ac2f1d006d3493436b344fcec2
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Phantom42 

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

[MediaWiki-commits] [Gerrit] mediawiki...Modern[master]: Add phan configuration for static analysis

2017-12-24 Thread Phantom42 (Code Review)

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

Change subject: Add phan configuration for static analysis
..

Add phan configuration for static analysis

Bug: T179554
Change-Id: I75f6df702e2664fbbd27fd32a03efee18f2235e6
---
M .gitignore
A tests/phan/config.php
2 files changed, 306 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Modern 
refs/changes/58/400158/1

diff --git a/.gitignore b/.gitignore
index 53bbca6..db3b235 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@
 
 # Building & testing
 node_modules/
+/tests/phan/issues
 
 # Composer
 /vendor
diff --git a/tests/phan/config.php b/tests/phan/config.php
new file mode 100644
index 000..70bcde5
--- /dev/null
+++ b/tests/phan/config.php
@@ -0,0 +1,305 @@
+ [
+   ],
+
+   /**
+* A list of directories that should be parsed for class and
+* method information. After excluding the directories
+* defined in exclude_analysis_directory_list, the remaining
+* files will be statically analyzed for errors.
+*
+* Thus, both first-party and third-party code being used by
+* your application should be included in this list.
+*/
+   'directory_list' => [
+   '.',
+   './../../includes',
+   './../../languages',
+   './../../maintenance',
+   './../../vendor',
+   ],
+
+   /**
+* A file list that defines files that will be excluded
+* from parsing and analysis and will not be read at all.
+*
+* This is useful for excluding hopelessly unanalyzable
+* files that can't be removed for whatever reason.
+*/
+   'exclude_file_list' => [
+   ],
+
+   /**
+* A list of directories holding code that we want
+* to parse, but not analyze. Also works for individual
+* files.
+*/
+   "exclude_analysis_directory_list" => [
+   './../../includes',
+   './../../languages',
+   './../../maintenance',
+   './../../vendor',
+   ],
+
+   /**
+* Backwards Compatibility Checking. This is slow
+* and expensive, but you should consider running
+* it before upgrading your version of PHP to a
+* new version that has backward compatibility
+* breaks.
+*/
+   'backward_compatibility_checks' => false,
+
+   /**
+* A set of fully qualified class-names for which
+* a call to parent::__construct() is required
+*/
+   'parent_constructor_required' => [
+   ],
+
+   /**
+* Run a quick version of checks that takes less
+* time at the cost of not running as thorough
+* an analysis. You should consider setting this
+* to true only when you wish you had more issues
+* to fix in your code base.
+*
+* In quick-mode the scanner doesn't rescan a function
+* or a method's code block every time a call is seen.
+* This means that the problem here won't be detected:
+*
+* ```php
+*  false,
+
+   /**
+* By default, Phan will not analyze all node types
+* in order to save time. If this config is set to true,
+* Phan will dig deeper into the AST tree and do an
+* analysis on all nodes, possibly finding more issues.
+*
+* See \Phan\Analysis::shouldVisit for the set of skipped
+* nodes.
+*/
+   'should_visit_all_nodes' => true,
+
+   /**
+* If enabled, check all methods that override a
+* parent method to make sure its signature is
+* compatible with the parent's. This check
+* can add quite a bit of time to the analysis.
+*/
+   'analyze_signature_compatibility' => true,
+
+   // Emit all issues. They are then suppressed via
+   // suppress_issue_types, rather than a minimum
+   // severity.
+   "minimum_severity" => 0,
+
+   /**
+* If true, missing properties will be created when
+* they are first seen. If false, we'll report an
+* error message if there is an attempt to write
+* to a class property that wasn't explicitly
+* defined.
+*/
+   'allow_missing_properties' => false,
+
+   /**
+* Allow null to be cast as any type and for any
+* type to be cast to null. Setting this to false
+* will cut down on false positives.
+*/
+   'null_casts_as_any_type' => true,
+
+   /**
+* If enabled, scalars (int, float, bool, string, null)
+* are treated as if they can cast to each other.
+*
+* MediaWiki is pretty lax and uses many scalar
+* types interchangably.
+*/
+   'scalar_implicit_cast' => true,
+
+

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceChecklist[master]: Add minus-x to composer test and fix

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add minus-x to composer test and fix
..


Add minus-x to composer test and fix

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I333c5f8757ce5abd90556200b598ecab04c9acee
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceChecklist
Gerrit-Branch: master
Gerrit-Owner: Albert221 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceConfigManager[master]: Add minus-x to composer test and fix

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add minus-x to composer test and fix
..


Add minus-x to composer test and fix

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2483c80d51cdf1dbc5b7c5a0b26ad5ca4686
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceConfigManager
Gerrit-Branch: master
Gerrit-Owner: Albert221 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Run phan for mediawiki/skins/Vector

2017-12-24 Thread Phantom42 (Code Review)

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

Change subject: Run phan for mediawiki/skins/Vector
..

Run phan for mediawiki/skins/Vector

Bug: T179554
Change-Id: Iced3b9f7d10a149eead2e6a3e102b3edc0b5bc1d
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/57/400157/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d25eb60..58890fc 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2083,6 +2083,7 @@
  - name: mwgate-composer
  - name: mwgate-npm
  - name: skin-tests
+ - name: extension-phan-generic
 test:
  - mediawiki-core-qunit-selenium-jessie
 gate-and-submit: 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iced3b9f7d10a149eead2e6a3e102b3edc0b5bc1d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Phantom42 

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Add phan configuration for static analysis

2017-12-24 Thread Phantom42 (Code Review)

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

Change subject: Add phan configuration for static analysis
..

Add phan configuration for static analysis

Bug: T179554
Change-Id: I587285fb3687541233156e19e24cd448e9a7976a
---
M .gitignore
M VectorTemplate.php
A tests/phan/config.php
3 files changed, 306 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/56/400156/1

diff --git a/.gitignore b/.gitignore
index 7c9e72a..4a10ec2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@
 /docs
 /node_modules
 /vendor
+/tests/phan/issues
 
 # Operating systems
 ## Mac OS X
diff --git a/VectorTemplate.php b/VectorTemplate.php
index fe2c878..6f2c00f 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -152,7 +152,7 @@

msg( 'navigation-heading' ) ?>

-   renderNavigation( 'PERSONAL' ); ?>
+   renderNavigation( [ 'PERSONAL' ] 
); ?>

renderNavigation( [ 
'NAMESPACES', 'VARIANTS' ] ); ?>

@@ -271,10 +271,10 @@
$msg = $name;
}
$msgObj = wfMessage( $msg );
-   $labelId = Sanitizer::escapeId( "p-$name-label" );
+   $labelId = Sanitizer::escapeIdForAttribute( "p-$name-label" );
?>
 aria-labelledby=''>
diff --git a/tests/phan/config.php b/tests/phan/config.php
new file mode 100644
index 000..ee8f443
--- /dev/null
+++ b/tests/phan/config.php
@@ -0,0 +1,302 @@
+ [
+   ],
+
+   /**
+* A list of directories that should be parsed for class and
+* method information. After excluding the directories
+* defined in exclude_analysis_directory_list, the remaining
+* files will be statically analyzed for errors.
+*
+* Thus, both first-party and third-party code being used by
+* your application should be included in this list.
+*/
+   'directory_list' => [
+   '.',
+   './../../includes',
+   './../../languages',
+   './../../maintenance',
+   './../../vendor',
+   ],
+
+   /**
+* A file list that defines files that will be excluded
+* from parsing and analysis and will not be read at all.
+*
+* This is useful for excluding hopelessly unanalyzable
+* files that can't be removed for whatever reason.
+*/
+   'exclude_file_list' => [
+   ],
+
+   /**
+* A list of directories holding code that we want
+* to parse, but not analyze. Also works for individual
+* files.
+*/
+   "exclude_analysis_directory_list" => [
+   './../../includes',
+   './../../languages',
+   './../../maintenance',
+   './../../vendor',
+   ],
+
+   /**
+* Backwards Compatibility Checking. This is slow
+* and expensive, but you should consider running
+* it before upgrading your version of PHP to a
+* new version that has backward compatibility
+* breaks.
+*/
+   'backward_compatibility_checks' => false,
+
+   /**
+* A set of fully qualified class-names for which
+* a call to parent::__construct() is required
+*/
+   'parent_constructor_required' => [
+   ],
+
+   /**
+* Run a quick version of checks that takes less
+* time at the cost of not running as thorough
+* an analysis. You should consider setting this
+* to true only when you wish you had more issues
+* to fix in your code base.
+*
+* In quick-mode the scanner doesn't rescan a function
+* or a method's code block every time a call is seen.
+* This means that the problem here won't be detected:
+*
+* ```php
+*  false,
+
+   /**
+* By default, Phan will not analyze all node types
+* in order to save time. If this config is set to true,
+* Phan will dig deeper into the AST tree and do an
+* analysis on all nodes, possibly finding more issues.
+*
+* See \Phan\Analysis::shouldVisit for the set of skipped
+* nodes.
+*/
+   'should_visit_all_nodes' => true,
+
+   /**
+* If enabled, check all methods that override a
+* parent method to make sure its signature is
+* compatible with the parent's. This check
+* can add quite a bit of time to the analysis.
+*/
+   'analyze_signature_compatibility' => true,
+
+   // Emit all issues. They are then suppressed via
+   // suppress_issue_types, rather than a

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: elk: Fix kibana reverse proxy

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: elk: Fix kibana reverse proxy
..


elk: Fix kibana reverse proxy

The apache config installed for the ELK role had not been updated for
the move to the nodejs Kibana service.

Exec['wait-for-elasticsearch'] has also been updated to stop leaving
index.html files in ~vagrant.

Change-Id: I7975605a5d6443cbf80f20e1576e18b80982095d
---
M puppet/hieradata/common.yaml
M puppet/modules/elasticsearch/manifests/init.pp
M puppet/modules/kibana/manifests/init.pp
M puppet/modules/role/templates/elk/VagrantRoleElk.wiki.erb
M puppet/modules/role/templates/elk/apache.conf.erb
5 files changed, 11 insertions(+), 57 deletions(-)

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



diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index cd2685a..9889e3f 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -154,9 +154,6 @@
 hhvm::logroot: /vagrant/logs
 hhvm::admin_site_name: "hhvm-admin%{hiera('mwv::tld')}"
 
-kibana::deploy_dir: "%{hiera('mwv::vendor_dir')}/kibana"
-kibana::default_route: /dashboard/elasticsearch/default
-
 logstash::heap_memory_mb: 192
 logstash::pipeline_workers: 1
 logstash::output::elasticsearch::host: 127.0.0.1
diff --git a/puppet/modules/elasticsearch/manifests/init.pp 
b/puppet/modules/elasticsearch/manifests/init.pp
index e11bcd4..d570f1c 100644
--- a/puppet/modules/elasticsearch/manifests/init.pp
+++ b/puppet/modules/elasticsearch/manifests/init.pp
@@ -33,7 +33,7 @@
 
 exec { 'wait-for-elasticsearch':
 require => Service['elasticsearch'],
-command => '/usr/bin/wget --tries 20 --retry-connrefused 
http://localhost:9200/',
+command => '/usr/bin/wget --tries 20 --retry-connrefused 
http://127.0.0.1:9200/ -O - >/dev/null',
 }
 
 file { '/etc/default/elasticsearch':
diff --git a/puppet/modules/kibana/manifests/init.pp 
b/puppet/modules/kibana/manifests/init.pp
index abb4c2b..069e1d2 100644
--- a/puppet/modules/kibana/manifests/init.pp
+++ b/puppet/modules/kibana/manifests/init.pp
@@ -3,21 +3,7 @@
 # Kibana is a JavaScript web application for visualizing log data and other
 # types of time-stamped data. It integrates with ElasticSearch and LogStash.
 #
-# == Parameters:
-# - $deploy_dir: Directory to deploy kibana in.
-# - $default_route: Default landing page. You can specify files, scripts or
-# saved dashboards here.
-#
-# == Sample usage:
-#
-#   class { 'kibana':
-#   default_route => '/dashboard/elasticsearch/default',
-#   }
-#
-class kibana (
-$deploy_dir,
-$default_route,
-) {
+class kibana {
 package { 'kibana':
 ensure => latest,
 }
@@ -46,12 +32,12 @@
 
 exec { 'create-kibana-index':
 command => 'curl -XPUT localhost:9200/.kibana --data-binary 
@/vagrant/puppet/modules/kibana/files/kibana-mapping.json',
-unless  => 'curl -sf --head localhost:9200/.kibana',
+unless  => 'curl -sf --head 127.0.0.1:9200/.kibana',
 require => Exec['wait-for-elasticsearch'],
 }
 
 exec { 'preload-kibana-dashboard':
-command => 'curl -sf -X POST localhost:9200/.kibana/_bulk 
--data-binary @/vagrant/puppet/modules/kibana/files/kibana-dump.json > 
/dev/null',
+command => 'curl -sf -X POST 127.0.0.1:9200/.kibana/_bulk 
--data-binary @/vagrant/puppet/modules/kibana/files/kibana-dump.json > 
/dev/null',
 refreshonly => true,
 subscribe   => Exec['create-kibana-index'],
 require => Exec['wait-for-elasticsearch'],
diff --git a/puppet/modules/role/templates/elk/VagrantRoleElk.wiki.erb 
b/puppet/modules/role/templates/elk/VagrantRoleElk.wiki.erb
index 3b65829..e9ff257 100644
--- a/puppet/modules/role/templates/elk/VagrantRoleElk.wiki.erb
+++ b/puppet/modules/role/templates/elk/VagrantRoleElk.wiki.erb
@@ -1,4 +1,4 @@
 Provision an ELK stack ([https://www.elastic.co/products/elasticsearch 
ElasticSearch], [https://www.elastic.co/products/logstash Logstash], 
[https://www.elastic.co/products/kibana Kibana]) and send MediaWiki log 
messages there.
 
-Kibana GUI: [//<%= @vhost_name %><%= @port_fragment %> <%= @vhost_name %>]
+Kibana GUI: [//<%= @vhost_name %><%= @port_fragment %>/app/kibana <%= 
@vhost_name %>]
 
diff --git a/puppet/modules/role/templates/elk/apache.conf.erb 
b/puppet/modules/role/templates/elk/apache.conf.erb
index f437372..42e3ebc 100644
--- a/puppet/modules/role/templates/elk/apache.conf.erb
+++ b/puppet/modules/role/templates/elk/apache.conf.erb
@@ -1,6 +1,5 @@
 ServerName <%= @vhost_name %>
-
-DocumentRoot <%= scope['::kibana::deploy_dir'] %>/src
+DocumentRoot /var/www/html
 
 
   Options FollowSymLinks
@@ -8,41 +7,13 @@
   Require all denied
 
 
-
+
+  ProxyPass "http://localhost:5601/;
   Require all granted
-
-
-/src>
-  Require all granted
-
-
-alias /config.js /etc/kibana/config.js
+

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: elk: Fix kibana reverse proxy

2017-12-24 Thread BryanDavis (Code Review)

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

Change subject: elk: Fix kibana reverse proxy
..

elk: Fix kibana reverse proxy

The apache config installed for the ELK role had not been updated for
the move to the nodejs Kibana service.

Exec['wait-for-elasticsearch'] has also been updated to stop leaving
index.html files in ~vagrant.

Change-Id: I7975605a5d6443cbf80f20e1576e18b80982095d
---
M puppet/hieradata/common.yaml
M puppet/modules/elasticsearch/manifests/init.pp
M puppet/modules/kibana/manifests/init.pp
M puppet/modules/role/templates/elk/VagrantRoleElk.wiki.erb
M puppet/modules/role/templates/elk/apache.conf.erb
5 files changed, 11 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/55/400155/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index cd2685a..9889e3f 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -154,9 +154,6 @@
 hhvm::logroot: /vagrant/logs
 hhvm::admin_site_name: "hhvm-admin%{hiera('mwv::tld')}"
 
-kibana::deploy_dir: "%{hiera('mwv::vendor_dir')}/kibana"
-kibana::default_route: /dashboard/elasticsearch/default
-
 logstash::heap_memory_mb: 192
 logstash::pipeline_workers: 1
 logstash::output::elasticsearch::host: 127.0.0.1
diff --git a/puppet/modules/elasticsearch/manifests/init.pp 
b/puppet/modules/elasticsearch/manifests/init.pp
index e11bcd4..d570f1c 100644
--- a/puppet/modules/elasticsearch/manifests/init.pp
+++ b/puppet/modules/elasticsearch/manifests/init.pp
@@ -33,7 +33,7 @@
 
 exec { 'wait-for-elasticsearch':
 require => Service['elasticsearch'],
-command => '/usr/bin/wget --tries 20 --retry-connrefused 
http://localhost:9200/',
+command => '/usr/bin/wget --tries 20 --retry-connrefused 
http://127.0.0.1:9200/ -O - >/dev/null',
 }
 
 file { '/etc/default/elasticsearch':
diff --git a/puppet/modules/kibana/manifests/init.pp 
b/puppet/modules/kibana/manifests/init.pp
index abb4c2b..069e1d2 100644
--- a/puppet/modules/kibana/manifests/init.pp
+++ b/puppet/modules/kibana/manifests/init.pp
@@ -3,21 +3,7 @@
 # Kibana is a JavaScript web application for visualizing log data and other
 # types of time-stamped data. It integrates with ElasticSearch and LogStash.
 #
-# == Parameters:
-# - $deploy_dir: Directory to deploy kibana in.
-# - $default_route: Default landing page. You can specify files, scripts or
-# saved dashboards here.
-#
-# == Sample usage:
-#
-#   class { 'kibana':
-#   default_route => '/dashboard/elasticsearch/default',
-#   }
-#
-class kibana (
-$deploy_dir,
-$default_route,
-) {
+class kibana {
 package { 'kibana':
 ensure => latest,
 }
@@ -46,12 +32,12 @@
 
 exec { 'create-kibana-index':
 command => 'curl -XPUT localhost:9200/.kibana --data-binary 
@/vagrant/puppet/modules/kibana/files/kibana-mapping.json',
-unless  => 'curl -sf --head localhost:9200/.kibana',
+unless  => 'curl -sf --head 127.0.0.1:9200/.kibana',
 require => Exec['wait-for-elasticsearch'],
 }
 
 exec { 'preload-kibana-dashboard':
-command => 'curl -sf -X POST localhost:9200/.kibana/_bulk 
--data-binary @/vagrant/puppet/modules/kibana/files/kibana-dump.json > 
/dev/null',
+command => 'curl -sf -X POST 127.0.0.1:9200/.kibana/_bulk 
--data-binary @/vagrant/puppet/modules/kibana/files/kibana-dump.json > 
/dev/null',
 refreshonly => true,
 subscribe   => Exec['create-kibana-index'],
 require => Exec['wait-for-elasticsearch'],
diff --git a/puppet/modules/role/templates/elk/VagrantRoleElk.wiki.erb 
b/puppet/modules/role/templates/elk/VagrantRoleElk.wiki.erb
index 3b65829..e9ff257 100644
--- a/puppet/modules/role/templates/elk/VagrantRoleElk.wiki.erb
+++ b/puppet/modules/role/templates/elk/VagrantRoleElk.wiki.erb
@@ -1,4 +1,4 @@
 Provision an ELK stack ([https://www.elastic.co/products/elasticsearch 
ElasticSearch], [https://www.elastic.co/products/logstash Logstash], 
[https://www.elastic.co/products/kibana Kibana]) and send MediaWiki log 
messages there.
 
-Kibana GUI: [//<%= @vhost_name %><%= @port_fragment %> <%= @vhost_name %>]
+Kibana GUI: [//<%= @vhost_name %><%= @port_fragment %>/app/kibana <%= 
@vhost_name %>]
 
diff --git a/puppet/modules/role/templates/elk/apache.conf.erb 
b/puppet/modules/role/templates/elk/apache.conf.erb
index f437372..42e3ebc 100644
--- a/puppet/modules/role/templates/elk/apache.conf.erb
+++ b/puppet/modules/role/templates/elk/apache.conf.erb
@@ -1,6 +1,5 @@
 ServerName <%= @vhost_name %>
-
-DocumentRoot <%= scope['::kibana::deploy_dir'] %>/src
+DocumentRoot /var/www/html
 
 
   Options FollowSymLinks
@@ -8,41 +7,13 @@
   Require all denied
 
 
-
+
+  ProxyPass "http://localhost:5601/;
   Require all granted
-
-
-/src>
-  Require all granted
-
-
-alias /config.js /etc/kibana/config.js
+

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Fix typo in elasticsearch::repository

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Fix typo in elasticsearch::repository
..


Fix typo in elasticsearch::repository

Change-Id: I0eddf2a6e664da9132d767cd210f233c6ff78f66
---
M puppet/modules/elasticsearch/manifests/repository.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/puppet/modules/elasticsearch/manifests/repository.pp 
b/puppet/modules/elasticsearch/manifests/repository.pp
index 610e49f..b32b98d 100644
--- a/puppet/modules/elasticsearch/manifests/repository.pp
+++ b/puppet/modules/elasticsearch/manifests/repository.pp
@@ -1,6 +1,6 @@
 # == Class: Elasticsearch::Repository
 #
-# Configure an atp repository to fetch elasticsearch packages from.
+# Configure an apt repository to fetch elasticsearch packages from.
 class elasticsearch::repository {
 apt::repository { 'wikimedia-elastic':
 uri=> 'http://apt.wikimedia.org/wikimedia',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0eddf2a6e664da9132d767cd210f233c6ff78f66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Fix typo in elasticsearch::repository

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Fix typo in elasticsearch::repository
..

Fix typo in elasticsearch::repository

Change-Id: I0eddf2a6e664da9132d767cd210f233c6ff78f66
---
M puppet/modules/elasticsearch/manifests/repository.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/54/400154/1

diff --git a/puppet/modules/elasticsearch/manifests/repository.pp 
b/puppet/modules/elasticsearch/manifests/repository.pp
index 610e49f..b32b98d 100644
--- a/puppet/modules/elasticsearch/manifests/repository.pp
+++ b/puppet/modules/elasticsearch/manifests/repository.pp
@@ -1,6 +1,6 @@
 # == Class: Elasticsearch::Repository
 #
-# Configure an atp repository to fetch elasticsearch packages from.
+# Configure an apt repository to fetch elasticsearch packages from.
 class elasticsearch::repository {
 apt::repository { 'wikimedia-elastic':
 uri=> 'http://apt.wikimedia.org/wikimedia',

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Whitelist eflyjason (GCI)

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Whitelist eflyjason (GCI)
..


Whitelist eflyjason (GCI)

Change-Id: I43c5cb3120c63d853c8643709aa51eaeffb519be
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 777b89a..d25eb60 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -99,6 +99,7 @@
 | dvorapa@seznam\.cz
 | ebrahim@gnu\.org
 | ecokpo@gmail\.com
+| eflyjason@gmail\.com
 | ejegg@ejegg\.com
 | elaa...@gmail.com
 | eloquence@gmail\.com
@@ -543,6 +544,7 @@
- ^bmp2558@gmail\.com$ # Georggi
- ^crazy4sb@gmail\.com$ # unicornisaurous
- ^divad\.nnamtdeis@gmail\.com$ # Divadsn
+   - ^eflyjason@gmail\.com$ # Yifei He
- ^rj23@protonmail\.com$ # Filip
- ^gianiskido@gmail\.com$ # IoannisKydonis
- ^i@ananayarora\.com$

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43c5cb3120c63d853c8643709aa51eaeffb519be
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Framawiki 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Whitelist Rafidaslam

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Whitelist Rafidaslam
..


Whitelist Rafidaslam

Change-Id: I109b65658a050b59788dc05344161a13ef172ed1
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7133150..777b89a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -203,6 +203,7 @@
 | pranavmk98@gmail\.com
 | purodha@blissenbach\.org
 | pyfisch@gmail\.com
+| rafidteam@gmail\.com
 | raimond\.spekking@gmail\.com
 | ricordisamoa@openmailbox\.org
 | rillke@wikipedia\.de
@@ -550,6 +551,7 @@
- ^mhutti1@gmail\.com$
- ^nikitav30@gmail\.com$ # Phantom42
- ^pranavmk98@gmail\.com$ # PranavK
+   - ^rafidteam@gmail\.com$ # Rafidaslam
- ^rj23@protonmail\.com$ # Filip / rlot
- ^victorbarbu08@gmail\.com$ # Victorbarbu
- ^w\.albert221@gmail\.com$ # Albert221

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I109b65658a050b59788dc05344161a13ef172ed1
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Whitelist Rafidaslam

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Whitelist Rafidaslam
..

Whitelist Rafidaslam

Change-Id: I109b65658a050b59788dc05344161a13ef172ed1
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/53/400153/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7133150..777b89a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -203,6 +203,7 @@
 | pranavmk98@gmail\.com
 | purodha@blissenbach\.org
 | pyfisch@gmail\.com
+| rafidteam@gmail\.com
 | raimond\.spekking@gmail\.com
 | ricordisamoa@openmailbox\.org
 | rillke@wikipedia\.de
@@ -550,6 +551,7 @@
- ^mhutti1@gmail\.com$
- ^nikitav30@gmail\.com$ # Phantom42
- ^pranavmk98@gmail\.com$ # PranavK
+   - ^rafidteam@gmail\.com$ # Rafidaslam
- ^rj23@protonmail\.com$ # Filip / rlot
- ^victorbarbu08@gmail\.com$ # Victorbarbu
- ^w\.albert221@gmail\.com$ # Albert221

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I109b65658a050b59788dc05344161a13ef172ed1
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
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/core[master]: Add @covers tags to LinksUpdate test

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to LinksUpdate test
..

Add @covers tags to LinksUpdate test

Change-Id: I65ebce434f00a42e06be5168acbaa8fbf637995f
---
M tests/phpunit/includes/deferred/LinksUpdateTest.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/49/400149/1

diff --git a/tests/phpunit/includes/deferred/LinksUpdateTest.php 
b/tests/phpunit/includes/deferred/LinksUpdateTest.php
index 4c0a5fa..ddc0798 100644
--- a/tests/phpunit/includes/deferred/LinksUpdateTest.php
+++ b/tests/phpunit/includes/deferred/LinksUpdateTest.php
@@ -1,6 +1,7 @@
 https://gerrit.wikimedia.org/r/400149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65ebce434f00a42e06be5168acbaa8fbf637995f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags to jobqueue tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to jobqueue tests
..

Add @covers tags to jobqueue tests

Change-Id: I030634ac87139011e5b3d461064a8c10f10cea84
---
M tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/400152/1

diff --git a/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php 
b/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php
index 43d626d..f874f6d 100644
--- a/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php
+++ b/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php
@@ -16,6 +16,7 @@
 
/**
 * @dataProvider provider_backlinks
+* @covers BacklinkJobUtils::partitionBacklinkJob
 */
public function testRefreshLinks( $ns, $dbKey, $pages ) {
$title = Title::makeTitle( $ns, $dbKey );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I030634ac87139011e5b3d461064a8c10f10cea84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags to HTMLForm test

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to HTMLForm test
..

Add @covers tags to HTMLForm test

Change-Id: I41cc4867b071ee9a58a43760fc4a8b301cda558e
---
M tests/phpunit/includes/htmlform/HTMLFormTest.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/51/400151/1

diff --git a/tests/phpunit/includes/htmlform/HTMLFormTest.php 
b/tests/phpunit/includes/htmlform/HTMLFormTest.php
index b7e0053..98511ca 100644
--- a/tests/phpunit/includes/htmlform/HTMLFormTest.php
+++ b/tests/phpunit/includes/htmlform/HTMLFormTest.php
@@ -1,6 +1,8 @@
 https://gerrit.wikimedia.org/r/400151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41cc4867b071ee9a58a43760fc4a8b301cda558e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags for RevisionStoreDbTest

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags for RevisionStoreDbTest
..

Add @covers tags for RevisionStoreDbTest

Change-Id: Ie7ce23d5ad67816c1ae8c2c838f8263fca17b4f8
---
M tests/phpunit/includes/Storage/RevisionStoreDbTest.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/tests/phpunit/includes/Storage/RevisionStoreDbTest.php 
b/tests/phpunit/includes/Storage/RevisionStoreDbTest.php
index 695a6b3..ee8fdc7 100644
--- a/tests/phpunit/includes/Storage/RevisionStoreDbTest.php
+++ b/tests/phpunit/includes/Storage/RevisionStoreDbTest.php
@@ -340,6 +340,9 @@
$this->assertSame( 0, $result );
}
 
+   /**
+* @covers \MediaWiki\Storage\RevisionStore::getRecentChange
+*/
public function testGetRecentChange() {
$page = WikiPage::factory( Title::newFromText( 'UTPage' ) );
$content = new WikitextContent( __METHOD__ );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7ce23d5ad67816c1ae8c2c838f8263fca17b4f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags to filerepo tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to filerepo tests
..

Add @covers tags to filerepo tests

Change-Id: I696e03f9ab3934b6cd04e88e1d611060846d32a4
---
M tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
M tests/phpunit/includes/filerepo/RepoGroupTest.php
M tests/phpunit/includes/filerepo/file/FileTest.php
3 files changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/50/400150/1

diff --git a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php 
b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
index 800c2fc..205df9c 100644
--- a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
+++ b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
@@ -1,5 +1,8 @@
 setMwGlobals( 'wgMaxAnimatedGifArea', 9000 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I696e03f9ab3934b6cd04e88e1d611060846d32a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags to includes/debug tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to includes/debug tests
..

Add @covers tags to includes/debug tests

Change-Id: Ida6562c87204f1680239d0bdbfde4d6fdc9bf748
---
M tests/phpunit/includes/debug/logger/monolog/AvroFormatterTest.php
M tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
2 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/48/400148/1

diff --git a/tests/phpunit/includes/debug/logger/monolog/AvroFormatterTest.php 
b/tests/phpunit/includes/debug/logger/monolog/AvroFormatterTest.php
index 938397a..915a186 100644
--- a/tests/phpunit/includes/debug/logger/monolog/AvroFormatterTest.php
+++ b/tests/phpunit/includes/debug/logger/monolog/AvroFormatterTest.php
@@ -23,6 +23,9 @@
 use MediaWikiTestCase;
 use PHPUnit_Framework_Error_Notice;
 
+/**
+ * @covers \MediaWiki\Logger\Monolog\AvroFormatter
+ */
 class AvroFormatterTest extends MediaWikiTestCase {
 
protected function setUp() {
diff --git a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php 
b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
index 88cd2dd..a69b0bf 100644
--- a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
+++ b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
@@ -24,6 +24,9 @@
 use Monolog\Logger;
 use Wikimedia\TestingAccessWrapper;
 
+/**
+ * @covers \MediaWiki\Logger\Monolog\KafkaHandler
+ */
 class KafkaHandlerTest extends MediaWikiTestCase {
 
protected function setUp() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida6562c87204f1680239d0bdbfde4d6fdc9bf748
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/vagrant[stretch-migration]: mysql: Fix service notification in mysql::large_prefix

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: mysql: Fix service notification in mysql::large_prefix
..


mysql: Fix service notification in mysql::large_prefix

Follow up to 433ad81 where this was missed.

Change-Id: I822ddee98b008cc0c71ad1da97720c85c8556e5b
---
M puppet/modules/mysql/manifests/large_prefix.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/puppet/modules/mysql/manifests/large_prefix.pp 
b/puppet/modules/mysql/manifests/large_prefix.pp
index 568d47b..9f230fd 100644
--- a/puppet/modules/mysql/manifests/large_prefix.pp
+++ b/puppet/modules/mysql/manifests/large_prefix.pp
@@ -12,6 +12,6 @@
 mode=> '0444',
 source  => 'puppet:///modules/mysql/innodb_large_prefix.cnf',
 require => Package['mariadb-server'],
-notify  => Service['mysql'],
+notify  => Service['mariadb'],
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I822ddee98b008cc0c71ad1da97720c85c8556e5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mysql: break Mysql::User['vagrant'] dependency cycle

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: mysql: break Mysql::User['vagrant'] dependency cycle
..


mysql: break Mysql::User['vagrant'] dependency cycle

Exclude Mysql::User['vagrant'] from contract that Mysql::Db resources
must be created before Mysql::User resources. Because
Mysql::User['vagrant'] is included in Class['mysql'] it would otherwise
create a dependency cycle with any lass which requires Class['mysql']
(directly or indirectly) and also uses Mysql::Db.

Bug: T181918
Change-Id: Id054e18e97658bd08987e44e10c61157b09ab9a8
---
M puppet/modules/mysql/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/puppet/modules/mysql/manifests/init.pp 
b/puppet/modules/mysql/manifests/init.pp
index f7b85da..7c1b249 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -50,5 +50,7 @@
 
 # Create databases before creating users. User resources sometime
 # depend on databases for GRANTs, but the reverse is never true.
-Mysql::Db <| |> -> Mysql::User <| |>
+# NOTE: Mysql::User['vagrant'] is excluded as it would create a dependency
+# cycle in classes which require this class.
+Mysql::Db <| |> -> Mysql::User <| title != 'vagrant' |>
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id054e18e97658bd08987e44e10c61157b09ab9a8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mysql: Provide default charset for MediaWiki tables

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: mysql: Provide default charset for MediaWiki tables
..


mysql: Provide default charset for MediaWiki tables

Provide a default charset of 'binary' for auxiliary tables provisioned
for:
* centralauth
* contenttranslation
* externalstore
* globalblocking

The global default charset for the Stretch MariaDB install is utf8mb4
which causes issues for indexing when ROW_FORMAT=DYNAMIC is not provided
in the CREATE TABLE declaration. Globally setting ROW_FORMAT=DYNAMIC is
not possible in MariaDB <10.2.2.

Bug: T183679
Change-Id: Icbf3d397af465c1b09a43963dbe28af0f269b53f
---
M puppet/modules/contenttranslation/manifests/init.pp
M puppet/modules/role/manifests/centralauth.pp
M puppet/modules/role/manifests/externalstore.pp
M puppet/modules/role/manifests/globalblocking.pp
4 files changed, 12 insertions(+), 5 deletions(-)

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



diff --git a/puppet/modules/contenttranslation/manifests/init.pp 
b/puppet/modules/contenttranslation/manifests/init.pp
index 538a530..31ac17e 100644
--- a/puppet/modules/contenttranslation/manifests/init.pp
+++ b/puppet/modules/contenttranslation/manifests/init.pp
@@ -108,7 +108,8 @@
 }
 
 mysql::db { $database:
-ensure => present,
+ensure  => present,
+options => 'DEFAULT CHARACTER SET binary',
 }
 
 mysql::sql { "${database_user}_full_priv_${database}":
diff --git a/puppet/modules/role/manifests/centralauth.pp 
b/puppet/modules/role/manifests/centralauth.pp
index 4b2382b..bc59317 100644
--- a/puppet/modules/role/manifests/centralauth.pp
+++ b/puppet/modules/role/manifests/centralauth.pp
@@ -67,12 +67,16 @@
 }
 
 mysql::db { $shared_db:
-ensure => present,
+ensure  => present,
+options => 'DEFAULT CHARACTER SET binary',
 }
 
 mysql::sql { "GRANT ALL PRIVILEGES ON ${shared_db}.* TO 
${db_user}@${db_host}":
 unless  => "SELECT 1 FROM INFORMATION_SCHEMA.SCHEMA_PRIVILEGES WHERE 
TABLE_SCHEMA = '${shared_db}' AND GRANTEE = \"'${db_user}'@'${db_host}'\" LIMIT 
1",
-require => Mysql::User[$db_user],
+require => [
+  Mysql::Db[$shared_db],
+  Mysql::User[$db_user],
+],
 }
 
 mysql::sql { 'Create CentralAuth tables':
diff --git a/puppet/modules/role/manifests/externalstore.pp 
b/puppet/modules/role/manifests/externalstore.pp
index c37168f..c31e23e 100644
--- a/puppet/modules/role/manifests/externalstore.pp
+++ b/puppet/modules/role/manifests/externalstore.pp
@@ -15,7 +15,8 @@
 include ::mediawiki
 
 mysql::db { 'external store db':
-dbname => 'external',
+dbname  => 'external',
+options => 'DEFAULT CHARACTER SET binary',
 }
 
 mysql::sql { "GRANT ALL PRIVILEGES ON ${db_name}.* TO 
${db_user}@${grant_db_host}":
diff --git a/puppet/modules/role/manifests/globalblocking.pp 
b/puppet/modules/role/manifests/globalblocking.pp
index d18c97d..73f3d08 100644
--- a/puppet/modules/role/manifests/globalblocking.pp
+++ b/puppet/modules/role/manifests/globalblocking.pp
@@ -25,7 +25,8 @@
 require ::role::mediawiki
 
 mysql::db { $db_name:
-ensure => present,
+ensure  => present,
+options => 'DEFAULT CHARACTER SET binary',
 }
 
 mysql::sql { "GRANT ALL PRIVILEGES ON ${db_name}.* TO 
${db_user}@${db_host}":

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbf3d397af465c1b09a43963dbe28af0f269b53f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mysql: Provide default charset for MediaWiki tables

2017-12-24 Thread BryanDavis (Code Review)

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

Change subject: mysql: Provide default charset for MediaWiki tables
..

mysql: Provide default charset for MediaWiki tables

Provide a default charset of 'binary' for auxiliary tables provisioned
for:
* centralauth
* contenttranslation
* externalstore
* globalblocking

The global default charset for the Stretch MariaDB install is utf8mb4
which causes issues for indexing when ROW_FORMAT=DYNAMIC is not provided
in the CREATE TABLE declaration. Globally setting ROW_FORMAT=DYNAMIC is
not possible in MariaDB <10.2.2.

Bug: T183679
Change-Id: Icbf3d397af465c1b09a43963dbe28af0f269b53f
---
M puppet/modules/contenttranslation/manifests/init.pp
M puppet/modules/role/manifests/centralauth.pp
M puppet/modules/role/manifests/externalstore.pp
M puppet/modules/role/manifests/globalblocking.pp
4 files changed, 12 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/45/400145/1

diff --git a/puppet/modules/contenttranslation/manifests/init.pp 
b/puppet/modules/contenttranslation/manifests/init.pp
index 538a530..31ac17e 100644
--- a/puppet/modules/contenttranslation/manifests/init.pp
+++ b/puppet/modules/contenttranslation/manifests/init.pp
@@ -108,7 +108,8 @@
 }
 
 mysql::db { $database:
-ensure => present,
+ensure  => present,
+options => 'DEFAULT CHARACTER SET binary',
 }
 
 mysql::sql { "${database_user}_full_priv_${database}":
diff --git a/puppet/modules/role/manifests/centralauth.pp 
b/puppet/modules/role/manifests/centralauth.pp
index 4b2382b..bc59317 100644
--- a/puppet/modules/role/manifests/centralauth.pp
+++ b/puppet/modules/role/manifests/centralauth.pp
@@ -67,12 +67,16 @@
 }
 
 mysql::db { $shared_db:
-ensure => present,
+ensure  => present,
+options => 'DEFAULT CHARACTER SET binary',
 }
 
 mysql::sql { "GRANT ALL PRIVILEGES ON ${shared_db}.* TO 
${db_user}@${db_host}":
 unless  => "SELECT 1 FROM INFORMATION_SCHEMA.SCHEMA_PRIVILEGES WHERE 
TABLE_SCHEMA = '${shared_db}' AND GRANTEE = \"'${db_user}'@'${db_host}'\" LIMIT 
1",
-require => Mysql::User[$db_user],
+require => [
+  Mysql::Db[$shared_db],
+  Mysql::User[$db_user],
+],
 }
 
 mysql::sql { 'Create CentralAuth tables':
diff --git a/puppet/modules/role/manifests/externalstore.pp 
b/puppet/modules/role/manifests/externalstore.pp
index c37168f..c31e23e 100644
--- a/puppet/modules/role/manifests/externalstore.pp
+++ b/puppet/modules/role/manifests/externalstore.pp
@@ -15,7 +15,8 @@
 include ::mediawiki
 
 mysql::db { 'external store db':
-dbname => 'external',
+dbname  => 'external',
+options => 'DEFAULT CHARACTER SET binary',
 }
 
 mysql::sql { "GRANT ALL PRIVILEGES ON ${db_name}.* TO 
${db_user}@${grant_db_host}":
diff --git a/puppet/modules/role/manifests/globalblocking.pp 
b/puppet/modules/role/manifests/globalblocking.pp
index d18c97d..73f3d08 100644
--- a/puppet/modules/role/manifests/globalblocking.pp
+++ b/puppet/modules/role/manifests/globalblocking.pp
@@ -25,7 +25,8 @@
 require ::role::mediawiki
 
 mysql::db { $db_name:
-ensure => present,
+ensure  => present,
+options => 'DEFAULT CHARACTER SET binary',
 }
 
 mysql::sql { "GRANT ALL PRIVILEGES ON ${db_name}.* TO 
${db_user}@${db_host}":

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mysql: Fix service notification in mysql::large_prefix

2017-12-24 Thread BryanDavis (Code Review)

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

Change subject: mysql: Fix service notification in mysql::large_prefix
..

mysql: Fix service notification in mysql::large_prefix

Follow up to 433ad81 where this was missed.

Change-Id: I822ddee98b008cc0c71ad1da97720c85c8556e5b
---
M puppet/modules/mysql/manifests/large_prefix.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/46/400146/1

diff --git a/puppet/modules/mysql/manifests/large_prefix.pp 
b/puppet/modules/mysql/manifests/large_prefix.pp
index 568d47b..9f230fd 100644
--- a/puppet/modules/mysql/manifests/large_prefix.pp
+++ b/puppet/modules/mysql/manifests/large_prefix.pp
@@ -12,6 +12,6 @@
 mode=> '0444',
 source  => 'puppet:///modules/mysql/innodb_large_prefix.cnf',
 require => Package['mariadb-server'],
-notify  => Service['mysql'],
+notify  => Service['mariadb'],
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Cognate[master]: Remove invalid @covers tag

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Remove invalid @covers tag
..

Remove invalid @covers tag

PHPUnit does not support using @covers on an entire file.

Bug: T183604
Change-Id: I597d8fe90f56cb256b29ac1f9c68960779d437fc
---
M tests/phpunit/ServiceWiringTest.php
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cognate 
refs/changes/44/400144/1

diff --git a/tests/phpunit/ServiceWiringTest.php 
b/tests/phpunit/ServiceWiringTest.php
index 6f6fe33..a9a261d 100644
--- a/tests/phpunit/ServiceWiringTest.php
+++ b/tests/phpunit/ServiceWiringTest.php
@@ -10,8 +10,6 @@
 use Wikimedia\Rdbms\ConnectionManager;
 
 /**
- * @covers ServiceWiring.php
- *
  * @license GNU GPL v2+
  * @author Addshore
  */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I597d8fe90f56cb256b29ac1f9c68960779d437fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cognate
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...ORES[master]: Remove invalid @covers tag

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Remove invalid @covers tag
..

Remove invalid @covers tag

PHPUnit does not support using @covers on an entire file.

Bug: T183604
Change-Id: I597d8fe90f56cb256b29ac1f9c68960779d437fc
---
M tests/phpunit/includes/ServiceWiringTest.php
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/tests/phpunit/includes/ServiceWiringTest.php 
b/tests/phpunit/includes/ServiceWiringTest.php
index 7f25b78..c90047f 100644
--- a/tests/phpunit/includes/ServiceWiringTest.php
+++ b/tests/phpunit/includes/ServiceWiringTest.php
@@ -7,8 +7,6 @@
 use ORES\ThresholdLookup;
 
 /**
- * @covers ORES\ServiceWiring.php
- *
  * @license GNU GPL v2+
  * @author Addshore
  * @author Amir Sarabadani

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I597d8fe90f56cb256b29ac1f9c68960779d437fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
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...WikibaseMediaInfo[master]: Remove invalid @covers tag

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Remove invalid @covers tag
..

Remove invalid @covers tag

PHPUnit does not support using @covers on an entire file.

Bug: T183604
Change-Id: I597d8fe90f56cb256b29ac1f9c68960779d437fc
---
M tests/phpunit/mediawiki/EntityTypesTest.php
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseMediaInfo 
refs/changes/42/400142/1

diff --git a/tests/phpunit/mediawiki/EntityTypesTest.php 
b/tests/phpunit/mediawiki/EntityTypesTest.php
index dcab28d..015e067 100644
--- a/tests/phpunit/mediawiki/EntityTypesTest.php
+++ b/tests/phpunit/mediawiki/EntityTypesTest.php
@@ -18,8 +18,6 @@
 use Wikibase\View\EntityTermsView;
 
 /**
- * @covers WikibaseMediaInfo.entitytypes.php
- *
  * @group WikibaseMediaInfo
  *
  * @license GPL-2.0+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I597d8fe90f56cb256b29ac1f9c68960779d437fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseMediaInfo
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/core[master]: Allow fallbacks for $wgReferrerPolicy

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Allow fallbacks for $wgReferrerPolicy
..


Allow fallbacks for $wgReferrerPolicy

For browsers that support older versions of the Referrer Policy
specification (Edge and Safari), using a value from a newer version of
the specification will result in those browsers falling back to a
default of "default".

So allow $wgReferrerPolicy to have fallbacks if the browser does not
recognize the currently set value. It will emit  tags for each
value in the array, but in reverse order, as browsers will use the last
one that they recognize.

Bug: T180921
Change-Id: Ie0f523fc6937c9ecffc8a6fc791c6b54d5a1cb06
---
M RELEASE-NOTES-1.31
M includes/DefaultSettings.php
M includes/OutputPage.php
3 files changed, 16 insertions(+), 6 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 1a1a9f7..aa8e5f4 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -19,6 +19,8 @@
   maintenance/cleanupUsersWithNoId.php.
 * $wgResourceLoaderMinifierStatementsOnOwnLine and 
$wgResourceLoaderMinifierMaxLineLength
   were removed (deprecated since 1.27).
+* (T180921) $wgReferrerPolicy now supports having fallbacks for browsers that 
are not
+  using the latest version of the Referrer Policy specification.
 
 === New features in 1.31 ===
 * Wikimedia\Rdbms\IDatabase->select() and similar methods now support
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d0a02de..163e253 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -316,7 +316,7 @@
 
 /**
  * Value for the referrer policy meta tag.
- * One of the values defined in the Referrer Policy specification:
+ * One or more of the values defined in the Referrer Policy specification:
  * https://w3c.github.io/webappsec-referrer-policy/
  * ('no-referrer', 'no-referrer-when-downgrade', 'same-origin',
  * 'origin', 'strict-origin', 'origin-when-cross-origin',
@@ -324,8 +324,12 @@
  * Setting it to false prevents the meta tag from being output
  * (which results in falling back to the Referrer-Policy header,
  * or 'no-referrer-when-downgrade' if that's not set either.)
+ * Setting it to an array (supported since 1.31) will create a meta tag for
+ * each value, in the reverse of the order (meaning that the first array 
element
+ * will be the default and the others used as fallbacks for browsers which do 
not
+ * understand it).
  *
- * @var string|bool
+ * @var array|string|bool
  * @since 1.25
  */
 $wgReferrerPolicy = false;
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 92963fd..9cf94d8 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3331,10 +3331,14 @@
] );
 
if ( $config->get( 'ReferrerPolicy' ) !== false ) {
-   $tags['meta-referrer'] = Html::element( 'meta', [
-   'name' => 'referrer',
-   'content' => $config->get( 'ReferrerPolicy' )
-   ] );
+   // Per 
https://w3c.github.io/webappsec-referrer-policy/#unknown-policy-values
+   // fallbacks should come before the primary value so we 
need to reverse the array.
+   foreach ( array_reverse( (array)$config->get( 
'ReferrerPolicy' ) ) as $i => $policy ) {
+   $tags["meta-referrer-$i"] = Html::element( 
'meta', [
+   'name' => 'referrer',
+   'content' => $policy,
+   ] );
+   }
}
 
$p = "{$this->mIndexPolicy},{$this->mFollowPolicy}";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0f523fc6937c9ecffc8a6fc791c6b54d5a1cb06
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mainframe98 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix @covers in XmlTest

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Fix @covers in XmlTest
..


Fix @covers in XmlTest

Follows up 389fa13ff875.

Change-Id: I32ddf37b24a6b5162b383260233d616cb49f7ddb
---
M tests/phpunit/includes/XmlTest.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/tests/phpunit/includes/XmlTest.php 
b/tests/phpunit/includes/XmlTest.php
index d26f3ec..4a280da 100644
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -586,7 +586,7 @@
}
 
/**
-* @covers Xml::testBuildTable
+* @covers Xml::buildTable
 */
public function testBuildTable() {
$firstRow = [ 'foo', 'bar' ];
@@ -606,7 +606,7 @@
}
 
/**
-* @covers Xml::testBuildTableRow
+* @covers Xml::buildTableRow
 */
public function testBuildTableRow() {
$this->assertEquals(

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix @covers in XmlTest

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Fix @covers in XmlTest
..

Fix @covers in XmlTest

Follows up 389fa13ff875.

Change-Id: I32ddf37b24a6b5162b383260233d616cb49f7ddb
---
M tests/phpunit/includes/XmlTest.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/tests/phpunit/includes/XmlTest.php 
b/tests/phpunit/includes/XmlTest.php
index d26f3ec..4a280da 100644
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -586,7 +586,7 @@
}
 
/**
-* @covers Xml::testBuildTable
+* @covers Xml::buildTable
 */
public function testBuildTable() {
$firstRow = [ 'foo', 'bar' ];
@@ -606,7 +606,7 @@
}
 
/**
-* @covers Xml::testBuildTableRow
+* @covers Xml::buildTableRow
 */
public function testBuildTableRow() {
$this->assertEquals(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32ddf37b24a6b5162b383260233d616cb49f7ddb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: tests: Use checkPHPExtension() instead of re-implementing it

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: tests: Use checkPHPExtension() instead of re-implementing it
..

tests: Use checkPHPExtension() instead of re-implementing it

Change-Id: I7f5e8684d556befc0aefa302187c573e7a3cff62
---
M tests/phpunit/includes/collation/CollationFaTest.php
M tests/phpunit/includes/http/HttpTest.php
2 files changed, 2 insertions(+), 6 deletions(-)


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

diff --git a/tests/phpunit/includes/collation/CollationFaTest.php 
b/tests/phpunit/includes/collation/CollationFaTest.php
index 178a51c..f745541 100644
--- a/tests/phpunit/includes/collation/CollationFaTest.php
+++ b/tests/phpunit/includes/collation/CollationFaTest.php
@@ -13,9 +13,7 @@
 
public function setUp() {
parent::setUp();
-   if ( !extension_loaded( 'intl' ) ) {
-   $this->markTestSkipped( "PHP extension 'intl' is not 
loaded, skipping." );
-   }
+   $this->checkPHPExtension( 'intl' );
}
 
/**
diff --git a/tests/phpunit/includes/http/HttpTest.php 
b/tests/phpunit/includes/http/HttpTest.php
index 3790e3a..2d73bac 100644
--- a/tests/phpunit/includes/http/HttpTest.php
+++ b/tests/phpunit/includes/http/HttpTest.php
@@ -497,9 +497,7 @@
 * @dataProvider provideCurlConstants
 */
public function testCurlConstants( $value ) {
-   if ( !extension_loaded( 'curl' ) ) {
-   $this->markTestSkipped( "PHP extension 'curl' is not 
loaded, skipping." );
-   }
+   $this->checkPHPExtension( 'curl' );
 
$this->assertTrue( defined( $value ), $value . ' not defined' );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f5e8684d556befc0aefa302187c573e7a3cff62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags for Collation tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags for Collation tests
..

Add @covers tags for Collation tests

Change-Id: I8b0623a6b716acdc9d369349fd4e306dbdc91d18
---
M tests/phpunit/includes/collation/CollationFaTest.php
M tests/phpunit/includes/collation/CustomUppercaseCollationTest.php
2 files changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/tests/phpunit/includes/collation/CollationFaTest.php 
b/tests/phpunit/includes/collation/CollationFaTest.php
index 53a4f7b..178a51c 100644
--- a/tests/phpunit/includes/collation/CollationFaTest.php
+++ b/tests/phpunit/includes/collation/CollationFaTest.php
@@ -1,4 +1,8 @@
 https://gerrit.wikimedia.org/r/400139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b0623a6b716acdc9d369349fd4e306dbdc91d18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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...Newsletter[master]: Added a unit test to check that the main page exists

2017-12-24 Thread Ryan10145 (Code Review)

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

Change subject: Added a unit test to check that the main page exists
..

Added a unit test to check that the main page exists

Bug: T183632
Change-Id: If424bfd9b820fa93b71b1d6f892fa5941d6d086c
---
M tests/specials/SpecialNewsletterCreateTest.php
1 file changed, 22 insertions(+), 0 deletions(-)


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

diff --git a/tests/specials/SpecialNewsletterCreateTest.php 
b/tests/specials/SpecialNewsletterCreateTest.php
index a928437..057796c 100644
--- a/tests/specials/SpecialNewsletterCreateTest.php
+++ b/tests/specials/SpecialNewsletterCreateTest.php
@@ -19,4 +19,26 @@
$this->executeSpecialPage( '', null, null, $user->getUser() );
$this->assertTrue( true );
}
+
+   public function testCreateNewsletterMainPageExists() {
+   $input = [
+   'name' => 'Test Newsletter',
+   'description' => 'This is a test newsletter that should 
return an error for a bad main page.',
+   'mainpage' => Title::newFromText( 'BdaMianPage' 
)->getBaseText()
+   ];
+
+   // Mock submission of bad main page
+   $res = $this->newSpecialPage()->onSubmit( $input );
+
+   // The main page is nonexistent
+   $this->assertEquals(
+   $res->getMessage()->getKey(), 
'newsletter-mainpage-non-existent'
+   );
+
+   // The newsletter was not created
+   $store = NewsletterStore::getDefaultInstance();
+   $this->assertNull(
+   $store->getNewsletterFromName( 'Test Newsletter' )
+   );
+   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceConfigManager[master]: Add minus-x to composer test and fix

2017-12-24 Thread Albert221 (Code Review)

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

Change subject: Add minus-x to composer test and fix
..

Add minus-x to composer test and fix

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceConfigManager 
refs/changes/38/400138/1

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

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2483c80d51cdf1dbc5b7c5a0b26ad5ca4686
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceConfigManager
Gerrit-Branch: master
Gerrit-Owner: Albert221 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceChecklist[master]: Add minus-x to composer test and fix

2017-12-24 Thread Albert221 (Code Review)

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

Change subject: Add minus-x to composer test and fix
..

Add minus-x to composer test and fix

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceChecklist 
refs/changes/36/400136/1

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

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I333c5f8757ce5abd90556200b598ecab04c9acee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceChecklist
Gerrit-Branch: master
Gerrit-Owner: Albert221 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add tests for several methods of Xml

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Add tests for several methods of Xml
..


Add tests for several methods of Xml

Added tests for methods: monthSelector, span, buildTable, buildTableRow

Change-Id: I5ca6bb231b5ed95f57f649a92d659245a4852c85
---
M tests/phpunit/includes/XmlTest.php
1 file changed, 81 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/XmlTest.php 
b/tests/phpunit/includes/XmlTest.php
index 4d4fa7b..d26f3ec 100644
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -141,6 +141,57 @@
$this->assertEquals( '', Xml::closeElement( 'element' 
), 'closeElement() shortcut' );
}
 
+   public function provideMonthSelector() {
+   global $wgLang;
+
+   $header = '';
+   $header2 = '';
+   $monthsString = '';
+   for ( $i = 1; $i < 13; $i++ ) {
+   $monthName = $wgLang->getMonthName( $i );
+   $monthsString .= "{$monthName}";
+   if ( $i !== 12 ) {
+   $monthsString .= "\n";
+   }
+   }
+   $monthsString2 = str_replace(
+   'December',
+   'December',
+   $monthsString
+   );
+   $end = '';
+
+   $allMonths = "all\n";
+   return [
+   [ $header . $monthsString . $end, '', null, 'month' ],
+   [ $header . $monthsString2 . $end, 12, null, 'month' ],
+   [ $header2 . $monthsString . $end, '', null, 
'monthSelector' ],
+   [ $header . $allMonths . $monthsString . $end, '', 
'AllMonths', 'month' ],
+
+   ];
+   }
+
+   /**
+* @covers Xml::monthSelector
+* @dataProvider provideMonthSelector
+*/
+   public function testMonthSelector( $expected, $selected, $allmonths, 
$id ) {
+   $this->assertEquals(
+   $expected,
+   Xml::monthSelector( $selected, $allmonths, $id )
+   );
+   }
+
+   /**
+* @covers Xml::span
+*/
+   public function testSpan() {
+   $this->assertEquals(
+   'element',
+   Xml::span( 'element', 'foo', [ 'id' => 'testSpan' ] )
+   );
+   }
+
/**
 * @covers Xml::dateMenu
 */
@@ -533,4 +584,34 @@
'Entire element with legend and attributes'
);
}
+
+   /**
+* @covers Xml::testBuildTable
+*/
+   public function testBuildTable() {
+   $firstRow = [ 'foo', 'bar' ];
+   $secondRow = [ 'Berlin', 'Tehran' ];
+   $headers = [ 'header1', 'header2' ];
+   $expected = 'header1' .
+   
'header2foobarBerlin' .
+   'Tehran';
+   $this->assertEquals(
+   $expected,
+   Xml::buildTable(
+   [ $firstRow, $secondRow ],
+   [ 'id' => 'testTable' ],
+   $headers
+   )
+   );
+   }
+
+   /**
+* @covers Xml::testBuildTableRow
+*/
+   public function testBuildTableRow() {
+   $this->assertEquals(
+   'foobar',
+   Xml::buildTableRow( [ 'id' => 'testRow' ], [ 'foo', 
'bar' ] )
+   );
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ca6bb231b5ed95f57f649a92d659245a4852c85
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Ladsgroup 
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/core[master]: Integration tests for ApiQueryRecentChanges

2017-12-24 Thread Ladsgroup (Code Review)

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

Change subject: Integration tests for ApiQueryRecentChanges
..

Integration tests for ApiQueryRecentChanges

It looks big but it's mostly copy from ApiQueryWatchlistIntegrationTest

Change-Id: I96ccd3e2813e77f47a4432ca434c1c6a212d90ea
---
A tests/phpunit/includes/api/ApiQueryRecentChangesIntegrationTest.php
1 file changed, 1,149 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/35/400135/1

diff --git 
a/tests/phpunit/includes/api/ApiQueryRecentChangesIntegrationTest.php 
b/tests/phpunit/includes/api/ApiQueryRecentChangesIntegrationTest.php
new file mode 100644
index 000..2c8a482
--- /dev/null
+++ b/tests/phpunit/includes/api/ApiQueryRecentChangesIntegrationTest.php
@@ -0,0 +1,1149 @@
+tablesUsed = array_unique(
+   array_merge( $this->tablesUsed, [ 'recentchanges', 
'page' ] )
+   );
+   }
+
+   protected function setUp() {
+   parent::setUp();
+   self::$users['ApiQueryRecentChangesIntegrationTestUser'] = 
$this->getMutableTestUser();
+   $this->doLogin( 'ApiQueryRecentChangesIntegrationTestUser' );
+   }
+
+   private function getLoggedInTestUser() {
+   return 
self::$users['ApiQueryRecentChangesIntegrationTestUser']->getUser();
+   }
+
+   private function doPageEdit( User $user, LinkTarget $target, $content, 
$summary ) {
+   $title = Title::newFromLinkTarget( $target );
+   $page = WikiPage::factory( $title );
+   $page->doEditContent(
+   ContentHandler::makeContent( $content, $title ),
+   $summary,
+   0,
+   false,
+   $user
+   );
+   }
+
+   private function doMinorPageEdit( User $user, LinkTarget $target, 
$content, $summary ) {
+   $title = Title::newFromLinkTarget( $target );
+   $page = WikiPage::factory( $title );
+   $page->doEditContent(
+   ContentHandler::makeContent( $content, $title ),
+   $summary,
+   EDIT_MINOR,
+   false,
+   $user
+   );
+   }
+
+   private function doBotPageEdit( User $user, LinkTarget $target, 
$content, $summary ) {
+   $title = Title::newFromLinkTarget( $target );
+   $page = WikiPage::factory( $title );
+   $page->doEditContent(
+   ContentHandler::makeContent( $content, $title ),
+   $summary,
+   EDIT_FORCE_BOT,
+   false,
+   $user
+   );
+   }
+
+   private function doAnonPageEdit( LinkTarget $target, $content, $summary 
) {
+   $title = Title::newFromLinkTarget( $target );
+   $page = WikiPage::factory( $title );
+   $page->doEditContent(
+   ContentHandler::makeContent( $content, $title ),
+   $summary,
+   0,
+   false,
+   User::newFromId( 0 )
+   );
+   }
+
+   private function doPatrolledPageEdit(
+   User $user,
+   LinkTarget $target,
+   $content,
+   $summary,
+   User $patrollingUser
+   ) {
+   $title = Title::newFromLinkTarget( $target );
+   $page = WikiPage::factory( $title );
+   $status = $page->doEditContent(
+   ContentHandler::makeContent( $content, $title ),
+   $summary,
+   0,
+   false,
+   $user
+   );
+   /** @var Revision $rev */
+   $rev = $status->value['revision'];
+   $rc = $rev->getRecentChange();
+   $rc->doMarkPatrolled( $patrollingUser, false, [] );
+   }
+
+   private function deletePage( LinkTarget $target, $reason ) {
+   $title = Title::newFromLinkTarget( $target );
+   $page = WikiPage::factory( $title );
+   $page->doDeleteArticleReal( $reason );
+   }
+
+   /**
+* Performs a batch of page edits as a specified user
+* @param User $user
+* @param array $editData associative array, keys:
+*- target=> LinkTarget page to edit
+*- content   => string new content
+*- summary   => string edit summary
+*- minorEdit => bool mark as minor edit if 
true (defaults to false)
+*- botEdit   => bool mark as

[MediaWiki-commits] [Gerrit] mediawiki...TweetANew[master]: Add minus-x to composer test and fix

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Add minus-x to composer test and fix
..


Add minus-x to composer test and fix

Bug: T175794
Change-Id: I932af1081fd0a7f550646f20393f25a0c32496ca
---
M TweetANew.body.php
M composer.json
M lib/GoogleURL.php
3 files changed, 7 insertions(+), 2 deletions(-)

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I932af1081fd0a7f550646f20393f25a0c32496ca
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/TweetANew
Gerrit-Branch: master
Gerrit-Owner: Albert221 
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/core[master]: Always define wgRestrictionEdit as an empty array for pages

2017-12-24 Thread Divadsn (Code Review)

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

Change subject: Always define wgRestrictionEdit as an empty array for pages
..

Always define wgRestrictionEdit as an empty array for pages

Bug: T133289
Change-Id: I4b769058feb7e91352170ba1ba08df5c2082ba24
---
M includes/OutputPage.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/34/400134/1

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 92963fd..8838ca4 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3218,6 +3218,7 @@
'wgRelevantPageName' => 
$relevantTitle->getPrefixedDBkey(),
'wgRelevantArticleId' => $relevantTitle->getArticleID(),
'wgRequestId' => WebRequest::getRequestId(),
+   'wgRestrictionEdit' => [],
];
 
if ( $user->isLoggedIn() ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...TweetANew[master]: Add minus-x to composer test and fix

2017-12-24 Thread Albert221 (Code Review)

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

Change subject: Add minus-x to composer test and fix
..

Add minus-x to composer test and fix

Bug: T175794
Change-Id: I932af1081fd0a7f550646f20393f25a0c32496ca
---
A .minus-x.json
M composer.json
2 files changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TweetANew 
refs/changes/33/400133/1

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

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I932af1081fd0a7f550646f20393f25a0c32496ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TweetANew
Gerrit-Branch: master
Gerrit-Owner: Albert221 

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

[MediaWiki-commits] [Gerrit] labs/codesearch[master]: Add favicon

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add favicon
..


Add favicon

MediaWiki logo + Git logo = MediaWiki code search logo?!

Bug: T183445
Change-Id: Ic702f9dcadd57bd41334d24f1ff13b2fffecf39d
---
M README
M app.py
A static/favicon.ico
3 files changed, 15 insertions(+), 1 deletion(-)

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



diff --git a/README b/README
index 381976d..2f7bf28 100644
--- a/README
+++ b/README
@@ -29,3 +29,7 @@
 
 codesearch is (C) 2017, Kunal Mehta under the terms of the GPL, v3 or any
 later version. See COPYING for details.
+
+The favicon is a combination of the MediaWiki logo (Public domain) by Anthere,
+and the Git logo (CC-BY 3.0) by Jason Long.
+See  for details.
diff --git a/app.py b/app.py
index 542f238..9a32637 100644
--- a/app.py
+++ b/app.py
@@ -17,8 +17,9 @@
 along with this program.  If not, see .
 """
 
-from flask import Flask, Response, request, redirect, url_for
+from flask import Flask, Response, request, redirect, url_for, 
send_from_directory
 
+import os
 import requests
 import traceback
 
@@ -33,6 +34,15 @@
 }
 
 
+@app.route('/favicon.ico')
+def favicon():
+# http://flask.pocoo.org/docs/0.12/patterns/favicon/
+return send_from_directory(
+os.path.join(app.root_path, 'static'),
+'favicon.ico',
+mimetype='image/vnd.microsoft.icon')
+
+
 def index_url(target, text, current):
 if target == current:
 return '%s' % text
diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 000..90c20db
--- /dev/null
+++ b/static/favicon.ico
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic702f9dcadd57bd41334d24f1ff13b2fffecf39d
Gerrit-PatchSet: 1
Gerrit-Project: labs/codesearch
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] labs/codesearch[master]: Add favicon

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add favicon
..

Add favicon

MediaWiki logo + Git logo = MediaWiki code search logo?!

Bug: T183445
Change-Id: Ic702f9dcadd57bd41334d24f1ff13b2fffecf39d
---
M README
M app.py
A static/favicon.ico
3 files changed, 15 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/codesearch 
refs/changes/32/400132/1

diff --git a/README b/README
index 381976d..2f7bf28 100644
--- a/README
+++ b/README
@@ -29,3 +29,7 @@
 
 codesearch is (C) 2017, Kunal Mehta under the terms of the GPL, v3 or any
 later version. See COPYING for details.
+
+The favicon is a combination of the MediaWiki logo (Public domain) by Anthere,
+and the Git logo (CC-BY 3.0) by Jason Long.
+See  for details.
diff --git a/app.py b/app.py
index 542f238..9a32637 100644
--- a/app.py
+++ b/app.py
@@ -17,8 +17,9 @@
 along with this program.  If not, see .
 """
 
-from flask import Flask, Response, request, redirect, url_for
+from flask import Flask, Response, request, redirect, url_for, 
send_from_directory
 
+import os
 import requests
 import traceback
 
@@ -33,6 +34,15 @@
 }
 
 
+@app.route('/favicon.ico')
+def favicon():
+# http://flask.pocoo.org/docs/0.12/patterns/favicon/
+return send_from_directory(
+os.path.join(app.root_path, 'static'),
+'favicon.ico',
+mimetype='image/vnd.microsoft.icon')
+
+
 def index_url(target, text, current):
 if target == current:
 return '%s' % text
diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 000..90c20db
--- /dev/null
+++ b/static/favicon.ico
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic702f9dcadd57bd41334d24f1ff13b2fffecf39d
Gerrit-PatchSet: 1
Gerrit-Project: labs/codesearch
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/core[master]: Add tests for several methods of Xml

2017-12-24 Thread Ladsgroup (Code Review)

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

Change subject: Add tests for several methods of Xml
..

Add tests for several methods of Xml

Added tests for methods: monthSelector, span, buildTable, buildTableRow

Change-Id: I5ca6bb231b5ed95f57f649a92d659245a4852c85
---
M tests/phpunit/includes/XmlTest.php
1 file changed, 75 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/31/400131/1

diff --git a/tests/phpunit/includes/XmlTest.php 
b/tests/phpunit/includes/XmlTest.php
index 4d4fa7b..67cabcc 100644
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -141,6 +141,57 @@
$this->assertEquals( '', Xml::closeElement( 'element' 
), 'closeElement() shortcut' );
}
 
+   public function provideMonthSelector() {
+   global $wgLang;
+
+   $header = '';
+   $header2 = '';
+   $monthsString = '';
+   for ( $i = 1; $i < 13; $i++ ) {
+   $monthName = $wgLang->getMonthName( $i );
+   $monthsString .= "{$monthName}";
+   if ( $i !== 12 ) {
+   $monthsString .= "\n";
+   }
+   }
+   $monthsString2 = str_replace(
+   'December',
+   'December',
+   $monthsString
+   );
+   $end = '';
+
+   $allMonths = "all\n";
+   return [
+   [ $header . $monthsString . $end, '', null, 'month' ],
+   [ $header . $monthsString2 . $end, 12, null, 'month' ],
+   [ $header2 . $monthsString . $end, '', null, 
'monthSelector' ],
+   [ $header . $allMonths . $monthsString . $end, '', 
'AllMonths', 'month' ],
+
+   ];
+   }
+
+   /**
+* @covers Xml::monthSelector
+* @dataProvider provideMonthSelector
+*/
+   public function testMonthSelector( $expected, $selected, $allmonths, 
$id ) {
+   $this->assertEquals(
+   $expected,
+   Xml::monthSelector( $selected, $allmonths, $id )
+   );
+   }
+
+   /**
+* @covers Xml::span
+*/
+   public function testSpan() {
+   $this->assertEquals(
+   'element',
+   Xml::span( 'element', 'foo', [ 'id' => 'testSpan' ] )
+   );
+   }
+
/**
 * @covers Xml::dateMenu
 */
@@ -533,4 +584,28 @@
'Entire element with legend and attributes'
);
}
+
+   public function testBuildTable() {
+   $firstRow = [ 'foo', 'bar' ];
+   $secondRow = [ 'Berlin', 'Tehran' ];
+   $headers = [ 'header1', 'header2' ];
+   $expected = 'header1' .
+   
'header2foobarBerlin' .
+   'Tehran';
+   $this->assertEquals(
+   $expected,
+   Xml::buildTable(
+   [ $firstRow, $secondRow ],
+   [ 'id' => 'testTable' ],
+   $headers
+   )
+   );
+   }
+
+   public function testBuildTableRow() {
+   $this->assertEquals(
+   'foobar',
+   Xml::buildTableRow( [ 'id' => 'testRow' ], [ 'foo', 
'bar' ] )
+   );
+   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceGroupManager[master]: Add minus-x to composer test and fix

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add minus-x to composer test and fix
..


Add minus-x to composer test and fix

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia165046562b15499770dbae2bd839836a7a9f5ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceGroupManager
Gerrit-Branch: master
Gerrit-Owner: Phantom42 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtendedStatistics[master]: Add minus-x to composer test and fix

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add minus-x to composer test and fix
..


Add minus-x to composer test and fix

Bug: T175794
Change-Id: I3789453a529dd6926970d83c45799fb9a4376226
---
M composer.json
M i18n/av.json
M i18n/awa.json
M i18n/azb.json
M i18n/ba.json
M i18n/bcc.json
M i18n/bgn.json
M i18n/bn.json
M i18n/br.json
M i18n/ca.json
M i18n/ce.json
M i18n/cs.json
M i18n/cv.json
M i18n/de-formal.json
M i18n/dty.json
M i18n/el.json
M i18n/eu.json
M i18n/fy.json
M i18n/gu.json
M i18n/he.json
M i18n/hu.json
M i18n/ja.json
M i18n/ko.json
M i18n/ksh.json
M i18n/ku-latn.json
M i18n/lki.json
M i18n/lt.json
M i18n/mai.json
M i18n/mk.json
M i18n/my.json
M i18n/ne.json
M i18n/nl.json
M i18n/oc.json
M i18n/os.json
M i18n/ps.json
M i18n/ru.json
M i18n/shy-latn.json
M i18n/sl.json
M i18n/sq.json
M i18n/sr-ec.json
M i18n/sr-el.json
M i18n/sv.json
M i18n/szl.json
M i18n/ta.json
M i18n/tcy.json
M i18n/te.json
M i18n/tr.json
M i18n/vi.json
M i18n/yi.json
M i18n/zh-hant.json
M includes/api/BSApiStatisticsAvailableDiagramsStore.php
M includes/api/BSApiStatisticsSearchOptionsStore.php
M resources/bluespice.statistics.css
M resources/bluespice.statistics.js
M resources/images/bs-searchstatistics.png
55 files changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/composer.json b/composer.json
index 24c0aa4..ef25197 100644
--- a/composer.json
+++ b/composer.json
@@ -14,11 +14,16 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }
diff --git a/i18n/av.json b/i18n/av.json
old mode 100755
new mode 100644
diff --git a/i18n/awa.json b/i18n/awa.json
old mode 100755
new mode 100644
diff --git a/i18n/azb.json b/i18n/azb.json
old mode 100755
new mode 100644
diff --git a/i18n/ba.json b/i18n/ba.json
old mode 100755
new mode 100644
diff --git a/i18n/bcc.json b/i18n/bcc.json
old mode 100755
new mode 100644
diff --git a/i18n/bgn.json b/i18n/bgn.json
old mode 100755
new mode 100644
diff --git a/i18n/bn.json b/i18n/bn.json
old mode 100755
new mode 100644
diff --git a/i18n/br.json b/i18n/br.json
old mode 100755
new mode 100644
diff --git a/i18n/ca.json b/i18n/ca.json
old mode 100755
new mode 100644
diff --git a/i18n/ce.json b/i18n/ce.json
old mode 100755
new mode 100644
diff --git a/i18n/cs.json b/i18n/cs.json
old mode 100755
new mode 100644
diff --git a/i18n/cv.json b/i18n/cv.json
old mode 100755
new mode 100644
diff --git a/i18n/de-formal.json b/i18n/de-formal.json
old mode 100755
new mode 100644
diff --git a/i18n/dty.json b/i18n/dty.json
old mode 100755
new mode 100644
diff --git a/i18n/el.json b/i18n/el.json
old mode 100755
new mode 100644
diff --git a/i18n/eu.json b/i18n/eu.json
old mode 100755
new mode 100644
diff --git a/i18n/fy.json b/i18n/fy.json
old mode 100755
new mode 100644
diff --git a/i18n/gu.json b/i18n/gu.json
old mode 100755
new mode 100644
diff --git a/i18n/he.json b/i18n/he.json
old mode 100755
new mode 100644
diff --git a/i18n/hu.json b/i18n/hu.json
old mode 100755
new mode 100644
diff --git a/i18n/ja.json b/i18n/ja.json
old mode 100755
new mode 100644
diff --git a/i18n/ko.json b/i18n/ko.json
old mode 100755
new mode 100644
diff --git a/i18n/ksh.json b/i18n/ksh.json
old mode 100755
new mode 100644
diff --git a/i18n/ku-latn.json b/i18n/ku-latn.json
old mode 100755
new mode 100644
diff --git a/i18n/lki.json b/i18n/lki.json
old mode 100755
new mode 100644
diff --git a/i18n/lt.json b/i18n/lt.json
old mode 100755
new mode 100644
diff --git a/i18n/mai.json b/i18n/mai.json
old mode 100755
new mode 100644
diff --git a/i18n/mk.json b/i18n/mk.json
old mode 100755
new mode 100644
diff --git a/i18n/my.json b/i18n/my.json
old mode 100755
new mode 100644
diff --git a/i18n/ne.json b/i18n/ne.json
old mode 100755
new mode 100644
diff --git a/i18n/nl.json b/i18n/nl.json
old mode 100755
new mode 100644
diff --git a/i18n/oc.json b/i18n/oc.json
old mode 100755
new mode 100644
diff --git a/i18n/os.json b/i18n/os.json
old mode 100755
new mode 100644
diff --git a/i18n/ps.json b/i18n/ps.json
old mode 100755
new mode 100644
diff --git a/i18n/ru.json b/i18n/ru.json
old mode 100755
new mode 100644
diff --git a/i18n/shy-latn.json b/i18n/shy-latn.json
old mode 100755
new mode 100644
diff --git

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add tests for TextboxBuilder

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add tests for TextboxBuilder
..

Add tests for TextboxBuilder

Change-Id: I305e0bce902fb027bf02cc8a28e8846808f6437c
---
A tests/phpunit/includes/editpage/TextboxBuilderTest.php
1 file changed, 89 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/30/400130/1

diff --git a/tests/phpunit/includes/editpage/TextboxBuilderTest.php 
b/tests/phpunit/includes/editpage/TextboxBuilderTest.php
new file mode 100644
index 000..668badd
--- /dev/null
+++ b/tests/phpunit/includes/editpage/TextboxBuilderTest.php
@@ -0,0 +1,89 @@
+
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+namespace MediaWiki\Tests\EditPage;
+
+use Language;
+use MediaWiki\EditPage\TextboxBuilder;
+use MediaWikiTestCase;
+use Title;
+use User;
+
+/**
+ * @covers \MediaWiki\EditPage\TextboxBuilder
+ */
+class TextboxBuilderTest extends MediaWikiTestCase {
+
+   public function provideAddNewLineAtEnd() {
+   return [
+   [ '', '' ],
+   [ 'foo', "foo\n" ],
+   ];
+   }
+
+   /**
+* @dataProvider provideAddNewLineAtEnd
+*/
+   public function testAddNewLineAtEnd( $input, $expected ) {
+   $builder = new TextboxBuilder();
+   $this->assertSame( $expected, $builder->addNewLineAtEnd( $input 
) );
+   }
+
+   public function testBuildTextboxAttribs() {
+   $user = new User();
+   $user->setOption( 'editfont', 'monospace' );
+
+   $title = $this->getMockBuilder( Title::class )
+   ->disableOriginalConstructor()
+   ->getMock();
+   $title->expects( $this->any() )
+   ->method( 'getPageLanguage' )
+   ->will( $this->returnValue( Language::factory( 'en' ) ) 
);
+
+   $builder = new TextboxBuilder();
+   $attribs = $builder->buildTextboxAttribs(
+   'mw-textbox1',
+   [ 'class' => 'foo bar', 'data-foo' => '123', 'rows' => 
30 ],
+   $user,
+   $title
+   );
+
+   $this->assertInternalType( 'array', $attribs );
+   // custom attrib showed up
+   $this->assertArrayHasKey( 'data-foo', $attribs );
+   // classes merged properly (string)
+   $this->assertSame( 'foo bar mw-editfont-monospace', 
$attribs['class'] );
+   // overrides in custom attrib worked
+   $this->assertSame( 30, $attribs['rows'] );
+   $this->assertSame( 'en', $attribs['lang'] );
+
+   $attribs2 = $builder->buildTextboxAttribs(
+   'mw-textbox2', [ 'class' => [ 'foo', 'bar' ] ], $user, 
$title
+   );
+   // classes merged properly (array)
+   $this->assertSame( [ 'foo', 'bar', 'mw-editfont-monospace' ], 
$attribs2['class'] );
+
+   $attribs3 = $builder->buildTextboxAttribs(
+   'mw-textbox3', [], $user, $title
+   );
+   // classes ok when nothing to be merged
+   $this->assertSame( 'mw-editfont-monospace', $attribs3['class'] 
);
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I305e0bce902fb027bf02cc8a28e8846808f6437c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: Add @covers tags to ContentHandler tests

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to ContentHandler tests
..

Add @covers tags to ContentHandler tests

Change-Id: I4d0994e91f63a0921343f34ef81a82463b4ab969
---
M tests/phpunit/includes/content/ContentHandlerTest.php
M tests/phpunit/includes/content/FileContentHandlerTest.php
M tests/phpunit/includes/content/WikitextStructureTest.php
3 files changed, 18 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/29/400129/1

diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php 
b/tests/phpunit/includes/content/ContentHandlerTest.php
index 1bd2eb0..1462c36 100644
--- a/tests/phpunit/includes/content/ContentHandlerTest.php
+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
@@ -332,7 +332,9 @@
}
}
 
-   /*
+   /**
+* @covers ContentHandler::getAutosummary
+*
 * Test if we become a "Created blank page" summary from getAutoSummary 
if no Content added to
 * page.
 */
@@ -374,11 +376,17 @@
}
*/
 
+   /**
+* @covers ContentHandler::supportsCategories
+*/
public function testSupportsCategories() {
$handler = new DummyContentHandlerForTesting( 
CONTENT_MODEL_WIKITEXT );
$this->assertTrue( $handler->supportsCategories(), 'content 
model supports categories' );
}
 
+   /**
+* @covers ContentHandler::supportsDirectEditing
+*/
public function testSupportsDirectEditing() {
$handler = new DummyContentHandlerForTesting( 
CONTENT_MODEL_JSON );
$this->assertFalse( $handler->supportsDirectEditing(), 'direct 
editing is not supported' );
@@ -407,6 +415,7 @@
}
 
/**
+* @covers ContentHandler::getForModelID
 * @dataProvider provideGetModelForID
 */
public function testGetModelForID( $modelId, $handlerClass ) {
@@ -415,6 +424,9 @@
$this->assertInstanceOf( $handlerClass, $handler );
}
 
+   /**
+* @covers ContentHandler::getFieldsForSearchIndex
+*/
public function testGetFieldsForSearchIndex() {
$searchEngine = $this->newSearchEngine();
 
diff --git a/tests/phpunit/includes/content/FileContentHandlerTest.php 
b/tests/phpunit/includes/content/FileContentHandlerTest.php
index 65efcc9..ad9d419 100644
--- a/tests/phpunit/includes/content/FileContentHandlerTest.php
+++ b/tests/phpunit/includes/content/FileContentHandlerTest.php
@@ -2,6 +2,8 @@
 
 /**
  * @group ContentHandler
+ *
+ * @covers FileContentHandler
  */
 class FileContentHandlerTest extends MediaWikiLangTestCase {
/**
diff --git a/tests/phpunit/includes/content/WikitextStructureTest.php 
b/tests/phpunit/includes/content/WikitextStructureTest.php
index f1b54f6..1bdbe01 100644
--- a/tests/phpunit/includes/content/WikitextStructureTest.php
+++ b/tests/phpunit/includes/content/WikitextStructureTest.php
@@ -1,5 +1,8 @@
 https://gerrit.wikimedia.org/r/400129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d0994e91f63a0921343f34ef81a82463b4ab969
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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...TweetANew[master]: Add minus-x and phpcs to composer test and fix

2017-12-24 Thread Albert221 (Code Review)

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

Change subject: Add minus-x and phpcs to composer test and fix
..

Add minus-x and phpcs to composer test and fix

Bug: T175794
Change-Id: I1a646b3b73d6cc46f60113a64595bd819226d9ad
---
A .phpcs.xml
M TweetANew.body.php
M TweetANew.php
M composer.json
M lib/GoogleURL.php
M lib/tmhOAuth.php
6 files changed, 67 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TweetANew 
refs/changes/28/400128/1

diff --git a/.phpcs.xml b/.phpcs.xml
new file mode 100644
index 000..981820a
--- /dev/null
+++ b/.phpcs.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+.
+
+
+
diff --git a/TweetANew.body.php b/TweetANew.body.php
old mode 100755
new mode 100644
index 5f1f4d0..3e00b2f
--- a/TweetANew.body.php
+++ b/TweetANew.body.php
@@ -25,7 +25,6 @@
 
# Check if $wgTweetANewTweet['New'] is enabled or the Tweet 
checkbox was selected on the edit page
if ( $wgRequest->getCheck( 'wpTweetANew' ) || 
$wgTweetANewTweet['New'] ) {
-
# Check if page is in content namespace or if the Tweet 
checkbox was selected on the edit page
if ( !MWNamespace::isContent( 
$wikiPage->getTitle()->getNamespace() )
&& !$wgRequest->getCheck( 'wpTweetANew' )
@@ -107,7 +106,6 @@
 
# Check if $wgTweetANewTweet['Edit'] is enabled or the Tweet 
checkbox was selected on the edit page
if ( $wgRequest->getCheck( 'wpTweetANewEdit' ) || 
$wgTweetANewTweet['Edit'] ) {
-
# Unless the tweet checkbox is selected, only proceeds 
if page is outside content namespace
#   and if a minor edit, checks 
$wgTweetANewTweet['SkipMinor']
# Also prevents new articles from processing as 
TweetANewNewArticle function is used instead
@@ -121,7 +119,7 @@
 
# Determine the time and date of last modification - 
exit if newer than $wgTweetANewTweet['LessMinutesOld']
# ToDo - there must be a cleaner way of doing this
-   $dbr = wfGetDB( DB_SLAVE );
+   $dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select(
'revision',
array( 'rev_timestamp' ),
@@ -227,7 +225,6 @@
 
# Check setting to enable/disable use of bitly
if ( $wgTweetANewBitly['Enable'] ) {
-
# Generate url for bitly
$shortened = 
"https://api-ssl.bitly.com/v3/shorten?longUrl=;
. urlencode( $longurl ) . "=" . 
$wgTweetANewBitly['Login']
@@ -237,7 +234,6 @@
$response = Http::get( $shortened );
} # Check setting to enable/disable use of goo.gl
elseif ( $wgTweetANewGoogl['Enable'] ) {
-
# Setup goo.gl
$url = new GoogleURL( $wgTweetANewGoogl['API'] );
 
diff --git a/TweetANew.php b/TweetANew.php
index 8f5eeed..3cacdd3 100644
--- a/TweetANew.php
+++ b/TweetANew.php
@@ -220,7 +220,6 @@
 function efTweetANewEditCheckBox( $editpage, &$checkboxes, &$tabindex = null ) 
{
global $wgTweetANewEditpage, $wgTweetANewTweet;
 
-
$options = array(
'label-message' => null,
'id' => null,
diff --git a/composer.json b/composer.json
index aebd773..3e99105 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,18 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "phpcs",
+   "minus-x check ."
+   ],
+   "fix": [
+   "phpcbf",
+   "minus-x fix ."
]
}
 }
diff --git a/lib/GoogleURL.php b/lib/GoogleURL.php
old mode 100755
new mode 100644
index 6160fab..04138a2
--- a/lib/GoogleURL.php
+++ b/lib/GoogleURL.php
@@ -14,15 +14,14 @@
 /**
  * Define google url shortener api
  */
-define("API_URL", "https://www.googleapis.com/urlshortener/v1/url?key=;);

[MediaWiki-commits] [Gerrit] oojs/ui[master]: WikimediaUI theme: Align 'transparency' icon to WikimedaUI c...

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: WikimediaUI theme: Align 'transparency' icon to WikimedaUI 
color palette
..


WikimediaUI theme: Align 'transparency' icon to WikimedaUI color palette

Change-Id: Ie714558cb5a170085acf332b94688821bb151d1b
---
M src/themes/wikimediaui/images/textures/transparency.svg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/themes/wikimediaui/images/textures/transparency.svg 
b/src/themes/wikimediaui/images/textures/transparency.svg
index 14762de..d2eac03 100644
--- a/src/themes/wikimediaui/images/textures/transparency.svg
+++ b/src/themes/wikimediaui/images/textures/transparency.svg
@@ -1,5 +1,5 @@
 
 http://www.w3.org/2000/svg; width="16" height="16" viewBox="0 0 16 
16">
-   
+   

 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie714558cb5a170085acf332b94688821bb151d1b
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add @covers tags API tests without them

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags API tests without them
..

Add @covers tags API tests without them

Change-Id: Ida0f954cb0a44719af3a3d0c6bda4587c9ca42b6
---
M tests/phpunit/includes/api/ApiOpenSearchTest.php
M tests/phpunit/includes/api/ApiPageSetTest.php
M tests/phpunit/includes/api/ApiQueryAllPagesTest.php
M tests/phpunit/includes/api/ApiUploadTest.php
M tests/phpunit/includes/api/ApiUsageExceptionTest.php
M tests/phpunit/includes/api/ApiWatchTest.php
6 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/27/400127/1

diff --git a/tests/phpunit/includes/api/ApiOpenSearchTest.php 
b/tests/phpunit/includes/api/ApiOpenSearchTest.php
index 23fa7bc..cc993d5 100644
--- a/tests/phpunit/includes/api/ApiOpenSearchTest.php
+++ b/tests/phpunit/includes/api/ApiOpenSearchTest.php
@@ -1,5 +1,8 @@
 replaceSearchEngineConfig();
diff --git a/tests/phpunit/includes/api/ApiPageSetTest.php 
b/tests/phpunit/includes/api/ApiPageSetTest.php
index 1aa0a13..3e1f98f 100644
--- a/tests/phpunit/includes/api/ApiPageSetTest.php
+++ b/tests/phpunit/includes/api/ApiPageSetTest.php
@@ -4,6 +4,8 @@
  * @group API
  * @group medium
  * @group Database
+ *
+ * @covers ApiPageSet
  */
 class ApiPageSetTest extends ApiTestCase {
public static function provideRedirectMergePolicy() {
diff --git a/tests/phpunit/includes/api/ApiQueryAllPagesTest.php 
b/tests/phpunit/includes/api/ApiQueryAllPagesTest.php
index 9f28aaf..b482c31 100644
--- a/tests/phpunit/includes/api/ApiQueryAllPagesTest.php
+++ b/tests/phpunit/includes/api/ApiQueryAllPagesTest.php
@@ -4,6 +4,8 @@
  * @group API
  * @group Database
  * @group medium
+ *
+ * @covers ApiQueryAllPages
  */
 class ApiQueryAllPagesTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiUploadTest.php 
b/tests/phpunit/includes/api/ApiUploadTest.php
index 159a0e3..6b60409 100644
--- a/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/tests/phpunit/includes/api/ApiUploadTest.php
@@ -19,6 +19,8 @@
  * @group Database
  * @group medium
  * @group Broken
+ *
+ * @covers ApiUpload
  */
 class ApiUploadTest extends ApiTestCaseUpload {
/**
diff --git a/tests/phpunit/includes/api/ApiUsageExceptionTest.php 
b/tests/phpunit/includes/api/ApiUsageExceptionTest.php
index f901cf2..bb72021 100644
--- a/tests/phpunit/includes/api/ApiUsageExceptionTest.php
+++ b/tests/phpunit/includes/api/ApiUsageExceptionTest.php
@@ -1,5 +1,8 @@
 https://gerrit.wikimedia.org/r/400127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida0f954cb0a44719af3a3d0c6bda4587c9ca42b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: [MCR] Don't require $title to be passed to Revision::newFromId

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: [MCR] Don't require $title to be passed to Revision::newFromId
..


[MCR] Don't require $title to be passed to Revision::newFromId

If the title is not passed in as a param (already known) then select
it in Revision::newFromId instead of waiting for it to be selected
further down the tree.
This means that we can use the same Title object to pass into the
RevisionRecord as well as our legacy Revision object.

The selection chooses either a slave or master depending on
recent writes.

This logic used to be in Revision::getTitle and also in
Revision::newFromConds which was called by newFromId

Bug: T183505
Change-Id: I9cf4ce2c3c86d6bf979a3c88eb423b942b9a1ba4
---
M includes/Revision.php
1 file changed, 43 insertions(+), 1 deletion(-)

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



diff --git a/includes/Revision.php b/includes/Revision.php
index ed0646a..0b58324 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -90,10 +90,52 @@
 *
 * @param int $id
 * @param int $flags (optional)
-* @param Title $title (optional)
+* @param Title $title (optional) If known you can pass the Title in 
here.
+*  Passing no Title may result in another DB query if there are recent 
writes.
 * @return Revision|null
 */
public static function newFromId( $id, $flags = 0, Title $title = null 
) {
+   /**
+* MCR RevisionStore Compat
+*
+* If the title is not passed in as a param (already known) 
then select it here.
+*
+* Do the selection with MASTER if $flags includes READ_LATEST 
or recent changes
+* have happened on our load balancer.
+*
+* If we select the title here and pass it down it will results 
in fewer queries
+* further down the stack.
+*/
+   if ( !$title ) {
+   if (
+   $flags & self::READ_LATEST ||
+   wfGetLB()->hasOrMadeRecentMasterChanges()
+   ) {
+   $dbr = wfGetDB( DB_MASTER );
+   } else {
+   $dbr = wfGetDB( DB_REPLICA );
+   }
+   $row = $dbr->selectRow(
+   [ 'revision', 'page' ],
+   [
+   'page_namespace',
+   'page_title',
+   'page_id',
+   'page_latest',
+   'page_is_redirect',
+   'page_len',
+   ],
+   [ 'rev_id' => $id ],
+   __METHOD__,
+   [],
+   [ 'page' => [ 'JOIN', 'page_id=rev_page' ] ]
+   );
+   if ( $row ) {
+   $title = Title::newFromRow( $row );
+   }
+   wfGetLB()->reuseConnection( $dbr );
+   }
+
$rec = self::getRevisionStore()->getRevisionById( $id, $flags, 
$title );
return $rec === null ? null : new Revision( $rec, $flags, 
$title );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9cf4ce2c3c86d6bf979a3c88eb423b942b9a1ba4
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Cicalese 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mwjames 
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]: [MCR] Introduce BlobStoreFactory

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: [MCR] Introduce BlobStoreFactory
..


[MCR] Introduce BlobStoreFactory

This allows Revision::getRevisionText to get
a different BlobStore instance when $wiki is passed in
restoring the behaviour for $wiki before the MCR Revision
overhaul patch was merged.
Ia4c20a91e98df0b9b14b138eb4825c55e5200384

Bug: T183634
Bug: T183631
bug: T183583
Change-Id: Ib0949454e9a003c2965adc1aab38e31fcf121afe
---
M autoload.php
M includes/MediaWikiServices.php
M includes/Revision.php
M includes/ServiceWiring.php
A includes/Storage/BlobStoreFactory.php
M includes/Storage/SqlBlobStore.php
M tests/phpunit/includes/MediaWikiServicesTest.php
M tests/phpunit/includes/RevisionTest.php
A tests/phpunit/includes/Storage/BlobStoreFactoryTest.php
9 files changed, 205 insertions(+), 28 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 6b8387b..c37d9f7 100644
--- a/autoload.php
+++ b/autoload.php
@@ -944,6 +944,7 @@
'MediaWiki\\Site\\MediaWikiPageNameNormalizer' => __DIR__ . 
'/includes/site/MediaWikiPageNameNormalizer.php',
'MediaWiki\\Storage\\BlobAccessException' => __DIR__ . 
'/includes/Storage/BlobAccessException.php',
'MediaWiki\\Storage\\BlobStore' => __DIR__ . 
'/includes/Storage/BlobStore.php',
+   'MediaWiki\\Storage\\BlobStoreFactory' => __DIR__ . 
'/includes/Storage/BlobStoreFactory.php',
'MediaWiki\\Storage\\IncompleteRevisionException' => __DIR__ . 
'/includes/Storage/IncompleteRevisionException.php',
'MediaWiki\\Storage\\MutableRevisionRecord' => __DIR__ . 
'/includes/Storage/MutableRevisionRecord.php',
'MediaWiki\\Storage\\MutableRevisionSlots' => __DIR__ . 
'/includes/Storage/MutableRevisionSlots.php',
diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index 33d0fd4..04c67fb 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -12,6 +12,7 @@
 use IBufferingStatsdDataFactory;
 use MediaWiki\Shell\CommandFactory;
 use MediaWiki\Storage\BlobStore;
+use MediaWiki\Storage\BlobStoreFactory;
 use MediaWiki\Storage\RevisionStore;
 use Wikimedia\Rdbms\LBFactory;
 use LinkCache;
@@ -702,10 +703,18 @@
 
/**
 * @since 1.31
+* @return BlobStoreFactory
+*/
+   public function getBlobStoreFactory() {
+   return $this->getService( 'BlobStoreFactory' );
+   }
+
+   /**
+* @since 1.31
 * @return BlobStore
 */
public function getBlobStore() {
-   return $this->getService( 'BlobStore' );
+   return $this->getService( '_SqlBlobStore' );
}
 
/**
diff --git a/includes/Revision.php b/includes/Revision.php
index ed0646a..af4fef5 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -65,10 +65,14 @@
}
 
/**
+* @param bool|string $wikiId The ID of the target wiki database. Use 
false for the local wiki.
+*
 * @return SqlBlobStore
 */
-   protected static function getBlobStore() {
-   $store = MediaWikiServices::getInstance()->getBlobStore();
+   protected static function getBlobStore( $wiki = false ) {
+   $store = MediaWikiServices::getInstance()
+   ->getBlobStoreFactory()
+   ->newSqlBlobStore( $wiki );
 
if ( !$store instanceof SqlBlobStore ) {
throw new RuntimeException(
@@ -942,7 +946,7 @@
 
$cacheKey = isset( $row->old_id ) ? ( 'tt:' . $row->old_id ) : 
null;
 
-   return self::getBlobStore()->expandBlob( $text, $flags, 
$cacheKey );
+   return self::getBlobStore( $wiki )->expandBlob( $text, $flags, 
$cacheKey );
}
 
/**
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index d21bcef..0d266fb 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -42,6 +42,7 @@
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Shell\CommandFactory;
+use MediaWiki\Storage\BlobStoreFactory;
 use MediaWiki\Storage\RevisionStore;
 use MediaWiki\Storage\SqlBlobStore;
 
@@ -474,28 +475,22 @@
return $store;
},
 
+   'BlobStoreFactory' => function ( MediaWikiServices $services ) {
+   global $wgContLang;
+   return new BlobStoreFactory(
+   $services->getDBLoadBalancer(),
+   $services->getMainWANObjectCache(),
+   $services->getMainConfig(),
+   $wgContLang
+   );
+   },
+
'BlobStore' => function ( MediaWikiServices $services ) {
return $services->getService( '_SqlBlobStore' );
},

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add `margin-bottom` for editButtons (EditPage)

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Add `margin-bottom` for editButtons (EditPage)
..


Add `margin-bottom` for editButtons (EditPage)

Bug: T179040
Change-Id: I9e6c04556e4ff7f0cc567877041449f50abf4b4c
---
M resources/src/mediawiki.action/mediawiki.action.edit.styles.less
1 file changed, 21 insertions(+), 0 deletions(-)

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



diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.less 
b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
index 1d578e4..e4443f6 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
@@ -57,4 +57,25 @@
.editOptions {
border-radius: 0 0 2px 2px;
}
+
+   .editButtons .oo-ui-buttonInputWidget,
+   .cancelLink,
+   .editHelp {
+   margin-top: 0.5em;
+   }
+
+   .cancelLink,
+   .editHelp {
+   display: inline-block;
+   vertical-align: middle;
+   }
+
+   // FIXME: Remove CSS magic together with DOM element in T183672
+   .mw-editButtons-pipe-separator {
+   display: inline-block;
+   padding-top: 0.625em;
+   padding-bottom: 0.546875em;
+   line-height: 1.172em;
+   vertical-align: middle;
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e6c04556e4ff7f0cc567877041449f50abf4b4c
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Phantom42 
Gerrit-Reviewer: Phantom42 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: Replace deprecated ParserLimitReport hook with ParserLimitRe...

2017-12-24 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated ParserLimitReport hook with 
ParserLimitReportPrepare
..

Replace deprecated ParserLimitReport hook with ParserLimitReportPrepare

The ParserLimitReport hook has been deprecated since MediaWiki 1.22,
so use the suggested ParserLimitReportPrepare hook instead.

Bug: T183652
Change-Id: I97c03b5f0d3c2bbda39a2d58dfa48a13f1f8fc46
---
M extension.json
M includes/PollNY.hooks.php
2 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/extension.json b/extension.json
index d1f2d85..d40bcc3 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "PollNY",
-   "version": "3.4.3",
+   "version": "3.4.4",
"author": [
"Aaron Wright",
"David Pean",
diff --git a/includes/PollNY.hooks.php b/includes/PollNY.hooks.php
index d7d0c59..7ae7f95 100644
--- a/includes/PollNY.hooks.php
+++ b/includes/PollNY.hooks.php
@@ -108,7 +108,7 @@
 
// We don't want caching here, it'll only cause 
problems...
$wgOut->enableClientCache( false );
-   $wgHooks['ParserLimitReport'][] = 
'PollNYHooks::markUncacheable';
+   $wgHooks['ParserLimitReportPrepare'][] = 
'PollNYHooks::onParserLimitReportPrepare';
 
// Prevents editing of polls
if( $wgRequest->getVal( 'action' ) == 'edit' ) {
@@ -138,11 +138,11 @@
/**
 * Mark page as uncacheable
 *
-* @param $parser Parser object
-* @param $limitReport String: unused
-* @return Boolean: true
+* @param Parser $parser
+* @param ParserOutput $limitReport
+* @return bool true
 */
-   public static function markUncacheable( $parser, &$limitReport ) {
+   public static function onParserLimitReportPrepare( $parser, $output ) {
$parser->disableCache();
return true;
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add @covers tags to CategoriesRdfTest

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Add @covers tags to CategoriesRdfTest
..


Add @covers tags to CategoriesRdfTest

Change-Id: I6e2eae3fc2ac722dc94bee1a7aa6632e08a4d097
---
M tests/phpunit/maintenance/categoriesRdfTest.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/maintenance/categoriesRdfTest.php 
b/tests/phpunit/maintenance/categoriesRdfTest.php
index ec2746e..b51c14c 100644
--- a/tests/phpunit/maintenance/categoriesRdfTest.php
+++ b/tests/phpunit/maintenance/categoriesRdfTest.php
@@ -1,5 +1,9 @@
 https://gerrit.wikimedia.org/r/400123
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mysql: break Mysql::User['vagrant'] dependency cycle

2017-12-24 Thread BryanDavis (Code Review)

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

Change subject: mysql: break Mysql::User['vagrant'] dependency cycle
..

mysql: break Mysql::User['vagrant'] dependency cycle

Exclude Mysql::User['vagrant'] from contract that Mysql::Db resources
must be created before Mysql::User resources. Because
Mysql::User['vagrant'] is included in Class['mysql'] it would otherwise
create a dependency cycle with any lass which requires Class['mysql']
(directly or indirectly) and also uses Mysql::Db.

Bug: T181918
Change-Id: Id054e18e97658bd08987e44e10c61157b09ab9a8
---
M puppet/modules/mysql/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/25/400125/1

diff --git a/puppet/modules/mysql/manifests/init.pp 
b/puppet/modules/mysql/manifests/init.pp
index f7b85da..929ed2c 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -50,5 +50,5 @@
 
 # Create databases before creating users. User resources sometime
 # depend on databases for GRANTs, but the reverse is never true.
-Mysql::Db <| |> -> Mysql::User <| |>
+Mysql::Db <| |> -> Mysql::User <| title != 'vagrant' |>
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Replace deprecated ParserLimitReport hook with ParserLimitRe...

2017-12-24 Thread SamanthaNguyen (Code Review)

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

Change subject: Replace deprecated ParserLimitReport hook with 
ParserLimitReportPrepare
..

Replace deprecated ParserLimitReport hook with ParserLimitReportPrepare

The ParserLimitReport hook has been deprecated since MediaWiki 1.22,
so use the suggested ParserLimitReportPrepare hook instead.

Bug: T183652
Change-Id: I00edc18574ff4fe10710edb576a41e90a3474c3d
---
M UserProfile/UserProfileHooks.php
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/UserProfile/UserProfileHooks.php b/UserProfile/UserProfileHooks.php
index 2d02eb4..702dcd1 100644
--- a/UserProfile/UserProfileHooks.php
+++ b/UserProfile/UserProfileHooks.php
@@ -68,7 +68,7 @@
}
} else {
$wgOut->enableClientCache( false );
-   $wgHooks['ParserLimitReport'][] = 
'UserProfileHooks::markPageUncacheable';
+   $wgHooks['ParserLimitReportPrepare'][] = 
'UserProfileHooks::onParserLimitReportPrepare';
}
 
$wgOut->addModuleStyles( [
@@ -86,10 +86,10 @@
 * Mark page as uncacheable
 *
 * @param Parser $parser
-* @param string &$limitReport unused
-* @return bool
+* @param ParserOutput $output
+* @return bool true
 */
-   public static function markPageUncacheable( $parser, &$limitReport ) {
+   public static function onParserLimitReportPrepare( $parser, $output ) {
$parser->disableCache();
return true;
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add @covers tags to CategoriesRdfTest

2017-12-24 Thread Legoktm (Code Review)

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

Change subject: Add @covers tags to CategoriesRdfTest
..

Add @covers tags to CategoriesRdfTest

Change-Id: I6e2eae3fc2ac722dc94bee1a7aa6632e08a4d097
---
M tests/phpunit/maintenance/categoriesRdfTest.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/23/400123/1

diff --git a/tests/phpunit/maintenance/categoriesRdfTest.php 
b/tests/phpunit/maintenance/categoriesRdfTest.php
index ec2746e..b51c14c 100644
--- a/tests/phpunit/maintenance/categoriesRdfTest.php
+++ b/tests/phpunit/maintenance/categoriesRdfTest.php
@@ -1,5 +1,9 @@
 https://gerrit.wikimedia.org/r/400123
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e2eae3fc2ac722dc94bee1a7aa6632e08a4d097
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/vagrant[stretch-migration]: hadoop: fix Resource type not found: BLOCK

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: hadoop: fix Resource type not found: BLOCK
..


hadoop: fix Resource type not found: BLOCK

Puppet 4 bails out on:
mapreduce_output_compression_type => BLOCK,

Change-Id: I43c5477c2b7766dafdd6feb2b3d70c7cae268bd6
---
M puppet/modules/role/manifests/hadoop.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/puppet/modules/role/manifests/hadoop.pp 
b/puppet/modules/role/manifests/hadoop.pp
index 0f31614..c0f5523 100644
--- a/puppet/modules/role/manifests/hadoop.pp
+++ b/puppet/modules/role/manifests/hadoop.pp
@@ -33,7 +33,7 @@
 mapreduce_intermediate_compression_codec => 
'org.apache.hadoop.io.compress.SnappyCodec',
 mapreduce_output_compression => true,
 mapreduce_output_compression_codec   => 
'org.apache.hadoop.io.compress.SnappyCodec',
-mapreduce_output_compression_type=> BLOCK,
+mapreduce_output_compression_type=> 'BLOCK',
 mapreduce_map_tasks_maximum  => 2,
 mapreduce_reduce_tasks_maximum   => 2,
 # mapreduce.shuffle.port defaults to 8080.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43c5477c2b7766dafdd6feb2b3d70c7cae268bd6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Hashar 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: composer: fix oscillating file group

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: composer: fix oscillating file group
..


composer: fix oscillating file group

Fixes this Puppet battle over file ownership:
Notice: /Stage[main]/Php::Composer/File[/usr/local/bin/composer]/group: group 
changed 'staff' to 'root

Change-Id: Ie710ec2481fd1042dade886e3b078e88c317a2fd
---
M puppet/modules/php/manifests/composer.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/puppet/modules/php/manifests/composer.pp 
b/puppet/modules/php/manifests/composer.pp
index e8e9e9b..a8ecb21 100644
--- a/puppet/modules/php/manifests/composer.pp
+++ b/puppet/modules/php/manifests/composer.pp
@@ -26,7 +26,7 @@
 file { '/usr/local/bin/composer':
 ensure  => file,
 owner   => 'root',
-group   => 'root',
+group   => 'staff',
 mode=> '0755',
 require => Exec['download_composer'],
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie710ec2481fd1042dade886e3b078e88c317a2fd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: php7: remove remaining role::zend references

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: php7: remove remaining role::zend references
..


php7: remove remaining role::zend references

Bug: T181915
Change-Id: Ie1eacf689a841269847e5ee75a3cc7ff9199fcff
---
M puppet/modules/role/manifests/ldapauth.pp
M puppet/modules/role/manifests/zero.pp
2 files changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/puppet/modules/role/manifests/ldapauth.pp 
b/puppet/modules/role/manifests/ldapauth.pp
index 7d04350..2a7011c 100644
--- a/puppet/modules/role/manifests/ldapauth.pp
+++ b/puppet/modules/role/manifests/ldapauth.pp
@@ -17,7 +17,6 @@
 $writer_password,
 $admin_password,
 ) {
-# Needed for php maintenance scripts and if the VM is using role::zend
 require_package('php-ldap')
 
 # This is a lazy short cut so we don't have to pass a bazillion options to
diff --git a/puppet/modules/role/manifests/zero.pp 
b/puppet/modules/role/manifests/zero.pp
index cf209e0..0b85261 100644
--- a/puppet/modules/role/manifests/zero.pp
+++ b/puppet/modules/role/manifests/zero.pp
@@ -8,7 +8,6 @@
 include ::role::parserfunctions
 include ::role::scribunto
 include ::role::thumb_on_404
-include ::role::zend
 
 mediawiki::extension { 'ZeroBanner':
 priority => $::load_later, # Must be after JsonConfig & MobileFrontEnd

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1eacf689a841269847e5ee75a3cc7ff9199fcff
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mysql: Use mariadb-server package

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: mysql: Use mariadb-server package
..


mysql: Use mariadb-server package

Change from the transitional "mysql-server" package to the
"mariadb-server" package. Also explicitly tell Puppet that the mariadb
service is managed via systemd.

Bug: T51652

Change-Id: If6bc65c1648fe6b5f323094cf2b2dcc9dbbac361
---
M puppet/modules/mediawiki/manifests/multiwiki.pp
M puppet/modules/mysql/manifests/init.pp
M puppet/modules/mysql/manifests/large_prefix.pp
M puppet/modules/mysql/manifests/packages.pp
4 files changed, 6 insertions(+), 9 deletions(-)

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



diff --git a/puppet/modules/mediawiki/manifests/multiwiki.pp 
b/puppet/modules/mediawiki/manifests/multiwiki.pp
index a29bae8..6baf1d8 100644
--- a/puppet/modules/mediawiki/manifests/multiwiki.pp
+++ b/puppet/modules/mediawiki/manifests/multiwiki.pp
@@ -267,10 +267,6 @@
 file { '/usr/local/bin/sql':
 ensure  => link,
 target  => '/usr/bin/mysql',
-# /usr/bin/mysql is provided by the package
-# mysql-client-core-5.5, but that is only installed as an
-# implicit dependency of mysql-server required by
-# mysql::packages.
-require => Package['mysql-server'],
+require => Package['mariadb-server'],
 }
 }
diff --git a/puppet/modules/mysql/manifests/init.pp 
b/puppet/modules/mysql/manifests/init.pp
index 113ce1f..f7b85da 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -24,11 +24,12 @@
 ) {
 include ::mysql::packages
 
-service { 'mysql':
+service { 'mariadb':
 ensure => running,
 enable => true,
+provider   => 'systemd',
 hasrestart => true,
-require=> Package['mysql-server'],
+require=> Package['mariadb-server'],
 }
 
 # Setup password free auth for VM's vagrant user
diff --git a/puppet/modules/mysql/manifests/large_prefix.pp 
b/puppet/modules/mysql/manifests/large_prefix.pp
index 1bce93d..568d47b 100644
--- a/puppet/modules/mysql/manifests/large_prefix.pp
+++ b/puppet/modules/mysql/manifests/large_prefix.pp
@@ -11,7 +11,7 @@
 group   => 'root',
 mode=> '0444',
 source  => 'puppet:///modules/mysql/innodb_large_prefix.cnf',
-require => Package['mysql-server'],
+require => Package['mariadb-server'],
 notify  => Service['mysql'],
 }
 }
diff --git a/puppet/modules/mysql/manifests/packages.pp 
b/puppet/modules/mysql/manifests/packages.pp
index 73f0a65..46944ae 100644
--- a/puppet/modules/mysql/manifests/packages.pp
+++ b/puppet/modules/mysql/manifests/packages.pp
@@ -4,7 +4,7 @@
 # class so they can be included from multiple locations.
 #
 class mysql::packages {
-package { 'mysql-server':
+package { 'mariadb-server':
 ensure => present,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If6bc65c1648fe6b5f323094cf2b2dcc9dbbac361
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: apt: better support for `apt-get update` refresh

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: apt: better support for `apt-get update` refresh
..


apt: better support for `apt-get update` refresh

We have 3 use cases for running `apt-get update`:
* Run on initial provision before any packages are installed
* Run on `vagrant provision` if it has not run in the last day
* Run on any `vagrant provision` where an apt::pin or apt::repository
  resource has newly been added to the Puppet object graph

The first two use cases have long been handled for us by using
a "schedule => daily" attribute on the Exec['apt-get update'] resource.
This has a flaw however in that the schedule attribute swallows refresh
events triggered by apt:pin and apt:repository if local state shows that
Exec['apt-get update'] is not already due to run. This causes annoying
issues for users who are adding new roles to existing VMs where new apt
repos or pinning are needed to successfully provision.

To support the 3rd use case while not breaking the first 2, this patch
makes the apt-get update triggers a bit more complex. A new
File['/etc/apt/.update'] resource is added which will notify
Exec['apt-get update'] for the first use case. A new Exec['Daily
apt-get update'] resource is added which uses a "schedule => 'daily'"
attribute to support the second use case. Finally the "schedule"
attribute is removed from the existing Exec['apt-get update'] resource
and a "refreshonly" attribute is added so that the previously ignored
notifications needed by the 3rd use case are properly handled.

Change-Id: I5a02476af18580966a5fe57797dfb13c5ba27b9c
---
M puppet/modules/apt/manifests/init.pp
1 file changed, 28 insertions(+), 4 deletions(-)

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



diff --git a/puppet/modules/apt/manifests/init.pp 
b/puppet/modules/apt/manifests/init.pp
index 7932f24..092b570 100644
--- a/puppet/modules/apt/manifests/init.pp
+++ b/puppet/modules/apt/manifests/init.pp
@@ -5,11 +5,35 @@
 # supplementary sources.
 #
 class apt {
+# Elaborate apt-get update trigger machanism ahead. We want apt-get update
+# to be run on initial provision of a new VM (easy), once a day
+# thereafter (not too hard with "schedule => daily"), AND any time that
+# a new apt::pin or apt::repository define shows up in the Puppet graph.
+# The first 2 can be handled simply via an Exec with the schedule 
attribure.
+# That setup however keeps the 3rd use case from working as desired.
+#
+# The more complex replacement is a state file (/etc/apt/.update),
+# a schedule=>daily exec to update that file, and a refreshonly
+# Exec['apt-get update'] resource.
+file { '/etc/apt/.update':
+ensure  => 'present',
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => '',
+replace => false,
+notify  => Exec['apt-get update'],
+}
+exec { 'Daily apt-get update':
+command  => '/bin/date > /etc/apt/.update',
+schedule => 'daily',
+}
 exec { 'apt-get update':
-command  => '/usr/bin/apt-get update',
-schedule => daily,
-timeout  => 240,
-returns  => [ 0, 100 ],
+command => '/usr/bin/apt-get update',
+timeout => 240,
+returns => [ 0, 100 ],
+refreshonly => true,
+subscribe   => File['/etc/apt/.update'],
 }
 
 # Directory used to store keys added with apt::repository

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a02476af18580966a5fe57797dfb13c5ba27b9c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: npm: Add guard for Exec['downgrade_npm']

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: npm: Add guard for Exec['downgrade_npm']
..


npm: Add guard for Exec['downgrade_npm']

Add an "unless" guard condition to keep the Exec['downgrade_npm']
resource from firing unnecessarily.

Change-Id: Ic3fd9518254cae379092f9650e596e1ba8292dfe
---
M puppet/modules/npm/manifests/init.pp
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/puppet/modules/npm/manifests/init.pp 
b/puppet/modules/npm/manifests/init.pp
index dde3fdd..61482a9 100644
--- a/puppet/modules/npm/manifests/init.pp
+++ b/puppet/modules/npm/manifests/init.pp
@@ -43,13 +43,13 @@
 
 # Node 6 brings in npm 3 that doesn't work in shared folders due to a bug.
 # See: https://github.com/npm/npm/issues/9953
-# Although the ticket is closed, the issue is still present, so downgrade 
to npm 2
+# Although the ticket is closed, the issue is still present, so downgrade
+# to the latest npm 2
 exec { 'downgrade_npm':
   command => '/usr/bin/npm install -g npm@latest-2',
   user=> 'root',
-  require => [
-  Package['nodejs'],
-  ],
+  unless  => '/usr/bin/npm --version | /bin/grep -qe ^2',
+  require => Package['nodejs'],
 }
 
 env::var { 'NPM_CONFIG_CACHE':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3fd9518254cae379092f9650e596e1ba8292dfe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
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...TweetANew[master]: Add minus-x to composer test and fix

2017-12-24 Thread Albert221 (Code Review)

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

Change subject: Add minus-x to composer test and fix
..

Add minus-x to composer test and fix

Bug: T175794
Change-Id: Ie25f1766abd8eaacd88074aaa6ce8199f1aefa62
---
M TweetANew.body.php
M composer.json
M lib/GoogleURL.php
3 files changed, 7 insertions(+), 2 deletions(-)


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

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

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie25f1766abd8eaacd88074aaa6ce8199f1aefa62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TweetANew
Gerrit-Branch: master
Gerrit-Owner: Albert221 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve documentation of $wgReferrerPolicy

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Improve documentation of $wgReferrerPolicy
..


Improve documentation of $wgReferrerPolicy

Reference current version of the spec.

Change-Id: I1cca89b9e46a2b5ae8242715eddfdbd23ccb2d83
---
M includes/DefaultSettings.php
1 file changed, 9 insertions(+), 3 deletions(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e50b7a7..d0a02de 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -316,10 +316,16 @@
 
 /**
  * Value for the referrer policy meta tag.
- * One of 'never', 'default', 'origin', 'always'. Setting it to false just
- * prevents the meta tag from being output.
- * See https://www.w3.org/TR/referrer-policy/ for details.
+ * One of the values defined in the Referrer Policy specification:
+ * https://w3c.github.io/webappsec-referrer-policy/
+ * ('no-referrer', 'no-referrer-when-downgrade', 'same-origin',
+ * 'origin', 'strict-origin', 'origin-when-cross-origin',
+ * 'strict-origin-when-cross-origin', or 'unsafe-url')
+ * Setting it to false prevents the meta tag from being output
+ * (which results in falling back to the Referrer-Policy header,
+ * or 'no-referrer-when-downgrade' if that's not set either.)
  *
+ * @var string|bool
  * @since 1.25
  */
 $wgReferrerPolicy = false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1cca89b9e46a2b5ae8242715eddfdbd23ccb2d83
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: composer: fix oscillating file group

2017-12-24 Thread BryanDavis (Code Review)

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

Change subject: composer: fix oscillating file group
..

composer: fix oscillating file group

Fixes this Puppet battle over file ownership:
Notice: /Stage[main]/Php::Composer/File[/usr/local/bin/composer]/group: group 
changed 'staff' to 'root

Change-Id: Ie710ec2481fd1042dade886e3b078e88c317a2fd
---
M puppet/modules/php/manifests/composer.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/21/400121/1

diff --git a/puppet/modules/php/manifests/composer.pp 
b/puppet/modules/php/manifests/composer.pp
index e8e9e9b..a8ecb21 100644
--- a/puppet/modules/php/manifests/composer.pp
+++ b/puppet/modules/php/manifests/composer.pp
@@ -26,7 +26,7 @@
 file { '/usr/local/bin/composer':
 ensure  => file,
 owner   => 'root',
-group   => 'root',
+group   => 'staff',
 mode=> '0755',
 require => Exec['download_composer'],
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: npm: Add guard for Exec['downgrade_npm']

2017-12-24 Thread BryanDavis (Code Review)

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

Change subject: npm: Add guard for Exec['downgrade_npm']
..

npm: Add guard for Exec['downgrade_npm']

Add an "unless" guard condition to keep the Exec['downgrade_npm']
resource from firing unnecessarily.

Change-Id: Ic3fd9518254cae379092f9650e596e1ba8292dfe
---
M puppet/modules/npm/manifests/init.pp
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/17/400117/1

diff --git a/puppet/modules/npm/manifests/init.pp 
b/puppet/modules/npm/manifests/init.pp
index dde3fdd..61482a9 100644
--- a/puppet/modules/npm/manifests/init.pp
+++ b/puppet/modules/npm/manifests/init.pp
@@ -43,13 +43,13 @@
 
 # Node 6 brings in npm 3 that doesn't work in shared folders due to a bug.
 # See: https://github.com/npm/npm/issues/9953
-# Although the ticket is closed, the issue is still present, so downgrade 
to npm 2
+# Although the ticket is closed, the issue is still present, so downgrade
+# to the latest npm 2
 exec { 'downgrade_npm':
   command => '/usr/bin/npm install -g npm@latest-2',
   user=> 'root',
-  require => [
-  Package['nodejs'],
-  ],
+  unless  => '/usr/bin/npm --version | /bin/grep -qe ^2',
+  require => Package['nodejs'],
 }
 
 env::var { 'NPM_CONFIG_CACHE':

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: apt: better support for `apt-get update` refresh

2017-12-24 Thread BryanDavis (Code Review)

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

Change subject: apt: better support for `apt-get update` refresh
..

apt: better support for `apt-get update` refresh

We have 3 use cases for running `apt-get update`:
* Run on initial provision before any packages are installed
* Run on `vagrant provision` if it has not run in the last day
* Run on any `vagrant provision` where an apt::pin or apt::repository
  resource has newly been added to the Puppet object graph

The first two use cases have long been handled for us by using
a "schedule => daily" attribute on the Exec['apt-get update'] resource.
This has a flaw however in that the schedule attribute swallows refresh
events triggered by apt:pin and apt:repository if local state shows that
Exec['apt-get update'] is not already due to run. This causes annoying
issues for users who are adding new roles to existing VMs where new apt
repos or pinning are needed to successfully provision.

To support the 3rd use case while not breaking the first 2, this patch
makes the apt-get update triggers a bit more complex. A new
File['/etc/apt/.update'] resource is added which will notify
Exec['apt-get update'] for the first use case. A new Exec['Daily
apt-get update'] resource is added which uses a "schedule => 'daily'"
attribute to support the second use case. Finally the "schedule"
attribute is removed from the existing Exec['apt-get update'] resource
and a "refreshonly" attribute is added so that the previously ignored
notifications needed by the 3rd use case are properly handled.

Change-Id: I5a02476af18580966a5fe57797dfb13c5ba27b9c
---
M puppet/modules/apt/manifests/init.pp
1 file changed, 28 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/16/400116/1

diff --git a/puppet/modules/apt/manifests/init.pp 
b/puppet/modules/apt/manifests/init.pp
index 7932f24..092b570 100644
--- a/puppet/modules/apt/manifests/init.pp
+++ b/puppet/modules/apt/manifests/init.pp
@@ -5,11 +5,35 @@
 # supplementary sources.
 #
 class apt {
+# Elaborate apt-get update trigger machanism ahead. We want apt-get update
+# to be run on initial provision of a new VM (easy), once a day
+# thereafter (not too hard with "schedule => daily"), AND any time that
+# a new apt::pin or apt::repository define shows up in the Puppet graph.
+# The first 2 can be handled simply via an Exec with the schedule 
attribure.
+# That setup however keeps the 3rd use case from working as desired.
+#
+# The more complex replacement is a state file (/etc/apt/.update),
+# a schedule=>daily exec to update that file, and a refreshonly
+# Exec['apt-get update'] resource.
+file { '/etc/apt/.update':
+ensure  => 'present',
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => '',
+replace => false,
+notify  => Exec['apt-get update'],
+}
+exec { 'Daily apt-get update':
+command  => '/bin/date > /etc/apt/.update',
+schedule => 'daily',
+}
 exec { 'apt-get update':
-command  => '/usr/bin/apt-get update',
-schedule => daily,
-timeout  => 240,
-returns  => [ 0, 100 ],
+command => '/usr/bin/apt-get update',
+timeout => 240,
+returns => [ 0, 100 ],
+refreshonly => true,
+subscribe   => File['/etc/apt/.update'],
 }
 
 # Directory used to store keys added with apt::repository

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: php7: remove remaining role::zend references

2017-12-24 Thread BryanDavis (Code Review)

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

Change subject: php7: remove remaining role::zend references
..

php7: remove remaining role::zend references

Bug: T181915
Change-Id: Ie1eacf689a841269847e5ee75a3cc7ff9199fcff
---
M puppet/modules/role/manifests/ldapauth.pp
M puppet/modules/role/manifests/zero.pp
2 files changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/20/400120/1

diff --git a/puppet/modules/role/manifests/ldapauth.pp 
b/puppet/modules/role/manifests/ldapauth.pp
index 7d04350..2a7011c 100644
--- a/puppet/modules/role/manifests/ldapauth.pp
+++ b/puppet/modules/role/manifests/ldapauth.pp
@@ -17,7 +17,6 @@
 $writer_password,
 $admin_password,
 ) {
-# Needed for php maintenance scripts and if the VM is using role::zend
 require_package('php-ldap')
 
 # This is a lazy short cut so we don't have to pass a bazillion options to
diff --git a/puppet/modules/role/manifests/zero.pp 
b/puppet/modules/role/manifests/zero.pp
index cf209e0..0b85261 100644
--- a/puppet/modules/role/manifests/zero.pp
+++ b/puppet/modules/role/manifests/zero.pp
@@ -8,7 +8,6 @@
 include ::role::parserfunctions
 include ::role::scribunto
 include ::role::thumb_on_404
-include ::role::zend
 
 mediawiki::extension { 'ZeroBanner':
 priority => $::load_later, # Must be after JsonConfig & MobileFrontEnd

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mysql: remove unnecessary -p${mysql::root_password} usage

2017-12-24 Thread BryanDavis (Code Review)

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

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

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

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

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/19/400119/1

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

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mysql: Use mariadb-server package

2017-12-24 Thread BryanDavis (Code Review)

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

Change subject: mysql: Use mariadb-server package
..

mysql: Use mariadb-server package

Change from the transitional "mysql-server" package to the
"mariadb-server" package. Also explicitly tell Puppet that the mariadb
service is managed via systemd.

Bug: T51652

Change-Id: If6bc65c1648fe6b5f323094cf2b2dcc9dbbac361
---
M puppet/modules/mediawiki/manifests/multiwiki.pp
M puppet/modules/mysql/manifests/init.pp
M puppet/modules/mysql/manifests/large_prefix.pp
M puppet/modules/mysql/manifests/packages.pp
4 files changed, 6 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/18/400118/1

diff --git a/puppet/modules/mediawiki/manifests/multiwiki.pp 
b/puppet/modules/mediawiki/manifests/multiwiki.pp
index a29bae8..6baf1d8 100644
--- a/puppet/modules/mediawiki/manifests/multiwiki.pp
+++ b/puppet/modules/mediawiki/manifests/multiwiki.pp
@@ -267,10 +267,6 @@
 file { '/usr/local/bin/sql':
 ensure  => link,
 target  => '/usr/bin/mysql',
-# /usr/bin/mysql is provided by the package
-# mysql-client-core-5.5, but that is only installed as an
-# implicit dependency of mysql-server required by
-# mysql::packages.
-require => Package['mysql-server'],
+require => Package['mariadb-server'],
 }
 }
diff --git a/puppet/modules/mysql/manifests/init.pp 
b/puppet/modules/mysql/manifests/init.pp
index 113ce1f..f7b85da 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -24,11 +24,12 @@
 ) {
 include ::mysql::packages
 
-service { 'mysql':
+service { 'mariadb':
 ensure => running,
 enable => true,
+provider   => 'systemd',
 hasrestart => true,
-require=> Package['mysql-server'],
+require=> Package['mariadb-server'],
 }
 
 # Setup password free auth for VM's vagrant user
diff --git a/puppet/modules/mysql/manifests/large_prefix.pp 
b/puppet/modules/mysql/manifests/large_prefix.pp
index 1bce93d..568d47b 100644
--- a/puppet/modules/mysql/manifests/large_prefix.pp
+++ b/puppet/modules/mysql/manifests/large_prefix.pp
@@ -11,7 +11,7 @@
 group   => 'root',
 mode=> '0444',
 source  => 'puppet:///modules/mysql/innodb_large_prefix.cnf',
-require => Package['mysql-server'],
+require => Package['mariadb-server'],
 notify  => Service['mysql'],
 }
 }
diff --git a/puppet/modules/mysql/manifests/packages.pp 
b/puppet/modules/mysql/manifests/packages.pp
index 73f0a65..46944ae 100644
--- a/puppet/modules/mysql/manifests/packages.pp
+++ b/puppet/modules/mysql/manifests/packages.pp
@@ -4,7 +4,7 @@
 # class so they can be included from multiple locations.
 #
 class mysql::packages {
-package { 'mysql-server':
+package { 'mariadb-server':
 ensure => present,
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Fix dupe python-setuptools

2017-12-24 Thread Hashar (Code Review)

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

Change subject: Fix dupe python-setuptools
..

Fix dupe python-setuptools

The package python-setuptools is included from mwv::packages and is thus
defined via site.pp. That causes duplicate definition errors in at
least:

role::striker
role::keystone
role::horizon

Change-Id: If7f49130eff0c0e45b7a4fdca6c2f61c58462c1e
---
M puppet/modules/role/manifests/keystone.pp
M puppet/modules/swift/manifests/init.pp
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/15/400115/1

diff --git a/puppet/modules/role/manifests/keystone.pp 
b/puppet/modules/role/manifests/keystone.pp
index 0bc0ff2..2ea98ce 100644
--- a/puppet/modules/role/manifests/keystone.pp
+++ b/puppet/modules/role/manifests/keystone.pp
@@ -61,12 +61,13 @@
 'python-pyparsing',
 'python-pysaml2',
 'python-routes',
-'python-setuptools',
 'python-sqlalchemy',
 'python-unicodecsv',
 'python-warlock',
 'websockify',
 ]
+# Already in mwv::packages
+require_package('python-setuptools')
 
 package { $packages:
 ensure  => 'present',
diff --git a/puppet/modules/swift/manifests/init.pp 
b/puppet/modules/swift/manifests/init.pp
index 00d792b..473ac1a 100644
--- a/puppet/modules/swift/manifests/init.pp
+++ b/puppet/modules/swift/manifests/init.pp
@@ -40,11 +40,12 @@
 'python-eventlet',
 'python-pkg-resources',
 'python-pyasn1',
-'python-setuptools',
 'python-swift*',
 'python-webob',
 'swift*'
 ]
+# Already in mwv::packages
+require_package('python-setuptools')
 
 package { ['swift', 'swift-account', 'swift-container', 'swift-object', 
'swift-proxy', 'python-webob', 'python-swiftclient']:
 ensure  => 'present',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Enable Composer for SendGrid role

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Enable Composer for SendGrid role
..


Enable Composer for SendGrid role

This extension needs composer to install some dependencies
for the extension to run smoothly. A follow-up to e9ef92d.

Bug: T183571
Change-Id: Id87d1137244227a20fe4d846fec10f9b1488cd1f
---
M puppet/modules/role/manifests/sendgrid.pp
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/puppet/modules/role/manifests/sendgrid.pp 
b/puppet/modules/role/manifests/sendgrid.pp
index cfa0c5b..02030a9 100644
--- a/puppet/modules/role/manifests/sendgrid.pp
+++ b/puppet/modules/role/manifests/sendgrid.pp
@@ -4,5 +4,7 @@
 # use the SendGrid API to send emails on-wiki using a valid API key
 #
 class role::sendgrid {
-mediawiki::extension { 'SendGrid': }
-}
+mediawiki::extension { 'SendGrid':
+composer => true,
+}
+}
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id87d1137244227a20fe4d846fec10f9b1488cd1f
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Avoid use of $wgUser global in UserProfilePage

2017-12-24 Thread jenkins-bot (Code Review)

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

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


Avoid use of $wgUser global in UserProfilePage

Change-Id: I32f88f699280e07db13f6e2327f4c78c2c55a54a
---
M UserProfile/UserProfilePage.php
1 file changed, 58 insertions(+), 38 deletions(-)

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



diff --git a/UserProfile/UserProfilePage.php b/UserProfile/UserProfilePage.php
index 1dff618..fb86ada 100644
--- a/UserProfile/UserProfilePage.php
+++ b/UserProfile/UserProfilePage.php
@@ -53,18 +53,20 @@
 * Constructor
 */
function __construct( $title ) {
-   global $wgUser;
+   $context = $this->getContext();
+   $user = $context->getUser();
+
parent::__construct( $title );
$this->user_name = $title->getText();
$this->user_id = User::idFromName( $this->user_name );
$this->user = User::newFromId( $this->user_id );
$this->user->loadFromDatabase();
 
-   $this->is_owner = ( $this->user_name == $wgUser->getName() );
+   $this->is_owner = ( $this->user_name == $user->getName() );
 
$profile = new UserProfile( $this->user_name );
$this->profile_data = $profile->getProfile();
-   $this->profile_visible_fields = 
SPUserSecurity::getVisibleFields( $this->user_id, $wgUser->getId() );
+   $this->profile_visible_fields = 
SPUserSecurity::getVisibleFields( $this->user_id, $user->getID() );
}
 
/**
@@ -388,7 +390,7 @@
 * @return String: HTML or nothing if this feature isn't enabled
 */
function getCasualGames( $user_id, $user_name ) {
-   global $wgUser, $wgUserProfileDisplay;
+   global $wgUserProfileDisplay;
 
if ( $wgUserProfileDisplay['games'] == false ) {
return '';
@@ -528,15 +530,14 @@
}
 
function getProfileSection( $label, $value, $required = true ) {
-   global $wgUser;
-
$context = $this->getContext();
$out = $context->getOutput();
+   $user = $context->getUser();
 
$output = '';
if ( $value || $required ) {
if ( !$value ) {
-   if ( $wgUser->getName() == 
$this->getTitle()->getText() ) {
+   if ( $user->getName() == 
$this->getTitle()->getText() ) {
$value = wfMessage( 
'profile-updated-personal' )->escaped();
} else {
$value = wfMessage( 
'profile-not-provided' )->escaped();
@@ -551,7 +552,10 @@
}
 
function getPersonalInfo( $user_id, $user_name ) {
-   global $wgUser, $wgUserProfileDisplay;
+   global $wgUserProfileDisplay;
+
+   $context = $this->getContext();
+   $user = $context->getUser();
 
if ( $wgUserProfileDisplay['personal'] == false ) {
return '';
@@ -694,7 +698,7 @@
'

';
-   if ( $wgUser->getName() == $user_name ) {
+   if ( $user->getName() == $user_name ) {
$output .= '' .
wfMessage( 'user-edit-this' 
)->escaped() . '';
}
@@ -706,7 +710,7 @@
' .
$personal_output .
'';
-   } elseif ( $wgUser->getName() == $user_name ) {
+   } elseif ( $user->getName() == $user_name ) {
$output .= '
' .
wfMessage( 'user-personal-info-title' 
)->escaped() .
@@ -736,7 +740,10 @@
 * @return String: HTML
 */
function getCustomInfo( $user_name ) {
-   global $wgUser, $wgUserProfileDisplay;
+   global $wgUserProfileDisplay;
+
+   $context = $this->getContext();
+   $user = $context->getUser();
 
if ( $wgUserProfileDisplay['custom'] == false ) {
return '';
@@ -772,7 +779,7 @@
'

';
-   if ( $wgUser->getName() == $user_name ) {
+   if ( $user->getName() == $user_name ) {
$output .= '' .
wfMessage( 'user-edit-this' 
)->escaped() . '';
}

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: JavaScriptMinifier: Improve docs around parsing of regexp li...

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: JavaScriptMinifier: Improve docs around parsing of regexp 
literals
..


JavaScriptMinifier: Improve docs around parsing of regexp literals

Bug: T75556
Change-Id: Ifcb6bc21418dfc2e1d3e44dbd2497a0f5f691bf3
---
M includes/libs/JavaScriptMinifier.php
1 file changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/includes/libs/JavaScriptMinifier.php 
b/includes/libs/JavaScriptMinifier.php
index 3be9ca1..bbba33a 100644
--- a/includes/libs/JavaScriptMinifier.php
+++ b/includes/libs/JavaScriptMinifier.php
@@ -449,18 +449,24 @@
// We have to distinguish between regexp literals and 
division operators
// A division operator is only possible in certain 
states
} elseif( $ch === '/' && !isset( $divStates[$state] ) ) 
{
-   // Regexp literal, search to the end, skipping 
over backslash escapes and
-   // character classes
+   // Regexp literal
for( ; ; ) {
do{
+   // Skip until we find "/" (end 
of regexp), "\" (backslash escapes),
+   // or "[" (start of character 
classes).
$end += strcspn( $s, '/[\\', 
$end ) + 2;
+   // If backslash escape, keep 
searching...
} while( $end - 2 < $length && $s[$end 
- 2] === '\\' );
$end--;
+   // If the end, stop here.
if( $end - 1 >= $length || $s[$end - 1] 
=== '/' ) {
break;
}
+   // (Implicit else), we must've found 
the start of a char class,
+   // skip until we find "]" (end of char 
class), or "\" (backslash escape)
do{
$end += strcspn( $s, ']\\', 
$end ) + 2;
+   // If backslash escape, keep 
searching...
} while( $end - 2 < $length && $s[$end 
- 2] === '\\' );
$end--;
};

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcb6bc21418dfc2e1d3e44dbd2497a0f5f691bf3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Imarlier 
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/core[master]: JavaScriptMinifier: Remove support for unused $statementsOnO...

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: JavaScriptMinifier: Remove support for unused 
$statementsOnOwnLine flag
..


JavaScriptMinifier: Remove support for unused $statementsOnOwnLine flag

The $wgResourceLoaderMinifierStatementsOnOwnLine config var was deprecated
in MediaWiki 1.27. The parameter of minify() was not used by other code, and
no new usage has been introduced since then, either.

Remove the feature from JavaScriptMinifier, and add a release note for that.
The same 1.31 release notes also contain a note already about the removal
of the configuration variable.

The feature was not covered by unit tests.

The following private variables have been removed, that are no longer used
due to this change: $newlineBefore, $newlineAfter, $newlineAdded.

Change-Id: I2cbf271156c1954abb982531d0125b4b9573b12c
---
M RELEASE-NOTES-1.31
M includes/libs/JavaScriptMinifier.php
2 files changed, 4 insertions(+), 34 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 67026f4..6ef8573 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -149,6 +149,9 @@
   * WatchedItem::IGNORE_USER_RIGHTS
   * WatchedItem::CHECK_USER_RIGHTS
   * WatchedItem::DEPRECATED_USAGE_TIMESTAMP
+* The $statementsOnOwnLine parameter of JavaScriptMinifier::minify was removed.
+  The corresponding configuration variable 
($wgResourceLoaderMinifierStatementsOnOwnLine)
+  has been deprecated since 1.27 and was removed as well.
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/includes/libs/JavaScriptMinifier.php 
b/includes/libs/JavaScriptMinifier.php
index 141a515..3be9ca1 100644
--- a/includes/libs/JavaScriptMinifier.php
+++ b/includes/libs/JavaScriptMinifier.php
@@ -74,11 +74,10 @@
 *   or when required to guard against semicolon insertion.
 *
 * @param string $s JavaScript code to minify
-* @param bool $statementsOnOwnLine Whether to put each statement on 
its own line
 * @param int $maxLineLength Maximum length of a single line, or -1 for 
no maximum.
 * @return String Minified code
 */
-   public static function minify( $s, $statementsOnOwnLine = false, 
$maxLineLength = 1000 ) {
+   public static function minify( $s, $maxLineLength = 1000 ) {
// First we declare a few tables that contain our parsing rules
 
// $opChars : characters, which can be combined without 
whitespace in between them
@@ -387,23 +386,6 @@
)
);
 
-   // Rules for when newlines should be inserted if
-   // $statementsOnOwnLine is enabled.
-   // $newlineBefore is checked before switching state,
-   // $newlineAfter is checked after
-   $newlineBefore = array(
-   self::STATEMENT => array(
-   self::TYPE_BRACE_CLOSE => true,
-   ),
-   );
-   $newlineAfter = array(
-   self::STATEMENT => array(
-   self::TYPE_BRACE_OPEN => true,
-   self::TYPE_PAREN_CLOSE => true,
-   self::TYPE_SEMICOLON => true,
-   ),
-   );
-
// $divStates : Contains all states that can be followed by a 
division operator
$divStates = array(
self::EXPRESSION_OP  => true,
@@ -580,15 +562,6 @@
$pos = $end;
$newlineFound = false;
 
-   // Output a newline after the token if required
-   // This is checked before AND after switching state
-   $newlineAdded = false;
-   if ( $statementsOnOwnLine && !$newlineAdded && isset( 
$newlineBefore[$state][$type] ) ) {
-   $out .= "\n";
-   $lineLength = 0;
-   $newlineAdded = true;
-   }
-
// Now that we have output our token, transition into 
the new state.
if( isset( $push[$state][$type] ) && count( $stack ) < 
self::STACK_LIMIT ) {
$stack[] = $push[$state][$type];
@@ -597,12 +570,6 @@
$state = array_pop( $stack );
} elseif( isset( $goto[$state][$type] ) ) {
$state = $goto[$state][$type];
-   }
-
-   // Check for newline insertion again
-   if (

[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: Add #wiki-dev-africa to get Gerrit notifications

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Add #wiki-dev-africa to get Gerrit notifications
..


Add #wiki-dev-africa to get Gerrit notifications

Enable #wiki-dev-africa to get Gerrit notifications (changes) related
to some extensions. For example SendGrid, MassMessage etc. More will
be added with time.

Bug: T183573
Change-Id: I1c48c463ca0eaac0b242ed237d815735192a3463
---
M gerrit-channels.yaml
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/gerrit-channels.yaml b/gerrit-channels.yaml
index 6a143e3..84bfb5b 100644
--- a/gerrit-channels.yaml
+++ b/gerrit-channels.yaml
@@ -107,6 +107,9 @@
 mediawiki/extensions/UnusedRedirects:
 mediawiki/skins/DeepSea:
 mediawiki/skins/Refreshed:
+# Sent to #wiki-dev-africa as well
+mediawiki/extensions/SendGrid:
+mediawiki/extensions/MassMessage:
 # Sent to #wikimedia-design as well
 mediawiki/skins/Blueprint:
 mediawiki/extensions/OOUIPlayground:
@@ -218,6 +221,11 @@
 mediawiki/services/restbase/deploy:
 mediawiki/services/service-runner:
 mediawiki/services/service-template-node:
+"#wiki-dev-africa":
+# Send notifications to #wiki-dev-africa
+mediawiki/extensions/SendGrid:
+mediawiki/extensions/MassMessage:
+labs/tools/ZppixBot:
 "##Zppix-Wikipedia":
  labs/tools/ZppixBot:
  labs/tools/quarrybot-enwiki:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c48c463ca0eaac0b242ed237d815735192a3463
Gerrit-PatchSet: 5
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Zppix 
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...BlueSpiceGroupManager[master]: Add minus-x to composer test and fix

2017-12-24 Thread Phantom42 (Code Review)

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

Change subject: Add minus-x to composer test and fix
..

Add minus-x to composer test and fix

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


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

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

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtendedStatistics[master]: Add minus-x to composer test and fix

2017-12-24 Thread Phantom42 (Code Review)

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

Change subject: Add minus-x to composer test and fix
..

Add minus-x to composer test and fix

Bug: T175794
Change-Id: I3789453a529dd6926970d83c45799fb9a4376226
---
M composer.json
M i18n/av.json
M i18n/awa.json
M i18n/azb.json
M i18n/ba.json
M i18n/bcc.json
M i18n/bgn.json
M i18n/bn.json
M i18n/br.json
M i18n/ca.json
M i18n/ce.json
M i18n/cs.json
M i18n/cv.json
M i18n/de-formal.json
M i18n/dty.json
M i18n/el.json
M i18n/eu.json
M i18n/fy.json
M i18n/gu.json
M i18n/he.json
M i18n/hu.json
M i18n/ja.json
M i18n/ko.json
M i18n/ksh.json
M i18n/ku-latn.json
M i18n/lki.json
M i18n/lt.json
M i18n/mai.json
M i18n/mk.json
M i18n/my.json
M i18n/ne.json
M i18n/nl.json
M i18n/oc.json
M i18n/os.json
M i18n/ps.json
M i18n/ru.json
M i18n/shy-latn.json
M i18n/sl.json
M i18n/sq.json
M i18n/sr-ec.json
M i18n/sr-el.json
M i18n/sv.json
M i18n/szl.json
M i18n/ta.json
M i18n/tcy.json
M i18n/te.json
M i18n/tr.json
M i18n/vi.json
M i18n/yi.json
M i18n/zh-hant.json
M includes/api/BSApiStatisticsAvailableDiagramsStore.php
M includes/api/BSApiStatisticsSearchOptionsStore.php
M resources/bluespice.statistics.css
M resources/bluespice.statistics.js
M resources/images/bs-searchstatistics.png
55 files changed, 7 insertions(+), 2 deletions(-)


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

diff --git a/composer.json b/composer.json
index 24c0aa4..ef25197 100644
--- a/composer.json
+++ b/composer.json
@@ -14,11 +14,16 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }
diff --git a/i18n/av.json b/i18n/av.json
old mode 100755
new mode 100644
diff --git a/i18n/awa.json b/i18n/awa.json
old mode 100755
new mode 100644
diff --git a/i18n/azb.json b/i18n/azb.json
old mode 100755
new mode 100644
diff --git a/i18n/ba.json b/i18n/ba.json
old mode 100755
new mode 100644
diff --git a/i18n/bcc.json b/i18n/bcc.json
old mode 100755
new mode 100644
diff --git a/i18n/bgn.json b/i18n/bgn.json
old mode 100755
new mode 100644
diff --git a/i18n/bn.json b/i18n/bn.json
old mode 100755
new mode 100644
diff --git a/i18n/br.json b/i18n/br.json
old mode 100755
new mode 100644
diff --git a/i18n/ca.json b/i18n/ca.json
old mode 100755
new mode 100644
diff --git a/i18n/ce.json b/i18n/ce.json
old mode 100755
new mode 100644
diff --git a/i18n/cs.json b/i18n/cs.json
old mode 100755
new mode 100644
diff --git a/i18n/cv.json b/i18n/cv.json
old mode 100755
new mode 100644
diff --git a/i18n/de-formal.json b/i18n/de-formal.json
old mode 100755
new mode 100644
diff --git a/i18n/dty.json b/i18n/dty.json
old mode 100755
new mode 100644
diff --git a/i18n/el.json b/i18n/el.json
old mode 100755
new mode 100644
diff --git a/i18n/eu.json b/i18n/eu.json
old mode 100755
new mode 100644
diff --git a/i18n/fy.json b/i18n/fy.json
old mode 100755
new mode 100644
diff --git a/i18n/gu.json b/i18n/gu.json
old mode 100755
new mode 100644
diff --git a/i18n/he.json b/i18n/he.json
old mode 100755
new mode 100644
diff --git a/i18n/hu.json b/i18n/hu.json
old mode 100755
new mode 100644
diff --git a/i18n/ja.json b/i18n/ja.json
old mode 100755
new mode 100644
diff --git a/i18n/ko.json b/i18n/ko.json
old mode 100755
new mode 100644
diff --git a/i18n/ksh.json b/i18n/ksh.json
old mode 100755
new mode 100644
diff --git a/i18n/ku-latn.json b/i18n/ku-latn.json
old mode 100755
new mode 100644
diff --git a/i18n/lki.json b/i18n/lki.json
old mode 100755
new mode 100644
diff --git a/i18n/lt.json b/i18n/lt.json
old mode 100755
new mode 100644
diff --git a/i18n/mai.json b/i18n/mai.json
old mode 100755
new mode 100644
diff --git a/i18n/mk.json b/i18n/mk.json
old mode 100755
new mode 100644
diff --git a/i18n/my.json b/i18n/my.json
old mode 100755
new mode 100644
diff --git a/i18n/ne.json b/i18n/ne.json
old mode 100755
new mode 100644
diff --git a/i18n/nl.json b/i18n/nl.json
old mode 100755
new mode 100644
diff --git a/i18n/oc.json b/i18n/oc.json
old mode 100755
new mode 100644
diff --git a/i18n/os.json b/i18n/os.json
old mode 100755
new mode 100644
diff --git a/i18n/ps.json b/i18n/ps.json
old mode 100755
new mode 100644
diff --git a/i18n/ru.json b/i18n/ru.json
old mode 100755
new mode 100644
diff --git a/i18n/shy-latn.json b/i18n/shy-latn.json
old mode 100755
new mode 100644
diff --git

[MediaWiki-commits] [Gerrit] mediawiki...PushToWatch[master]: Add minus-x to composer test and fix

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Add minus-x to composer test and fix
..


Add minus-x to composer test and fix

Bug: T175794
Change-Id: Id8ed5462cda90f0fe02a042225b75ed9fc19c9ec
---
M PushToWatch.php
M composer.json
2 files changed, 7 insertions(+), 2 deletions(-)

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8ed5462cda90f0fe02a042225b75ed9fc19c9ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PushToWatch
Gerrit-Branch: master
Gerrit-Owner: Phantom42 
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...PdfExport[master]: Add minus-x to composer test and fix

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Add minus-x to composer test and fix
..


Add minus-x to composer test and fix

Additionally fix minor spacing issues

Bug: T175794
Change-Id: Ia42f237a2a021326b1887cd3efafcbca0bca7193
---
M PdfExport.i18n.alias.php
M PdfExport.php
M PdfExport_body.php
M composer.json
M converters/DomPdfConverter.php
M converters/HtmlDocPdfConverter.php
M converters/MPdfConverter.php
M converters/MwLibPdfConverter.php
M converters/PdfConverter.php
M converters/PdfConverterFactory.php
M converters/PrincePdfConverter.php
11 files changed, 26 insertions(+), 21 deletions(-)

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



diff --git a/PdfExport.i18n.alias.php b/PdfExport.i18n.alias.php
old mode 100755
new mode 100644
diff --git a/PdfExport.php b/PdfExport.php
old mode 100755
new mode 100644
diff --git a/PdfExport_body.php b/PdfExport_body.php
old mode 100755
new mode 100644
diff --git a/composer.json b/composer.json
index aebd773..7d306d5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }
diff --git a/converters/DomPdfConverter.php b/converters/DomPdfConverter.php
old mode 100755
new mode 100644
diff --git a/converters/HtmlDocPdfConverter.php 
b/converters/HtmlDocPdfConverter.php
old mode 100755
new mode 100644
diff --git a/converters/MPdfConverter.php b/converters/MPdfConverter.php
old mode 100755
new mode 100644
diff --git a/converters/MwLibPdfConverter.php b/converters/MwLibPdfConverter.php
old mode 100755
new mode 100644
index 36bebf0..bff1a9a
--- a/converters/MwLibPdfConverter.php
+++ b/converters/MwLibPdfConverter.php
@@ -4,10 +4,10 @@
 
 /**
  * A mwlib based conversion backend.
- * 
+ *
  * Installation:
  * You need to install mwlib and the mwlib.rl library. These can be found 
here: https://github.com/pediapress or they can be installed with python 
easy_install or pip.
- * 
+ *
  * @author Christian Neubauer
  */
 class MwLibPdfConverter extends PdfConverter {
@@ -16,7 +16,7 @@
 * @param Array $options An array of options
 */
function initialize(&$options) {}
-   
+
/**
 * Ouput the Pdf.
 * @param Array $pages An array of page names.
@@ -29,7 +29,7 @@
 
// Since mwlib operates on raw wikitext, it can only handle one 
file at a time.
$page = $pages[0];
-   
+
# Write the content type to the client...
$wgOut->disable();
header("Content-Type: application/pdf");
@@ -38,16 +38,16 @@
} else {
header(sprintf('Content-Disposition: inline; 
filename="%s.pdf"', $options['filename']));
}
-   
+
// TODO gather output
$tmpFile = tempnam(sys_get_temp_dir(), 'mw-pdf-');
$output = array();
exec($wgPdfExportMwLibPath.' --config 
'.$wgServer.$wgScriptPath.'/ --output '.$tmpFile.' --writer rl 
'.escapeshellarg($page), $output);
-   
+
readfile( $tmpFile );
unlink( $tmpFile );
}
-   
+
/**
 * Get the HTML for a page. This function should filter out any code 
that the converter can't handle like

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Avoid use of $wgUser global in UserProfilePage

2017-12-24 Thread SamanthaNguyen (Code Review)

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

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

Avoid use of $wgUser global in UserProfilePage

Change-Id: I32f88f699280e07db13f6e2327f4c78c2c55a54a
---
M UserProfile/UserProfilePage.php
1 file changed, 58 insertions(+), 38 deletions(-)


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

diff --git a/UserProfile/UserProfilePage.php b/UserProfile/UserProfilePage.php
index 1dff618..fb86ada 100644
--- a/UserProfile/UserProfilePage.php
+++ b/UserProfile/UserProfilePage.php
@@ -53,18 +53,20 @@
 * Constructor
 */
function __construct( $title ) {
-   global $wgUser;
+   $context = $this->getContext();
+   $user = $context->getUser();
+
parent::__construct( $title );
$this->user_name = $title->getText();
$this->user_id = User::idFromName( $this->user_name );
$this->user = User::newFromId( $this->user_id );
$this->user->loadFromDatabase();
 
-   $this->is_owner = ( $this->user_name == $wgUser->getName() );
+   $this->is_owner = ( $this->user_name == $user->getName() );
 
$profile = new UserProfile( $this->user_name );
$this->profile_data = $profile->getProfile();
-   $this->profile_visible_fields = 
SPUserSecurity::getVisibleFields( $this->user_id, $wgUser->getId() );
+   $this->profile_visible_fields = 
SPUserSecurity::getVisibleFields( $this->user_id, $user->getID() );
}
 
/**
@@ -388,7 +390,7 @@
 * @return String: HTML or nothing if this feature isn't enabled
 */
function getCasualGames( $user_id, $user_name ) {
-   global $wgUser, $wgUserProfileDisplay;
+   global $wgUserProfileDisplay;
 
if ( $wgUserProfileDisplay['games'] == false ) {
return '';
@@ -528,15 +530,14 @@
}
 
function getProfileSection( $label, $value, $required = true ) {
-   global $wgUser;
-
$context = $this->getContext();
$out = $context->getOutput();
+   $user = $context->getUser();
 
$output = '';
if ( $value || $required ) {
if ( !$value ) {
-   if ( $wgUser->getName() == 
$this->getTitle()->getText() ) {
+   if ( $user->getName() == 
$this->getTitle()->getText() ) {
$value = wfMessage( 
'profile-updated-personal' )->escaped();
} else {
$value = wfMessage( 
'profile-not-provided' )->escaped();
@@ -551,7 +552,10 @@
}
 
function getPersonalInfo( $user_id, $user_name ) {
-   global $wgUser, $wgUserProfileDisplay;
+   global $wgUserProfileDisplay;
+
+   $context = $this->getContext();
+   $user = $context->getUser();
 
if ( $wgUserProfileDisplay['personal'] == false ) {
return '';
@@ -694,7 +698,7 @@
'

';
-   if ( $wgUser->getName() == $user_name ) {
+   if ( $user->getName() == $user_name ) {
$output .= '' .
wfMessage( 'user-edit-this' 
)->escaped() . '';
}
@@ -706,7 +710,7 @@
' .
$personal_output .
'';
-   } elseif ( $wgUser->getName() == $user_name ) {
+   } elseif ( $user->getName() == $user_name ) {
$output .= '
' .
wfMessage( 'user-personal-info-title' 
)->escaped() .
@@ -736,7 +740,10 @@
 * @return String: HTML
 */
function getCustomInfo( $user_name ) {
-   global $wgUser, $wgUserProfileDisplay;
+   global $wgUserProfileDisplay;
+
+   $context = $this->getContext();
+   $user = $context->getUser();
 
if ( $wgUserProfileDisplay['custom'] == false ) {
return '';
@@ -772,7 +779,7 @@
'

';
-   if ( $wgUser->getName() == $user_name ) {
+   if ( $user->getName() == $user_name ) {
$output .= '' .
wfMessage( 'user-edit-this' 
)->escaped() . '';

[MediaWiki-commits] [Gerrit] mediawiki...PushToWatch[master]: Add minus-x to composer test and fix

2017-12-24 Thread Phantom42 (Code Review)

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

Change subject: Add minus-x to composer test and fix
..

Add minus-x to composer test and fix

Bug: T175794
Change-Id: Id8ed5462cda90f0fe02a042225b75ed9fc19c9ec
---
M PushToWatch.php
M composer.json
2 files changed, 7 insertions(+), 2 deletions(-)


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

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

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PdfExport[master]: Add minus-x to composer test and fix

2017-12-24 Thread Phantom42 (Code Review)

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

Change subject: Add minus-x to composer test and fix
..

Add minus-x to composer test and fix

Bug: T175794
Change-Id: Ia42f237a2a021326b1887cd3efafcbca0bca7193
---
M package.json
1 file changed, 10 insertions(+), 1 deletion(-)


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

diff --git a/package.json b/package.json
index e87548c..48490a0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,16 @@
 {
"private": true,
+   "require-dev": {
+   "mediawiki/minus-x": "0.2.1"
+   },
"scripts": {
-   "test": "grunt test"
+   "test": [
+   "grunt test",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
+   ]
},
"devDependencies": {
"grunt": "1.0.1",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSmartlist[master]: Add minus-x to composer test and fix

2017-12-24 Thread Florianschmidtwelzow (Code Review)

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

Change subject: Add minus-x to composer test and fix
..


Add minus-x to composer test and fix

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief6810d26f6070306be9b247abe3886f235e99ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceSmartlist
Gerrit-Branch: master
Gerrit-Owner: Albert221 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceUserManager[master]: Add minus-x to composer test and fix

2017-12-24 Thread Florianschmidtwelzow (Code Review)

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

Change subject: Add minus-x to composer test and fix
..


Add minus-x to composer test and fix

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6212b507d50965647cd6159c5addc8aa1a5bfad4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceUserManager
Gerrit-Branch: master
Gerrit-Owner: Albert221 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Zppix 
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...BlogPage[master]: Add minus-x to composer test and fix

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Add minus-x to composer test and fix
..


Add minus-x to composer test and fix

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I886409e371d8f73f20c0e5af36c437acbe8acccf
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: Phantom42 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: UltrasonicNXT 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Athena[master]: Add minus-x to composer test and fix

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Add minus-x to composer test and fix
..


Add minus-x to composer test and fix

Additionally fix minor spacing issue in AthenaHelper.php

Bug: T175794
Change-Id: I94e38542f8381f87bed9f9efb1540969f7b1db04
---
M AthenaHelper.php
M composer.json
M data/temp
3 files changed, 9 insertions(+), 4 deletions(-)

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



diff --git a/AthenaHelper.php b/AthenaHelper.php
old mode 100755
new mode 100644
index 7d03d99..256e7b6
--- a/AthenaHelper.php
+++ b/AthenaHelper.php
@@ -219,7 +219,7 @@
 
$sigma += log($probabilityArray['ac_p_linksgivenspam'] 
/ $probabilityArray['ac_p_linksgivennotspam']);
/* end links */
-   
+
$prob = $lnProbSpamNotSpam + $sigma;
 

//wfErrorLog("", 
'/var/www/html/a/extensions/Athena/data/debug.log');
@@ -1268,7 +1268,7 @@
 
/**
 * Concerts a language code returned by franc into a language code used 
by MediaWiki
- * 
+*
 * @param $code string
 * @return string
 */
diff --git a/composer.json b/composer.json
index aebd773..7d306d5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }
diff --git a/data/temp b/data/temp
old mode 100755
new mode 100644

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I94e38542f8381f87bed9f9efb1540969f7b1db04
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Athena
Gerrit-Branch: master
Gerrit-Owner: Phantom42 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: Zppix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: WikimediaUI theme: Align 'transparency' icon to WikimedaUI c...

2017-12-24 Thread VolkerE (Code Review)

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

Change subject: WikimediaUI theme: Align 'transparency' icon to WikimedaUI 
color palette
..

WikimediaUI theme: Align 'transparency' icon to WikimedaUI color palette

Change-Id: Ie714558cb5a170085acf332b94688821bb151d1b
---
M src/themes/wikimediaui/images/textures/transparency.svg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/09/400109/1

diff --git a/src/themes/wikimediaui/images/textures/transparency.svg 
b/src/themes/wikimediaui/images/textures/transparency.svg
index 14762de..d2eac03 100644
--- a/src/themes/wikimediaui/images/textures/transparency.svg
+++ b/src/themes/wikimediaui/images/textures/transparency.svg
@@ -1,5 +1,5 @@
 
 http://www.w3.org/2000/svg; width="16" height="16" viewBox="0 0 16 
16">
-   
+   

 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie714558cb5a170085acf332b94688821bb151d1b
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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...Vector[master]: Revert "Print styles in Vector are no longer feature flagged"

2017-12-24 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Print styles in Vector are no longer feature flagged"
..


Revert "Print styles in Vector are no longer feature flagged"

This reverts commit c863b94302a135dadeb9a0895548ed46391bbc0e.

This breaks the MediaWiki Installer ui.

Bug: T183640
Change-Id: I9f249db503c4df6ab9d87b97d9f2d1dca80744ba
---
M SkinVector.php
M skin.json
2 files changed, 23 insertions(+), 4 deletions(-)

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



diff --git a/SkinVector.php b/SkinVector.php
index 5dd6ef2..23dd944 100644
--- a/SkinVector.php
+++ b/SkinVector.php
@@ -44,6 +44,10 @@
/** @inheritDoc */
public function getPageClasses( $title ) {
$className = parent::getPageClasses( $title );
+   if ( $this->vectorConfig->get( 'VectorExperimentalPrintStyles' 
) ) {
+   $className .= ' vector-experimental-print-styles';
+   }
+   $className .= ' vector-nav-directionality';
return $className;
}
 
@@ -70,6 +74,14 @@
$this->enableResponsiveMode();
}
 
+   // Print styles are feature flagged.
+   // This flag can be removed when T169732 is resolved.
+   if ( $this->vectorConfig->get( 'VectorExperimentalPrintStyles' 
) ) {
+   // Note, when deploying (T169732) we'll want to fold 
the stylesheet into
+   // skins.vector.styles and remove this module 
altogether.
+   $out->addModuleStyles( 
'skins.vector.styles.experimental.print' );
+   }
+
$out->addModules( 'skins.vector.js' );
}
 
diff --git a/skin.json b/skin.json
index b2b079f..47bdb50 100644
--- a/skin.json
+++ b/skin.json
@@ -38,7 +38,6 @@
"@note": "When modifying skins.vector.styles definition, make sure the 
installer still works",
"ResourceModules": {
"skins.vector.styles": {
-   "class": "Vector\\ResourceLoaderLessModule",
"targets": [ "desktop", "mobile" ],
"position": "top",
"styles": {
@@ -47,11 +46,17 @@
},
"screen-hd.less": {
"media": "screen and (min-width: 982px)"
-   },
-   "print.less": {}
+   }
}
},
-
+   "skins.vector.styles.experimental.print": {
+   "class": "Vector\\ResourceLoaderLessModule",
+   "targets": [ "desktop", "mobile" ],
+   "position": "top",
+   "styles": [
+   "print.less"
+   ]
+   },
"skins.vector.styles.responsive": {
"targets": [ "desktop", "mobile" ],
"position": "top",
@@ -105,6 +110,8 @@
"config": {
"VectorUseSimpleSearch": true,
"VectorUseIconWatch": true,
+   "@VectorExperimentalPrintStyles": "Temporary config variable to 
feature flag new print styles (T154965)",
+   "VectorExperimentalPrintStyles": false,
"VectorResponsive": false,
"VectorPrintLogo": false
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f249db503c4df6ab9d87b97d9f2d1dca80744ba
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 >

1 - 100 of 125 matches

Mail list logo