lhc/web/wiklou.git
7 years agoClean up tests for FauxRequest/WebRequest
Timo Tijhof [Fri, 9 Sep 2016 22:35:19 +0000 (15:35 -0700)]
Clean up tests for FauxRequest/WebRequest

Follows-up 1ac5474b7b and d18d030d57.

* Always mock WebRequest in WebRequestTest.
  Avoid using FauxRequest, can easily cause false positives (it's already
  avoided in one case of that reason).

* Add a few smoke/integration tests in FauxRequest to make sure the parent
  methods work as expected, given the internal method being overridden
  in FauxRequest.

Change-Id: I1bf528f3c578ecb171a3ff4f17b26f9bb02b4f47

7 years agoMerge "Add more version notes to WANObjectCache"
jenkins-bot [Fri, 9 Sep 2016 21:31:54 +0000 (21:31 +0000)]
Merge "Add more version notes to WANObjectCache"

7 years agoMerge "Chinese Conversion Table Update 2016-6"
jenkins-bot [Fri, 9 Sep 2016 21:26:08 +0000 (21:26 +0000)]
Merge "Chinese Conversion Table Update 2016-6"

7 years agoAdd more version notes to WANObjectCache
Aaron Schulz [Fri, 9 Sep 2016 20:41:03 +0000 (13:41 -0700)]
Add more version notes to WANObjectCache

Change-Id: Ia1b74b568d2b5137c7096a3b4549ac2cd4c7fa93

7 years agoLocalisation updates from https://translatewiki.net.
Translation updater bot [Fri, 9 Sep 2016 20:22:25 +0000 (22:22 +0200)]
Localisation updates from https://translatewiki.net.

Change-Id: I0a15f0872c222b8be6576ea43a98cbc14c8c3a1a

7 years agoMerge "objectcache: add "staleTTL" option to WANObjectCache::set()"
jenkins-bot [Fri, 9 Sep 2016 17:38:45 +0000 (17:38 +0000)]
Merge "objectcache: add "staleTTL" option to WANObjectCache::set()"

7 years agoMerge "Hide signup/login/logout links when they would not work"
jenkins-bot [Fri, 9 Sep 2016 15:18:36 +0000 (15:18 +0000)]
Merge "Hide signup/login/logout links when they would not work"

7 years agoMerge "Make $wgRevisionCacheExpiry default to one week"
jenkins-bot [Fri, 9 Sep 2016 10:37:49 +0000 (10:37 +0000)]
Merge "Make $wgRevisionCacheExpiry default to one week"

7 years agoMerge "JsonContentHandler: Make sure makeEmptyContent() is valid JSON"
jenkins-bot [Fri, 9 Sep 2016 08:29:15 +0000 (08:29 +0000)]
Merge "JsonContentHandler: Make sure makeEmptyContent() is valid JSON"

7 years agoMerge "Cleanup and re-indent some WANObjectCache docs"
jenkins-bot [Fri, 9 Sep 2016 08:17:28 +0000 (08:17 +0000)]
Merge "Cleanup and re-indent some WANObjectCache docs"

7 years agoobjectcache: add "staleTTL" option to WANObjectCache::set()
Aaron Schulz [Fri, 9 Sep 2016 08:05:55 +0000 (01:05 -0700)]
objectcache: add "staleTTL" option to WANObjectCache::set()

Change-Id: Ib9386a8ad4ab98d07d0a3784e3afffeeca9bbd6e

7 years agoMerge "Allow --profile to be used in phpunit.php"
jenkins-bot [Fri, 9 Sep 2016 07:58:55 +0000 (07:58 +0000)]
Merge "Allow --profile to be used in phpunit.php"

7 years agoCleanup and re-indent some WANObjectCache docs
Aaron Schulz [Fri, 9 Sep 2016 07:57:57 +0000 (00:57 -0700)]
Cleanup and re-indent some WANObjectCache docs

Change-Id: Ibf7092297ce53fd21e478a6f87a16f9b4373ad85

7 years agoMerge "Split up testHelpers.inc, break off fuzz testing"
jenkins-bot [Fri, 9 Sep 2016 07:56:46 +0000 (07:56 +0000)]
Merge "Split up testHelpers.inc, break off fuzz testing"

7 years agoMerge "WebRequest: Add more unit tests"
jenkins-bot [Fri, 9 Sep 2016 06:54:45 +0000 (06:54 +0000)]
Merge "WebRequest: Add more unit tests"

7 years agoLinkBatch: Set visibility and document constructor
Kunal Mehta [Fri, 9 Sep 2016 05:02:39 +0000 (22:02 -0700)]
LinkBatch: Set visibility and document constructor

