Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
wiki.techinc.nl/tests/phpunit/includes/GlobalFunctions
History
WMDE-Fisch b94a2829d4 Get conflict results from diff3 
This patch extends the global wfMerge function to also return the
result of the first merge attempt that detects merge conflicts.

The additional output explicitly names the conflicting lines and
could help when solving edit conflicts.

Bug: T151320
Change-Id: I97acebdc87b31779200c7fde4dd4449cd1ee8ead
2017-12-06 13:25:35 +01:00
..
GlobalTest.php Get conflict results from diff3 2017-12-06 13:25:35 +01:00
GlobalWithDBTest.php Convert all array() syntax to [] 2016-02-17 01:33:00 -08:00
README
wfAppendQueryTest.php Support hash fragments in wfAppendQuery() 2016-05-02 19:18:24 -07:00
wfArrayFilterTest.php build: Prepare for mediawiki/mediawiki-codesniffer to 0.9.0 2017-06-26 17:14:31 +00:00
wfArrayPlus2dTest.php Convert all array() syntax to [] 2016-02-17 01:33:00 -08:00
wfAssembleUrlTest.php Convert all array() syntax to [] 2016-02-17 01:33:00 -08:00
wfBaseNameTest.php Convert all array() syntax to [] 2016-02-17 01:33:00 -08:00
wfEscapeShellArgTest.php Convert all array() syntax to [] 2016-02-17 01:33:00 -08:00
wfExpandUrlTest.php Convert all array() syntax to [] 2016-02-17 01:33:00 -08:00
wfGetCallerTest.php Use the frame 'type' in wfFormatStackFrame, like MWExceptionHandler::prettyPrintTrace 2015-10-14 16:40:02 +01:00
wfParseUrlTest.php Convert all array() syntax to [] 2016-02-17 01:33:00 -08:00
wfRemoveDotSegmentsTest.php Convert all array() syntax to [] 2016-02-17 01:33:00 -08:00
wfShellExecTest.php
wfShorthandToIntegerTest.php Convert all array() syntax to [] 2016-02-17 01:33:00 -08:00
wfStringToBoolTest.php Expose string->bool conversion as function 2017-11-15 06:57:40 +00:00
wfThumbIsStandardTest.php Remove test code that depends on extension 2017-08-13 12:04:37 -04:00
wfTimestampTest.php build: Updating mediawiki/mediawiki-codesniffer to 0.12.0 2017-09-10 21:11:37 +02:00
wfUrlencodeTest.php Remove empty lines from PHP and JavaScript comment blocks 2016-12-09 09:01:06 +00:00

README 

This directory hold tests for includes/GlobalFunctions.php file
which is a pile of functions.