Change-Id: I9d8edeb214b9d7507826004e470dcb5c1ef015f6

7 years agoTitle: Document that Title::compare() can be used for LinkTargets
Kunal Mehta [Fri, 9 Sep 2016 04:58:55 +0000 (21:58 -0700)]
Title: Document that Title::compare() can be used for LinkTargets

It only depends upon functions that are all in the LinkTarget interface.

Change-Id: I95e598ea6014ced8f1b947c283dd0b542756b8e2

7 years agoWebRequest: Add more unit tests
Timo Tijhof [Fri, 9 Sep 2016 04:58:09 +0000 (21:58 -0700)]
WebRequest: Add more unit tests

* Complete detectServer() coverage,
  test $wgAssumeProxiesUseDefaultProtocolPorts.
* Complete getAcceptLang() coverage.
* Add tests for getGPCVal() normalisation.
* Add tests for other getter methods.

Also:

* Ignore __construct() coverage as it only sets up properties from
  global state. The use of those properties are covered.

* Make normalizeUnicode() visibility explicit.

Change-Id: I6504136e6df47e504bc2e0e91fedddd2625f19d9

7 years agoMerge "rollback: Log content model changes"
jenkins-bot [Fri, 9 Sep 2016 04:55:52 +0000 (04:55 +0000)]
Merge "rollback: Log content model changes"

7 years agoMerge "InfoAction: Add a link to Special:ChangeContentModel if allowed"
jenkins-bot [Fri, 9 Sep 2016 04:16:05 +0000 (04:16 +0000)]
Merge "InfoAction: Add a link to Special:ChangeContentModel if allowed"

7 years agorollback: Log content model changes
Kunal Mehta [Fri, 9 Sep 2016 04:09:24 +0000 (21:09 -0700)]
rollback: Log content model changes

If the content model changes during a rollback, make sure it is logged
to Special:Log/contentmodel.

Change-Id: Icd9a2b0221468936e186178ef09141c09e053cbb

7 years agoMerge "Only apply DB_MASTER fallback in Revision::fetchText() if READ_LATEST"
jenkins-bot [Fri, 9 Sep 2016 03:47:43 +0000 (03:47 +0000)]
Merge "Only apply DB_MASTER fallback in Revision::fetchText() if READ_LATEST"

7 years agoMerge "API: When undoing an edit, allow overriding content model."
jenkins-bot [Fri, 9 Sep 2016 03:30:31 +0000 (03:30 +0000)]
Merge "API: When undoing an edit, allow overriding content model."

7 years agoMerge "Allow undoing edits that change content model if top"
jenkins-bot [Fri, 9 Sep 2016 03:27:42 +0000 (03:27 +0000)]
Merge "Allow undoing edits that change content model if top"

7 years agoAPI: When undoing an edit, allow overriding content model.
Brian Wolff [Thu, 8 Sep 2016 23:43:36 +0000 (23:43 +0000)]
API: When undoing an edit, allow overriding content model.

This brings the API in line with web UI changes from Ic528f65d.

Bug: T145044
Change-Id: Ib97eef38d228c4da4b062ee96ddbbbb926ee665b

7 years agoAllow undoing edits that change content model if top
Brian Wolff [Thu, 8 Sep 2016 22:39:03 +0000 (22:39 +0000)]
Allow undoing edits that change content model if top

This allows people to revert content model changes
using the undo button, provided that we are undoing
the topmost edit (Otherwise it may get confusing
if you try to undo an edit in the middle of the
history that changes content model).

Bug: T145044
Change-Id: Ic528f65d0dc581c4e241a22f19c512e02aeaa9e7

7 years agoMerge "Make sure the lock in JobRunner::commitMasterChanges() releases"
jenkins-bot [Fri, 9 Sep 2016 03:04:59 +0000 (03:04 +0000)]
Merge "Make sure the lock in JobRunner::commitMasterChanges() releases"

7 years agoMerge "Switch some callers to WaitConditionLoop"
jenkins-bot [Fri, 9 Sep 2016 02:57:13 +0000 (02:57 +0000)]
Merge "Switch some callers to WaitConditionLoop"

7 years agoMake $wgRevisionCacheExpiry default to one week
Aaron Schulz [Wed, 7 Sep 2016 21:19:31 +0000 (14:19 -0700)]
Make $wgRevisionCacheExpiry default to one week

* If CACHE_DB is used, it will not use the cache however.
* If persistent cache is disabled, at least maintain the
  process caching.

Change-Id: I23b455ef46f27c313bb9573f69723b1436b2d584

7 years agoMerge "FauxRequest: Add unit tests to expand code coverage"
jenkins-bot [Fri, 9 Sep 2016 02:47:05 +0000 (02:47 +0000)]
Merge "FauxRequest: Add unit tests to expand code coverage"

7 years agoFauxRequest: Add unit tests to expand code coverage
Timo Tijhof [Fri, 9 Sep 2016 02:37:37 +0000 (19:37 -0700)]
FauxRequest: Add unit tests to expand code coverage

* Remove @covers for methods that don't exist (parent class).
* Fix coverage for initHeaders() and setHeaders().
* Add tests and coverage for all other methods.

Change-Id: Id9b6de31843d2e87c54f485beb4fbcbe6f4bf8f6

7 years agoSwitch some callers to WaitConditionLoop
Aaron Schulz [Thu, 8 Sep 2016 07:12:56 +0000 (00:12 -0700)]
Switch some callers to WaitConditionLoop

Also fixed up backwards documentation

Change-Id: I00c36aa751a79ca86a754e049a6da78cbb417b81

7 years agoMerge "Preload ResourceLoaderWikiModule::getTitleInfo in OutputPage"
jenkins-bot [Fri, 9 Sep 2016 01:11:07 +0000 (01:11 +0000)]
Merge "Preload ResourceLoaderWikiModule::getTitleInfo in OutputPage"

7 years agoMerge "Avoid user autocreation race condition caused by repeatable read"
jenkins-bot [Fri, 9 Sep 2016 00:28:52 +0000 (00:28 +0000)]
Merge "Avoid user autocreation race condition caused by repeatable read"

7 years agoInfoAction: Add a link to Special:ChangeContentModel if allowed
Kunal Mehta [Fri, 9 Sep 2016 00:08:21 +0000 (17:08 -0700)]
InfoAction: Add a link to Special:ChangeContentModel if allowed

If the user is allowed to change the content model of the page,
then add a link to it on ?action=info, next to the localized content
model name.

Change-Id: I084e8f390f90d29ed2e2d0f8ab43bcdfe8538ad1

7 years agoAvoid user autocreation race condition caused by repeatable read
Gergő Tisza [Thu, 8 Sep 2016 22:40:20 +0000 (22:40 +0000)]
Avoid user autocreation race condition caused by repeatable read

AuthManager tries to check whether the user already exists if
User::addToDatabase fails in autocreation, but since the same DB row
was already checked a few lines earlier and this method is typically
wrapped in an implicit transaction, it will just re-read the same
snapshot and not do anything useful. addToDatabase already has
a check for that so let's rely on that instead.

Bug: T145131
Change-Id: I94a5e8b851dcf994f5f9e773edf4e9153a4a3535

7 years agoPreload ResourceLoaderWikiModule::getTitleInfo in OutputPage
Aaron Schulz [Thu, 8 Sep 2016 08:38:26 +0000 (01:38 -0700)]
Preload ResourceLoaderWikiModule::getTitleInfo in OutputPage

This avoids a separate query for each module.

Bug: T46362
Change-Id: Ie109a8776cbdcd5928cbb59351f2cf94088c0c95

7 years agoLocalisation updates from https://translatewiki.net.
Translation updater bot [Thu, 8 Sep 2016 21:10:04 +0000 (23:10 +0200)]
Localisation updates from https://translatewiki.net.

Change-Id: I11dbcc26b7ee18146c907c309bbc67ba4ccc9339

7 years agoMerge "objectcache: expose "minTime" in WAN cache and call it "minAsOf" instead"
jenkins-bot [Thu, 8 Sep 2016 20:52:35 +0000 (20:52 +0000)]
Merge "objectcache: expose "minTime" in WAN cache and call it "minAsOf" instead"

7 years agoobjectcache: expose "minTime" in WAN cache and call it "minAsOf" instead
Aaron Schulz [Thu, 8 Sep 2016 20:42:17 +0000 (13:42 -0700)]
objectcache: expose "minTime" in WAN cache and call it "minAsOf" instead

Change-Id: Iabb639dddb9458d961dbbaee6a0dfb2323c2739a

7 years agoMerge "Fix IDEA warnings in CategoryMembershipChangeJob"
jenkins-bot [Thu, 8 Sep 2016 20:38:55 +0000 (20:38 +0000)]
Merge "Fix IDEA warnings in CategoryMembershipChangeJob"

7 years agoJsonContentHandler: Make sure makeEmptyContent() is valid JSON
Kunal Mehta [Thu, 8 Sep 2016 06:18:47 +0000 (23:18 -0700)]
JsonContentHandler: Make sure makeEmptyContent() is valid JSON

The default TextContentHandler::makeEmptyContent() implementation
is an empty string, which is not valid JSON.

Change-Id: I8bc6ec647c5e8cd01c5cd63031525619c4ef44d0

7 years agoobjectcache: pass in the $oldValue as-of time in getWithSetCallback()
Aaron Schulz [Thu, 8 Sep 2016 18:34:39 +0000 (11:34 -0700)]
objectcache: pass in the $oldValue as-of time in getWithSetCallback()

This lets callers use adaptive TTLs on the near-expiration
preemptive refreshes if the new and current values match,
using the as-of time as $mtime.

Change-Id: Ie541c35f890c9f789d1accf9f2a43506daaf31f0

7 years agoHide signup/login/logout links when they would not work
Gergő Tisza [Wed, 7 Sep 2016 05:50:35 +0000 (05:50 +0000)]
Hide signup/login/logout links when they would not work

Immutable session providers do not support login and logout;
these pages would just show an error when such a session provider
is handling the authentication of the request. Depending on what
authentication providers are configured, the wiki might not
support account creation. Showing the links is unhelpful if
they would just show an obscure error message.

(OTOH don't try to hide the link when the reason it is not
usable depends on the user; specifically, don't check
AuthManager::checkAccountCreatePermissions. An error message
is more informative in that case than a missing link.)

Also improve how the affected special pages behave if the user
manages to get there anyway.

Change-Id: Ic0ad237259797a8d471bdabc57a4bd0ffe8fa33b

7 years agoMerge "LinkFilter: Fix return types in phpdoc"
jenkins-bot [Thu, 8 Sep 2016 15:32:11 +0000 (15:32 +0000)]
Merge "LinkFilter: Fix return types in phpdoc"

7 years agoFix doc typo in InterwikiLookup
Leszek Manicki [Thu, 8 Sep 2016 13:11:55 +0000 (15:11 +0200)]
Fix doc typo in InterwikiLookup

Change-Id: I2a547a005955cb9f596ff6927feb7df3d5d91872

7 years agoFix IDEA warnings in CategoryMembershipChangeJob
Aaron Schulz [Thu, 8 Sep 2016 13:03:22 +0000 (06:03 -0700)]
Fix IDEA warnings in CategoryMembershipChangeJob

Change-Id: I0ee952c59cccf00167d468adb49d4bf811a80dc9

7 years agoMerge "database: rename clearSnapshot() => flushSnapshot()"
jenkins-bot [Thu, 8 Sep 2016 12:36:35 +0000 (12:36 +0000)]
Merge "database: rename clearSnapshot() => flushSnapshot()"

7 years agodatabase: rename clearSnapshot() => flushSnapshot()
Aaron Schulz [Thu, 8 Sep 2016 11:28:52 +0000 (04:28 -0700)]
database: rename clearSnapshot() => flushSnapshot()

* This is more consistent with the name flushReplicaSnapshots().
* Also add it to IDatabase, which defines the modern OLTP methods
  of DatabaseBase. This methods is useful for callers that get
  locks or wait for a replica DB to catch up before querying it.

Change-Id: Ia31e480bb9ccf461bf05ede4278920918eec4f16

7 years agoMerge "ContentHandler: Remove entirely-unused mModelName property"
jenkins-bot [Thu, 8 Sep 2016 11:10:01 +0000 (11:10 +0000)]
Merge "ContentHandler: Remove entirely-unused mModelName property"

7 years agoMake sure the lock in JobRunner::commitMasterChanges() releases
Aaron Schulz [Thu, 8 Sep 2016 09:19:32 +0000 (02:19 -0700)]
Make sure the lock in JobRunner::commitMasterChanges() releases

Used a ScopedCallback in case of exception to avoid queue backup

Change-Id: I58a5f152a54ed9a0d5544014788792bd62afbf4a

7 years agoMerge "Run tests from MediaWiki-Vagrant virtual machine headlessly"
jenkins-bot [Thu, 8 Sep 2016 09:10:45 +0000 (09:10 +0000)]
Merge "Run tests from MediaWiki-Vagrant virtual machine headlessly"

7 years agoMerge "Rollback: Change @since 1.27 to @since 1.28"
jenkins-bot [Thu, 8 Sep 2016 07:02:13 +0000 (07:02 +0000)]
Merge "Rollback: Change @since 1.27 to @since 1.28"

7 years agoContentHandler: Remove entirely-unused mModelName property
Kunal Mehta [Thu, 8 Sep 2016 06:10:12 +0000 (23:10 -0700)]
ContentHandler: Remove entirely-unused mModelName property

This property isn't documented anywhere nor used anywhere.

Change-Id: I37b20260c6abbec49364b31183dd2337be44846b

7 years agoMerge "Don't throw exceptions in ContentHandler::getUndoContent()"
jenkins-bot [Thu, 8 Sep 2016 05:07:13 +0000 (05:07 +0000)]
Merge "Don't throw exceptions in ContentHandler::getUndoContent()"

7 years agoMerge "Run database-using tests in MySQL STRICT mode"
jenkins-bot [Thu, 8 Sep 2016 04:20:45 +0000 (04:20 +0000)]
Merge "Run database-using tests in MySQL STRICT mode"

7 years agoRollback: Change @since 1.27 to @since 1.28
Fomafix [Thu, 8 Sep 2016 04:13:09 +0000 (06:13 +0200)]
Rollback: Change @since 1.27 to @since 1.28

9af38c04 is not included in REL1.27.

Follows-up to 9af38c04

Change-Id: I377028aec91d15b63257baf522b5aa2dbd12d43b

7 years agoMerge "resourceloader: Preload WikiModule::getTitleInfo() in batches"
jenkins-bot [Thu, 8 Sep 2016 03:53:04 +0000 (03:53 +0000)]
Merge "resourceloader: Preload WikiModule::getTitleInfo() in batches"

7 years agoDon't throw exceptions in ContentHandler::getUndoContent()
Kunal Mehta [Thu, 8 Sep 2016 03:52:19 +0000 (20:52 -0700)]
Don't throw exceptions in ContentHandler::getUndoContent()

The method is not documented to throw any exceptions, and already
returns false on failure, and it can be seen as a failure case when the
content models are not the same.

Bug: T145044
Change-Id: I0394d19cd65f9dd3ee350d2cde95afb11ab9e7f4

7 years agoOnly apply DB_MASTER fallback in Revision::fetchText() if READ_LATEST
Aaron Schulz [Wed, 7 Sep 2016 19:42:03 +0000 (12:42 -0700)]
Only apply DB_MASTER fallback in Revision::fetchText() if READ_LATEST

Add support to DBAccessObjectUtils for fallback logic to make
this simple for other callers too.

Change-Id: I58ab7bd7d31a481f9dc9a773392ea90feb1ebeac

7 years agoMerge "resourceloader: Simplify WikiModule::getTitleInfo() DB query"
jenkins-bot [Thu, 8 Sep 2016 03:42:53 +0000 (03:42 +0000)]
Merge "resourceloader: Simplify WikiModule::getTitleInfo() DB query"

7 years agoresourceloader: Preload WikiModule::getTitleInfo() in batches
Timo Tijhof [Thu, 8 Sep 2016 03:26:48 +0000 (20:26 -0700)]
resourceloader: Preload WikiModule::getTitleInfo() in batches

Test plan:
* Request load.php?modules=startup&only=scripts
* Debug log receives 1 entry in the 'queries' channel from
  ResourceLoaderWikiModule, and it comes from preloadTitleInfo.

Bug: T46362
Change-Id: I82e215745af6b8446cd69282b2c943afbbd45065

7 years agoresourceloader: Simplify WikiModule::getTitleInfo() DB query
Timo Tijhof [Thu, 8 Sep 2016 02:24:49 +0000 (19:24 -0700)]
resourceloader: Simplify WikiModule::getTitleInfo() DB query

While rev_sha1 was preferred to rev_id (page_latest) to allow
client-cache to be re-used in case of a bad change and revert,
this is no longer possible since we recently added support for
explicit purging by considering page_touched.

As such, use of rev_sha1 is no longer useful.

Change-Id: Iddb65305ca4655098fdea9fcf736fd4046035dd7

7 years agoAdd rate limits for changing a page's content model
Kunal Mehta [Thu, 8 Sep 2016 01:38:19 +0000 (18:38 -0700)]
Add rate limits for changing a page's content model

The defaults are set to the same value as page moves.

Change-Id: I72d6c35ecda475101c1c909715e4ba693dd214f6

7 years agoobjectcache: Avoid doxygen misformatting for pcGroup comments
Aaron Schulz [Thu, 8 Sep 2016 00:55:30 +0000 (17:55 -0700)]
objectcache: Avoid doxygen misformatting for pcGroup comments

Change-Id: I970bc9ccb04b046c563a357d87f814da652e23d2

7 years agoMerge "objectcache: add "pcGroup" option to WANObjectCache::getWithSetCallback()"
jenkins-bot [Thu, 8 Sep 2016 00:25:27 +0000 (00:25 +0000)]
Merge "objectcache: add "pcGroup" option to WANObjectCache::getWithSetCallback()"

7 years agoobjectcache: add "pcGroup" option to WANObjectCache::getWithSetCallback()
Aaron Schulz [Wed, 7 Sep 2016 22:36:14 +0000 (15:36 -0700)]
objectcache: add "pcGroup" option to WANObjectCache::getWithSetCallback()

This lets callers have their own process cache but keep it
managed in a central location, making it easier to reset
when DB transaction snapshot are flushed or when unit tests
want to clear caches between runs.

Use this to replace the Revision text process cache.

Change-Id: Ic61ee9140d4ce9836cc4650adb5bb75a291fea18

7 years agoAllow --profile to be used in phpunit.php
Tim Starling [Wed, 31 Aug 2016 02:53:21 +0000 (12:53 +1000)]
Allow --profile to be used in phpunit.php

This requires running PHPUnit from within execute() -- we're calling a
function so it doesn't benefit from being in global scope.

Change-Id: I4b6a3613bc89047a9f32505afabaff98b3655e1a

7 years agoSplit up testHelpers.inc, break off fuzz testing
Tim Starling [Mon, 29 Aug 2016 22:27:54 +0000 (08:27 +1000)]
Split up testHelpers.inc, break off fuzz testing

* Split up testHelpers.inc into one class per file, with the file named
  after the class per the usual convention. Put them in tests/parser
  since they are all parser-related, even though a couple are reused by
  other unit tests.
* Also rename parserTest.inc and parserTestsParserHook.php to follow the
  usual convention, and split off ParserTestResultNormalizer
* Move fuzz testing out to its own maintenance script. It's really not
  helpful to have fuzz testing, which is designed to run forever,
  exposed as a PHPUnit test.
* Increased fuzz test memory limit, and increased the memory headroom for
  getMemoryBreakdown(), since HHVM's ReflectionClass has an internal
  cache which uses quite a lot of memory.
* Temporarily switched a couple of ParserTest methods from private to
  public to support fuzz testing from a separate class -- I plan on
  replacing this interface in a subsequent commit.

Change-Id: Ib1a07e109ec1005bff2751b78eb4de35f2dfc472

7 years agoMerge "SpecialDeletedContributions: Don't force a known link in subtitle"
jenkins-bot [Wed, 7 Sep 2016 22:16:43 +0000 (22:16 +0000)]
Merge "SpecialDeletedContributions: Don't force a known link in subtitle"

7 years agoresourceloader: Use makeVersionQuery for 'version' query parameter
Timo Tijhof [Wed, 7 Sep 2016 21:39:22 +0000 (14:39 -0700)]
resourceloader: Use makeVersionQuery for 'version' query parameter

makeVersionQuery and getCombinedVersion return the same string in
most cases, but there are exceptions, and it could diverge further
in the future. Use the semantically correct method.

Before 6fa1e56 it didn't matter how 'version' was computed as long
as it's deterministic and sufficiently unique. Now that we validate
the hashes it's important all methods use the same logic.

Rename method to makeVersionQuery since it's no longer used just
for comparison against the expected value.

Change-Id: I19f5818e27c8a0920d3d1374b40aeb0b6ba0b614

7 years agoMerge "RollbackAction: Allow 'from' to be an empty string"
jenkins-bot [Wed, 7 Sep 2016 21:17:47 +0000 (21:17 +0000)]
Merge "RollbackAction: Allow 'from' to be an empty string"

7 years agoRollbackAction: Allow 'from' to be an empty string
Timo Tijhof [Wed, 7 Sep 2016 20:52:42 +0000 (13:52 -0700)]
RollbackAction: Allow 'from' to be an empty string

Fix regression from 9af38c046c86, which made 'from' a required
non-empty parameter where previously an empty value was allowed.

The rollback links always include a 'from' parameter, but it is
set to an empty string by Revision::getUserText if the current
revision has its username hidden.

Test plan:
* Go to action=history, tick latest revision and "Change visibility".
* Tick "Editor's username" and apply the change.
* Hit "rollback" on the history page.
* Before: "missing parameter" error.
  After: Success.

Bug: T141985
Change-Id: I20d23e2aeec858f82231910c030c14ffa3af656f

7 years agoRevision: Simplify loadText() with nested getWithSetCallback
Timo Tijhof [Wed, 7 Sep 2016 01:34:43 +0000 (18:34 -0700)]
Revision: Simplify loadText() with nested getWithSetCallback

Check the MapCacheLRU::get() return value properly for misses
this time.

This reverts commit 1f022240c73f0909d8d3eb457ede12119190621a.

Change-Id: Ic95b79ad8d7d7c788f406d45c0e9bedeeb8d220b

7 years agoMerge "Revert "Revision: Simplify loadText() with nested getWithSetCallback""
jenkins-bot [Wed, 7 Sep 2016 20:42:56 +0000 (20:42 +0000)]
Merge "Revert "Revision: Simplify loadText() with nested getWithSetCallback""

7 years agoMerge "Documentation: Replace misuse of 'later' when we meant 'latter'"
jenkins-bot [Wed, 7 Sep 2016 20:36:16 +0000 (20:36 +0000)]
Merge "Documentation: Replace misuse of 'later' when we meant 'latter'"

7 years agoRevert "Revision: Simplify loadText() with nested getWithSetCallback"
Mattflaschen [Wed, 7 Sep 2016 20:34:58 +0000 (20:34 +0000)]
Revert "Revision: Simplify loadText() with nested getWithSetCallback"

This reverts commit aa0f6ead348d0aa3f59d51df0806e95eb76babf8.

Change-Id: I285ada2e86f014b93c7e7946f10d2dc84375fcff

7 years agoMerge "Fix ApiStashEdit IDEA warnings"
jenkins-bot [Wed, 7 Sep 2016 20:23:16 +0000 (20:23 +0000)]
Merge "Fix ApiStashEdit IDEA warnings"

7 years agoDocumentation: Replace misuse of 'later' when we meant 'latter'
James D. Forrester [Wed, 7 Sep 2016 20:12:38 +0000 (13:12 -0700)]
Documentation: Replace misuse of 'later' when we meant 'latter'

Change-Id: I01bfdb8e0bfaa132533732873f7c840cea7935eb

7 years agoLocalisation updates from https://translatewiki.net.
Translation updater bot [Wed, 7 Sep 2016 20:08:41 +0000 (22:08 +0200)]
Localisation updates from https://translatewiki.net.

Change-Id: Ib4a52f1616cdf4ed928731f1341e094a7f35092b

7 years agoTrivial: Typo fix in comment
Subramanya Sastry [Wed, 7 Sep 2016 19:43:57 +0000 (14:43 -0500)]
Trivial: Typo fix in comment

Change-Id: I7ad1ee3ca1e3007e70b5566209e3bbbc9b19201a

7 years agoFix ApiStashEdit IDEA warnings
Aaron Schulz [Wed, 7 Sep 2016 19:00:52 +0000 (12:00 -0700)]
Fix ApiStashEdit IDEA warnings

Change-Id: Icc1d0225908e432df10c36d69c6ed282f8761198

7 years agoMerge "Revision: Simplify loadText() with nested getWithSetCallback"
jenkins-bot [Wed, 7 Sep 2016 18:55:11 +0000 (18:55 +0000)]
Merge "Revision: Simplify loadText() with nested getWithSetCallback"

7 years agoMerge "Style and IDEA warning cleanups"
jenkins-bot [Wed, 7 Sep 2016 18:48:36 +0000 (18:48 +0000)]
Merge "Style and IDEA warning cleanups"

7 years agoRevision: Simplify loadText() with nested getWithSetCallback
Timo Tijhof [Wed, 7 Sep 2016 01:34:43 +0000 (18:34 -0700)]
Revision: Simplify loadText() with nested getWithSetCallback

The logic was a bit hard to follow as there were two layers of
caching and a conditional (expiry being set).

* Move fetch logic for revision text to a private method.
* Call directly when cache is disabled.
* Simplify cache has/get/set by using getWithSetCallback.

Change-Id: Icd74cd8e944266c20dc7c5cb25f56300636dce1e

7 years agoMerge "Grant 'editcontentmodel' permission to 'user' group"
jenkins-bot [Wed, 7 Sep 2016 18:31:24 +0000 (18:31 +0000)]
Merge "Grant 'editcontentmodel' permission to 'user' group"

7 years agoMerge "Remove ancient DB_READ/DB_WRITE constants"
jenkins-bot [Wed, 7 Sep 2016 18:16:40 +0000 (18:16 +0000)]
Merge "Remove ancient DB_READ/DB_WRITE constants"

7 years agoMerge "Avoid redundant COMMIT calls on page views"
jenkins-bot [Wed, 7 Sep 2016 18:08:47 +0000 (18:08 +0000)]
Merge "Avoid redundant COMMIT calls on page views"

7 years agoGrant 'editcontentmodel' permission to 'user' group
Kunal Mehta [Wed, 7 Sep 2016 18:00:42 +0000 (11:00 -0700)]
Grant 'editcontentmodel' permission to 'user' group

Bug: T85847
Change-Id: Iad834e757ac6f37ad64ac9e93afe93160aabc842

7 years agoAvoid redundant COMMIT calls on page views
Aaron Schulz [Wed, 7 Sep 2016 16:07:01 +0000 (09:07 -0700)]
Avoid redundant COMMIT calls on page views

These just clear empty transactions and do not do anything
otherwise. No need in doing a few extra RTTs for that.

This also avoids "could not COMMIT" errors when transaction
callbacks do silly things like add more callbacks to outside
DBs. In that case, they either ran their callbacks already or
calling clearSnapshot() will error out.

Change-Id: I4d52c4ef69b02a33adffd8892b98ad1bd5c7d6dc

7 years agoRun tests from MediaWiki-Vagrant virtual machine headlessly
Željko Filipin [Wed, 7 Sep 2016 16:48:52 +0000 (18:48 +0200)]
Run tests from MediaWiki-Vagrant virtual machine headlessly

Bug: T108108
Change-Id: Ic51f3f794484ebb93c525d5f347d1e4930289d5b

7 years agoSpecialDeletedContributions: Don't force a known link in subtitle
Florian Schmidt [Wed, 7 Sep 2016 17:15:59 +0000 (19:15 +0200)]
SpecialDeletedContributions: Don't force a known link in subtitle

The link to the user page isn't known by default, as it should be
marked as "red"/non-existing page, if the user page isn't created,
yet.

Bug: T144012
Change-Id: Ie8b70d05915ef6189dfb9acd4ebf1d1391f58b3c

7 years agoMerge "API: Fix query+authmanagerinfo example message names"
jenkins-bot [Wed, 7 Sep 2016 17:02:14 +0000 (17:02 +0000)]
Merge "API: Fix query+authmanagerinfo example message names"

7 years agoRemove ancient DB_READ/DB_WRITE constants
Aaron Schulz [Wed, 7 Sep 2016 16:50:25 +0000 (09:50 -0700)]
Remove ancient DB_READ/DB_WRITE constants

Change-Id: I23f4c52312317e41710bc12eefe6e821f9b9e9f3

7 years agoMerge "SpecialUpload: Give a context title to getExistsWarning() messages"
jenkins-bot [Wed, 7 Sep 2016 16:41:48 +0000 (16:41 +0000)]
Merge "SpecialUpload: Give a context title to getExistsWarning() messages"

7 years agoMake adaptiveTTL() less strict about $mtime type
Aaron Schulz [Wed, 7 Sep 2016 16:18:37 +0000 (09:18 -0700)]
Make adaptiveTTL() less strict about $mtime type

Callers using wfTimestamp( TS_UNIX, ... ) where getting $minTTL
due to the output being a string number.

Change-Id: I6b67a941940f40ef9a543f11d0dbccacafaaa53b

7 years agoStyle and IDEA warning cleanups
Aaron Schulz [Wed, 7 Sep 2016 15:40:39 +0000 (08:40 -0700)]
Style and IDEA warning cleanups

* Avoid deprecated method use in MediaWiki.php.
* Move LBFactory::beginMasterChanges down a bit, next
  to LBFactory::commitMasterChanges.
* Rename $factory => $lbFactory.
* Remove redundant $conn->trxLevel() check.

Change-Id: I309ff3b8e3f586f0ac40b2f3be26b161993b58d2

7 years agoMerge "Clarify that $terms get preg_quoted by caller in SearchHighlighter"
jenkins-bot [Wed, 7 Sep 2016 14:18:43 +0000 (14:18 +0000)]
Merge "Clarify that $terms get preg_quoted by caller in SearchHighlighter"

7 years agoRun database-using tests in MySQL STRICT mode
Aaron Schulz [Fri, 2 Sep 2016 16:57:40 +0000 (09:57 -0700)]
Run database-using tests in MySQL STRICT mode

Change-Id: Ib2873913102d7a7fcd84d1860725fb501cb41b64

7 years agoCache NS_TEMPLATE/NS_FILE titles in LinkCache persistently
Aaron Schulz [Fri, 2 Sep 2016 14:19:13 +0000 (07:19 -0700)]
Cache NS_TEMPLATE/NS_FILE titles in LinkCache persistently

Queries from parsing are the top use of selectRow() according
to reverse flame graphs on xenon. This does not bother with
pages in namespaces less likely to be included.

Change-Id: Ica5d6e52c830cd71effff21933b8c64691082c11