From: jenkins-bot Date: Fri, 29 Dec 2017 10:28:24 +0000 (+0000) Subject: Merge "Revert "[MCR] Add and use $title param to RevisionStore getPrevious/Next"" X-Git-Tag: 1.31.0-rc.0~1052 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=8f883450e1d95879ab9c60f5aa1032d4f2d9b395;hp=69f9a18e461584d6a7240276baca13d037644d06 Merge "Revert "[MCR] Add and use $title param to RevisionStore getPrevious/Next"" --- diff --git a/includes/Storage/RevisionLookup.php b/includes/Storage/RevisionLookup.php index 5cd157ba07..afe0f816d3 100644 --- a/includes/Storage/RevisionLookup.php +++ b/includes/Storage/RevisionLookup.php @@ -22,7 +22,7 @@ namespace MediaWiki\Storage; -use \IDBAccessObject; +use IDBAccessObject; use MediaWiki\Linker\LinkTarget; use Title; diff --git a/includes/Storage/RevisionStore.php b/includes/Storage/RevisionStore.php index c22ed307e2..ce56efceaa 100644 --- a/includes/Storage/RevisionStore.php +++ b/includes/Storage/RevisionStore.php @@ -32,7 +32,7 @@ use Content; use ContentHandler; use DBAccessObjectUtils; use Hooks; -use \IDBAccessObject; +use IDBAccessObject; use InvalidArgumentException; use IP; use LogicException; diff --git a/includes/filebackend/FileBackendGroup.php b/includes/filebackend/FileBackendGroup.php index 0b61979409..8182d62ec6 100644 --- a/includes/filebackend/FileBackendGroup.php +++ b/includes/filebackend/FileBackendGroup.php @@ -20,7 +20,8 @@ * @file * @ingroup FileBackend */ -use \MediaWiki\Logger\LoggerFactory; + +use MediaWiki\Logger\LoggerFactory; use MediaWiki\MediaWikiServices; /** diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php index d959dd2adc..296c4b3bb9 100644 --- a/includes/htmlform/HTMLForm.php +++ b/includes/htmlform/HTMLForm.php @@ -213,11 +213,11 @@ class HTMLForm extends ContextSource { protected $mAction = false; /** - * Form attribute autocomplete. false does not set the attribute + * Form attribute autocomplete. A typical value is "off". null does not set the attribute * @since 1.27 - * @var bool|string + * @var string|null */ - protected $mAutocomplete = false; + protected $mAutocomplete = null; protected $mUseMultipart = false; protected $mHiddenFields = []; @@ -1062,7 +1062,7 @@ class HTMLForm extends ContextSource { if ( $this->mId ) { $attribs['id'] = $this->mId; } - if ( $this->mAutocomplete ) { + if ( is_string( $this->mAutocomplete ) ) { $attribs['autocomplete'] = $this->mAutocomplete; } if ( $this->mName ) { @@ -1868,12 +1868,12 @@ class HTMLForm extends ContextSource { } /** - * Set the value for the autocomplete attribute of the form. - * When set to false (which is the default state), the attribute get not set. + * Set the value for the autocomplete attribute of the form. A typical value is "off". + * When set to null (which is the default state), the attribute get not set. * * @since 1.27 * - * @param string|bool $autocomplete + * @param string|null $autocomplete * * @return HTMLForm $this for chaining calls */ diff --git a/includes/interwiki/ClassicInterwikiLookup.php b/includes/interwiki/ClassicInterwikiLookup.php index d9c04240c8..d5103da977 100644 --- a/includes/interwiki/ClassicInterwikiLookup.php +++ b/includes/interwiki/ClassicInterwikiLookup.php @@ -1,6 +1,4 @@ displayImg->transform( $params ); diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 6af7945730..5029d1d788 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -21,8 +21,8 @@ */ use MediaWiki\Edit\PreparedEdit; -use \MediaWiki\Logger\LoggerFactory; -use \MediaWiki\MediaWikiServices; +use MediaWiki\Logger\LoggerFactory; +use MediaWiki\MediaWikiServices; use Wikimedia\Assert\Assert; use Wikimedia\Rdbms\FakeResultWrapper; use Wikimedia\Rdbms\IDatabase; diff --git a/includes/password/PasswordPolicyChecks.php b/includes/password/PasswordPolicyChecks.php index b3776bd862..502f1e024c 100644 --- a/includes/password/PasswordPolicyChecks.php +++ b/includes/password/PasswordPolicyChecks.php @@ -20,7 +20,7 @@ * @file */ -use \Cdb\Reader as CdbReader; +use Cdb\Reader as CdbReader; /** * Functions to check passwords against a policy requirement diff --git a/includes/tidy/Balancer.php b/includes/tidy/Balancer.php index e570633778..fa89c1a5e1 100644 --- a/includes/tidy/Balancer.php +++ b/includes/tidy/Balancer.php @@ -23,14 +23,15 @@ * @since 1.27 * @author C. Scott Ananian, 2016 */ + namespace MediaWiki\Tidy; +use ExplodeIterator; +use IteratorAggregate; +use ReverseArrayIterator; +use Sanitizer; use Wikimedia\Assert\Assert; use Wikimedia\Assert\ParameterAssertionException; -use \ExplodeIterator; -use \IteratorAggregate; -use \ReverseArrayIterator; -use \Sanitizer; // A note for future librarization[1] -- this file is a good candidate // for splitting into an independent library, except that it is currently diff --git a/includes/utils/BatchRowWriter.php b/includes/utils/BatchRowWriter.php index 59dcbd63f9..c146e96478 100644 --- a/includes/utils/BatchRowWriter.php +++ b/includes/utils/BatchRowWriter.php @@ -20,8 +20,9 @@ * @file * @ingroup Maintenance */ + +use MediaWiki\MediaWikiServices; use Wikimedia\Rdbms\IDatabase; -use \MediaWiki\MediaWikiServices; class BatchRowWriter { /** diff --git a/languages/data/CrhExceptions.php b/languages/data/CrhExceptions.php index dc4b1eff3b..d656528956 100644 --- a/languages/data/CrhExceptions.php +++ b/languages/data/CrhExceptions.php @@ -9,7 +9,7 @@ namespace MediaWiki\Languages\Data; -use \CrhConverter as Crh; +use CrhConverter as Crh; class CrhExceptions { diff --git a/languages/i18n/be-tarask.json b/languages/i18n/be-tarask.json index 2a89558a42..57b9faa513 100644 --- a/languages/i18n/be-tarask.json +++ b/languages/i18n/be-tarask.json @@ -3452,6 +3452,8 @@ "tag-mw-new-redirect-description": "Рэдагаваньні, якія ствараюць новае перанакіраваньне ці зьмяняюць старонку на перанакіраваньне", "tag-mw-removed-redirect": "Выдаленае перанакіраваньне", "tag-mw-removed-redirect-description": "Праўкі, якія зьмяняюць існае перанакіраваньне на не перанакіраваньне", + "tag-mw-changed-redirect-target": "Зьмененая мэта перанакіраваньня", + "tag-mw-changed-redirect-target-description": "Праўкі, якія зьмяняюць мэту перанакіраваньня", "tags-title": "Меткі", "tags-intro": "На гэтай старонцы знаходзіцца сьпіс метак, якімі праграмнае забесьпячэньне можа пазначыць рэдагаваньне, і іх значэньне.", "tags-tag": "Назва меткі", diff --git a/languages/i18n/frr.json b/languages/i18n/frr.json index 8281e6b9e3..3c5c93a5a7 100644 --- a/languages/i18n/frr.json +++ b/languages/i18n/frr.json @@ -3051,6 +3051,8 @@ "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Kääntiaken|Kääntiakens}}]]: $2)", "tag-mw-new-redirect": "Nei widjerfeerang", "tag-mw-new-redirect-description": "Feranrangen, diar en nei widjerfeerang iinracht.", + "tag-mw-removed-redirect": "Widjerfeerang wechnimen", + "tag-mw-changed-redirect-target": "Widjerfeerang feranert", "tags-title": "Kääntiaken", "tags-intro": "Det sidj wiset kääntiaken, diar för't bewerkin brükt wurd, an wat jo men.", "tags-tag": "Kääntiaken-nööm", diff --git a/languages/i18n/hr.json b/languages/i18n/hr.json index 53328dfa87..e18db10dd5 100644 --- a/languages/i18n/hr.json +++ b/languages/i18n/hr.json @@ -161,7 +161,7 @@ "category-empty": "U ovoj kategoriji trenutačno nema članaka ni medija.", "hidden-categories": "{{PLURAL:$1|Skrivena kategorija|Skrivene kategorije|Skrivenih kategorija}}", "hidden-category-category": "Skrivene kategorije", - "category-subcat-count": "Ova kategorija sadrži $2 {{PLURAL:$2|podkategoriju|podkategorije|podkategorija}}, ovaj popis prikazuje $1.", + "category-subcat-count": "{{PLURAL:$2|1=Ova kategorija sadržava samo sljedeću potkategoriju.|Ova kategorija ima {{PLURAL:$1|sljedeću $1 potkategoriju|sljedeće $1 potkategorije|sljedećih $1 potkategorija}}, od ukupno $2.}}", "category-subcat-count-limited": "Ova kategorija ima {{PLURAL:$1|podkategoriju|$1 podkategorije|$1 podkategorija}}.", "category-article-count": "{{PLURAL:$2|Ova kategorija sadrži samo sljedeću stranicu.|{{PLURAL:$1|Prikazana stranica jedina je|Prikazane su $1 stranice su|Prikazano je $1 stranica}} u ovoj kategoriji, od ukupno $2.}}", "category-article-count-limited": "{{PLURAL:$1|stranica je|$1 stranice su|$1 stranica je}} u ovoj kategoriji.", @@ -702,7 +702,7 @@ "permissionserrors": "Pogrješka u pravima", "permissionserrorstext": "Nemate ovlasti za tu radnju iz sljedećih {{PLURAL:$1|razlog|razloga}}:", "permissionserrorstext-withaction": "Nemate dopuštenje za $2, iz {{PLURAL:$1|navedenog|navedenih}} razloga:", - "recreate-moveddeleted-warn": "Upozorenje: Ponovo stvarate stranicu koja je prethodno bila izbrisana.\n\nRazmotrite je li prikladno nastaviti s uređivanje ove stranice.\nZa Vašu informaciju slijedi evidencija brisanja i premještanja ove stranice:", + "recreate-moveddeleted-warn": "Upozorenje: ponovo stvarate stranicu koja je prethodno bila izbrisana.\n\nRazmotrite je li prikladno nastaviti s uređivanjem ove stranice.\nZa Vašu informaciju slijedi evidencija brisanja i premještanja ove stranice:", "moveddeleted-notice": "Ova je stranica izbrisana.\nEvidencije brisanja, zaštićivanja i premještanja za ovu stranicu prikazane su niže za uputu.", "moveddeleted-notice-recent": "Žao nam je, ova stranica je izbrisana u prošla 24 sata. \nNiže je navedena evidencija brisanja i premještanja.", "log-fulllog": "Prikaži cijelu evidenciju", diff --git a/languages/i18n/hu.json b/languages/i18n/hu.json index d37bff11a4..1d144631ad 100644 --- a/languages/i18n/hu.json +++ b/languages/i18n/hu.json @@ -1449,11 +1449,13 @@ "rcfilters-liveupdates-button-title-off": "A legfrissebb változtatások mutatása, amint megtörténnek", "rcfilters-watchlist-markseen-button": "Összes változtatás megjelölése olvasottként", "rcfilters-watchlist-edit-watchlist-button": "A figyelőlistád szerkesztése", - "rcfilters-watchlist-showupdated": "Az újabb változtatások amiket még nem néztél meg, vastaggal jelöltük", + "rcfilters-watchlist-showupdated": "Az újabb változtatások, amiket még nem néztél meg, vastagítva láthatók, kitöltött jelzőkkel.", "rcfilters-preference-label": "A friss változtatások fejlesztett változatának elrejtése", "rcfilters-preference-help": "A 2017-es felületátdolgozás és minden azóta hozzáadott eszköz visszaállítása.", "rcfilters-filter-showlinkedfrom-label": "A következő lapra hivatkozó lapok változtatásainak megjelenítése", + "rcfilters-filter-showlinkedfrom-option-label": "A kiválasztott lapról hivatkozott lapok", "rcfilters-filter-showlinkedto-label": "A következő lapról hivatkozott lapok változtatásainak megjelenítése", + "rcfilters-filter-showlinkedto-option-label": "A kiválasztott lapra hivatkozó lapok", "rcfilters-target-page-placeholder": "Adj meg egy oldal nevét", "rcnotefrom": "Alább a $3 $4 óta történt változtatások láthatóak (legfeljebb $1 db).", "rclistfromreset": "Dátumválasztás visszaállítása", @@ -1698,6 +1700,7 @@ "uploadstash-bad-path-unrecognized-thumb-name": "Ismeretlen bélyegképnév.", "uploadstash-bad-path-no-handler": "Nem található kezelő a(z) $1 MIME-típusú $2 fájlhoz.", "uploadstash-bad-path-bad-format": "A(z) „$1” kulcs nem megfelelő formátumú.", + "uploadstash-file-not-found": "A(z) „$1” kulcs nem található a tárolóban.", "uploadstash-file-not-found-no-thumb": "A bélyegkép lekérése sikertelen.", "uploadstash-file-not-found-no-local-path": "Nincs helyi útvonal az átméretezett elemhez.", "uploadstash-file-not-found-no-object": "A bélyegkép helyi fájlobjektumának létrehozása sikertelen.", @@ -1748,7 +1751,7 @@ "listfiles_thumb": "Bélyegkép", "listfiles_date": "Dátum", "listfiles_name": "Név", - "listfiles_user": "feltöltő", + "listfiles_user": "Feltöltő", "listfiles_size": "Méret", "listfiles_description": "Leírás", "listfiles_count": "Változatok", @@ -2749,7 +2752,7 @@ "tooltip-ca-nstab-media": "A fájlleíró lap megtekintése", "tooltip-ca-nstab-special": "Ez egy speciális lap, nem szerkesztheted.", "tooltip-ca-nstab-project": "A projektlap megtekintése", - "tooltip-ca-nstab-image": "A képleíró lap megtekintése", + "tooltip-ca-nstab-image": "A fájlleíró lap megtekintése", "tooltip-ca-nstab-mediawiki": "A rendszerüzenet megtekintése", "tooltip-ca-nstab-template": "A sablon megtekintése", "tooltip-ca-nstab-help": "A súgólap megtekintése", @@ -2901,7 +2904,7 @@ "file-no-thumb-animation": "'''Megjegyzés: technikai korlátok miatt a fájl bélyegképe nem lesz animált.'''", "file-no-thumb-animation-gif": "'''Megjegyzés: technikai korlátok miatt a nagy felbontású GIF képekből készített bélyegkép nem lesz animált.'''", "newimages": "Új fájlok galériája", - "imagelisttext": "Lentebb '''{{PLURAL:$1|egy|$1}}''' kép látható, $2 rendezve.", + "imagelisttext": "Lentebb $1 fájl látható $2 rendezve.", "newimages-summary": "Ezen a speciális lapon láthatóak a legutóbb feltöltött fájlok.", "newimages-legend": "Fájlnév", "newimages-label": "Fájlnév (vagy annak részlete):", diff --git a/languages/i18n/lb.json b/languages/i18n/lb.json index 1374c9fe3e..eea7da20d6 100644 --- a/languages/i18n/lb.json +++ b/languages/i18n/lb.json @@ -3295,6 +3295,7 @@ "tag-mw-blank-description": "Ännerungen déi eng Säit eidelmaachen", "tag-mw-replace": "Ersat", "tag-mw-rollback": "Zrécksetzen", + "tag-mw-undo": "Réckgängeg maachen", "tags-title": "Markéierungen", "tags-intro": "Op dëser Säit stinn all déi Taggen, déi vun dëser Software fir Ännerungen unzeweise benotzt ginn, an hir Bedeitung.", "tags-tag": "Numm vun der Markéierung", diff --git a/languages/i18n/lt.json b/languages/i18n/lt.json index f29f31db6d..2957d0343c 100644 --- a/languages/i18n/lt.json +++ b/languages/i18n/lt.json @@ -49,7 +49,7 @@ "tog-usenewrc": "Grupuoti pakeitimas pagal puslapį paskutinių keitimų ir stebėjimo sąrašuose", "tog-numberheadings": "Automatiškai numeruoti skyrelius", "tog-showtoolbar": "Rodyti redagavimo įrankių juosta", - "tog-editondblclick": "Puslapių redagavimas dvigubu spustelėjimu (JavaScript)", + "tog-editondblclick": "Puslapių redagavimas dvigubu spustelėjimu", "tog-editsectiononrightclick": "Įjungti skyrelių redagavimą paspaudus skyrelio pavadinimą dešiniuoju pelės klavišu (JavaScript)", "tog-watchcreations": "Pridėti mano sukuriamus puslapius į stebimųjų sąrašą", "tog-watchdefault": "Pridėti puslapius, kuriuos aš redaguoju, į stebimųjų sąrašą", @@ -158,8 +158,8 @@ "category_header": "Puslapiai kategorijoje „$1“", "subcategories": "Subkategorijos", "category-media-header": "Daugialypės terpės rinkmenos kategorijoje „$1“", - "category-empty": "''Šiuo metu ši kategorija neturi jokių puslapių ar failų.''", - "hidden-categories": "{{PLURAL:$1|Paslėpta kategorija|Paslėptos kategorijos}}", + "category-empty": "Šiuo metu ši kategorija neturi jokių puslapių ar failų.", + "hidden-categories": "{{PLURAL:$1|Paslėpta kategorija|Paslėptos kategorijos|Paslėptų kategorijų}}", "hidden-category-category": "Paslėptos kategorijos", "category-subcat-count": "{{PLURAL:$2|Šioje kategorijoje yra viena subkategorija.|{{PLURAL:$1|Rodoma|Rodomos|Rodoma}} $1 {{PLURAL:$1|subkategorija|subkategorijos|subkategorijų}} (iš viso yra $2 {{PLURAL:$2|subkategorija|subkategorijos|subkategorijų}}).}}", "category-subcat-count-limited": "Šioje kategorijoje yra $1 {{PLURAL:$1|subkategorija|subkategorijos|subkategorijų}}.", @@ -1603,7 +1603,7 @@ "uploadstash-clear": "Išvalyti stashed failai", "uploadstash-nofiles": "Jūs neturite stashed failus.", "uploadstash-badtoken": "Scenos šį ieškinį, buvo nesėkmingas, galbūt todėl, kad jūsų redagavimo įgaliojimai pasibaigė. Bandykite dar kartą.", - "uploadstash-errclear": "Kliringo failai buvo nesėkmingas.", + "uploadstash-errclear": "Išvalyti failų nepavyko.", "uploadstash-refresh": "Atnaujinti failų sąrašą", "uploadstash-thumbnail": "rodyti miniatiūrą", "invalid-chunk-offset": "Neleistinas segmento poslinkis", diff --git a/languages/i18n/lzh.json b/languages/i18n/lzh.json index 0b8cc8c32b..95d230f07a 100644 --- a/languages/i18n/lzh.json +++ b/languages/i18n/lzh.json @@ -2166,6 +2166,7 @@ "htmlform-submit": "呈", "htmlform-reset": "復", "htmlform-selectorother-other": "他", + "logentry-delete-delete": "$1 {{GENDER:$2|已削}} 頁 $3", "revdelete-restricted": "應限至有秩", "revdelete-unrestricted": "除限自有秩", "logentry-newusers-create": "簿$1已{{GENDER:$2|增}}。", diff --git a/languages/i18n/nb.json b/languages/i18n/nb.json index 895a91acf5..79b55517c8 100644 --- a/languages/i18n/nb.json +++ b/languages/i18n/nb.json @@ -2395,7 +2395,7 @@ "sp-contributions-hideminor": "Skjul mindre endringer", "sp-contributions-submit": "Søk", "sp-contributions-outofrange": "Kan ikke vise resultater. Det gitte IP-intervallet er større enn CIDR-grensen på /$1.", - "whatlinkshere": "Det som lenker hit", + "whatlinkshere": "Hva lenker hit", "whatlinkshere-title": "Sider som lenker til «$1»", "whatlinkshere-page": "Side:", "linkshere": "Følgende sider lenker til '''[[:$1]]''':", diff --git a/maintenance/cdb.php b/maintenance/cdb.php index bff2c13faf..0870d6d41e 100644 --- a/maintenance/cdb.php +++ b/maintenance/cdb.php @@ -21,8 +21,9 @@ * @todo document * @ingroup Maintenance */ -use \Cdb\Exception as CdbException; -use \Cdb\Reader as CdbReader; + +use Cdb\Exception as CdbException; +use Cdb\Reader as CdbReader; require_once __DIR__ . '/commandLine.inc'; diff --git a/tests/phpunit/includes/AutopromoteTest.php b/tests/phpunit/includes/AutopromoteTest.php index 785aa4e3d4..24f6596ea9 100644 --- a/tests/phpunit/includes/AutopromoteTest.php +++ b/tests/phpunit/includes/AutopromoteTest.php @@ -1,5 +1,8 @@ getUserForBlocking(); @@ -366,6 +367,9 @@ class BlockTest extends MediaWikiLangTestCase { $this->assertEquals( $exResult, $block->mReason, 'Correct block type for XFF header ' . $xff ); } + /** + * @covers Block::__construct + */ public function testDeprecatedConstructor() { $this->hideDeprecated( 'Block::__construct with multiple arguments' ); $username = 'UnthinkablySecretRandomUsername'; @@ -418,6 +422,11 @@ class BlockTest extends MediaWikiLangTestCase { ); } + /** + * @covers Block::getSystemBlockType + * @covers Block::insert + * @covers Block::doAutoblock + */ public function testSystemBlocks() { $user = $this->getUserForBlocking(); $this->addBlockForUser( $user ); diff --git a/tests/phpunit/includes/api/ApiBaseTest.php b/tests/phpunit/includes/api/ApiBaseTest.php index ee0ad946bd..575f0c96d6 100644 --- a/tests/phpunit/includes/api/ApiBaseTest.php +++ b/tests/phpunit/includes/api/ApiBaseTest.php @@ -51,6 +51,7 @@ class ApiBaseTest extends ApiTestCase { * @param array $paramSettings * @param mixed $expected * @param string[] $warnings + * @covers ApiBase::getParameterFromSettings */ public function testGetParameterFromSettings( $input, $paramSettings, $expected, $warnings ) { $mock = new MockApi(); @@ -126,6 +127,9 @@ class ApiBaseTest extends ApiTestCase { ]; } + /** + * @covers ApiBase::errorArrayToStatus + */ public function testErrorArrayToStatus() { $mock = new MockApi(); diff --git a/tests/phpunit/includes/api/ApiOpenSearchTest.php b/tests/phpunit/includes/api/ApiOpenSearchTest.php index 23fa7bcb25..cc993d5df8 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 1aa0a133b9..10bdfa735c 100644 --- a/tests/phpunit/includes/api/ApiPageSetTest.php +++ b/tests/phpunit/includes/api/ApiPageSetTest.php @@ -4,6 +4,7 @@ * @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 9f28aaf56e..b482c3189a 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/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php index abef1c9206..f1ff94751e 100644 --- a/tests/phpunit/includes/api/ApiTestCase.php +++ b/tests/phpunit/includes/api/ApiTestCase.php @@ -218,6 +218,9 @@ abstract class ApiTestCase extends MediaWikiLangTestCase { ); } + /** + * @coversNothing + */ public function testApiTestGroup() { $groups = PHPUnit_Util_Test::getGroups( static::class ); $constraint = PHPUnit_Framework_Assert::logicalOr( diff --git a/tests/phpunit/includes/api/ApiUploadTest.php b/tests/phpunit/includes/api/ApiUploadTest.php index 159a0e36e4..6b604093e4 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 f901cf2d1c..bb72021121 100644 --- a/tests/phpunit/includes/api/ApiUsageExceptionTest.php +++ b/tests/phpunit/includes/api/ApiUsageExceptionTest.php @@ -1,5 +1,8 @@ assertTrue( $db->close(), "closing database" ); } + /** + * @covers \Wikimedia\Rdbms\DatabaseSqlite::__toString + */ public function testToString() { $db = DatabaseSqlite::newStandaloneInstance( ':memory:' ); diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php index 1efeeebdaf..75d54146e1 100644 --- a/tests/phpunit/includes/db/LBFactoryTest.php +++ b/tests/phpunit/includes/db/LBFactoryTest.php @@ -1,10 +1,4 @@ closeAll(); } + /** + * @covers \Wikimedia\Rdbms\ChronologyProtector + */ public function testChronologyProtector() { // (a) First HTTP request $mPos = new MySQLMasterPos( 'db1034-bin.000976', '843431247' ); diff --git a/tests/phpunit/includes/db/LoadBalancerTest.php b/tests/phpunit/includes/db/LoadBalancerTest.php index a8e7f898a4..5fd33dc1cf 100644 --- a/tests/phpunit/includes/db/LoadBalancerTest.php +++ b/tests/phpunit/includes/db/LoadBalancerTest.php @@ -24,6 +24,8 @@ use Wikimedia\Rdbms\LoadBalancer; * * @group Database * @file + * + * @covers \Wikimedia\Rdbms\LoadBalancer */ class LoadBalancerTest extends MediaWikiTestCase { public function testWithoutReplica() { diff --git a/tests/phpunit/includes/exception/MWExceptionTest.php b/tests/phpunit/includes/exception/MWExceptionTest.php index 614a1c981d..6c5b3b1eae 100644 --- a/tests/phpunit/includes/exception/MWExceptionTest.php +++ b/tests/phpunit/includes/exception/MWExceptionTest.php @@ -10,6 +10,7 @@ class MWExceptionTest extends MediaWikiTestCase { /** * @expectedException MWException + * @covers MWException */ public function testMwexceptionThrowing() { throw new MWException(); diff --git a/tests/phpunit/includes/htmlform/HTMLFormTest.php b/tests/phpunit/includes/htmlform/HTMLFormTest.php index 98511ca79c..f74f60af05 100644 --- a/tests/phpunit/includes/htmlform/HTMLFormTest.php +++ b/tests/phpunit/includes/htmlform/HTMLFormTest.php @@ -2,22 +2,56 @@ /** * @covers HTMLForm + * + * @licence GNU GPL v2+ + * @author Gergő Tisza + * @author Thiemo Mättig */ class HTMLFormTest extends MediaWikiTestCase { - public function testGetHTML_empty() { + + private function newInstance() { $form = new HTMLForm( [] ); $form->setTitle( Title::newFromText( 'Foo' ) ); + return $form; + } + + public function testGetHTML_empty() { + $form = $this->newInstance(); $form->prepareForm(); $html = $form->getHTML( false ); - $this->assertRegExp( '/assertStringStartsWith( '
setTitle( Title::newFromText( 'Foo' ) ); + $form = $this->newInstance(); $form->getHTML( false ); } + + public function testAutocompleteDefaultsToNull() { + $form = $this->newInstance(); + $this->assertNotContains( 'autocomplete', $form->wrapForm( '' ) ); + } + + public function testAutocompleteWhenSetToNull() { + $form = $this->newInstance(); + $form->setAutocomplete( null ); + $this->assertNotContains( 'autocomplete', $form->wrapForm( '' ) ); + } + + public function testAutocompleteWhenSetToFalse() { + $form = $this->newInstance(); + // Previously false was used instead of null to indicate the attribute should not be set + $form->setAutocomplete( false ); + $this->assertNotContains( 'autocomplete', $form->wrapForm( '' ) ); + } + + public function testAutocompleteWhenSetToOff() { + $form = $this->newInstance(); + $form->setAutocomplete( 'off' ); + $this->assertContains( ' autocomplete="off"', $form->wrapForm( '' ) ); + } + } diff --git a/tests/phpunit/includes/http/HttpTest.php b/tests/phpunit/includes/http/HttpTest.php index 2d73bac548..8ca9f6a268 100644 --- a/tests/phpunit/includes/http/HttpTest.php +++ b/tests/phpunit/includes/http/HttpTest.php @@ -495,6 +495,7 @@ class HttpTest extends MediaWikiTestCase { * where it did not define a cURL constant. T72570 * * @dataProvider provideCurlConstants + * @coversNothing */ public function testCurlConstants( $value ) { $this->checkPHPExtension( 'curl' ); diff --git a/tests/phpunit/includes/libs/HtmlArmorTest.php b/tests/phpunit/includes/libs/HtmlArmorTest.php index 5f176e0c85..0e9469ad04 100644 --- a/tests/phpunit/includes/libs/HtmlArmorTest.php +++ b/tests/phpunit/includes/libs/HtmlArmorTest.php @@ -5,7 +5,22 @@ */ class HtmlArmorTest extends PHPUnit_Framework_TestCase { - public static function provideHtmlArmor() { + public static function provideConstructor() { + return [ + [ 'test' ], + [ null ], + [ 'some html!' ] + ]; + } + + /** + * @dataProvider provideConstructor + */ + public function testConstructor( $value ) { + $this->assertInstanceOf( HtmlArmor::class, new HtmlArmor( $value ) ); + } + + public static function provideGetHtml() { return [ [ 'foobar', @@ -19,13 +34,17 @@ class HtmlArmorTest extends PHPUnit_Framework_TestCase { new HtmlArmor( '' ), '', ], + [ + new HtmlArmor( null ), + null, + ] ]; } /** - * @dataProvider provideHtmlArmor + * @dataProvider provideGetHtml */ - public function testHtmlArmor( $input, $expected ) { + public function testGetHtml( $input, $expected ) { $this->assertEquals( $expected, HtmlArmor::getHtml( $input ) diff --git a/tests/phpunit/includes/media/ExifRotationTest.php b/tests/phpunit/includes/media/ExifRotationTest.php index 5ae1763596..fff101f3a2 100644 --- a/tests/phpunit/includes/media/ExifRotationTest.php +++ b/tests/phpunit/includes/media/ExifRotationTest.php @@ -5,10 +5,13 @@ * @group Media * @group medium * - * @todo covers tags + * @covers BitmapHandler */ class ExifRotationTest extends MediaWikiMediaTestCase { + /** @var BitmapHandler */ + private $handler; + protected function setUp() { parent::setUp(); $this->checkPHPExtension( 'exif' ); diff --git a/tests/phpunit/includes/parser/MagicVariableTest.php b/tests/phpunit/includes/parser/MagicVariableTest.php index 6a2afad6d7..9f5e38640e 100644 --- a/tests/phpunit/includes/parser/MagicVariableTest.php +++ b/tests/phpunit/includes/parser/MagicVariableTest.php @@ -9,11 +9,13 @@ * @author Antoine Musso * @copyright Copyright © 2011, Antoine Musso * @file - * @todo covers tags * * @group Database */ +/** + * @covers Parser::getVariableValue + */ class MagicVariableTest extends MediaWikiTestCase { /** * @var Parser diff --git a/tests/phpunit/includes/registration/ExtensionProcessorTest.php b/tests/phpunit/includes/registration/ExtensionProcessorTest.php index 5ef30e872a..acf4710ffd 100644 --- a/tests/phpunit/includes/registration/ExtensionProcessorTest.php +++ b/tests/phpunit/includes/registration/ExtensionProcessorTest.php @@ -607,6 +607,11 @@ class ExtensionProcessorTest extends MediaWikiTestCase { $this->assertSame( [ 'ext.baz.fizzbuzz' ], $info['attributes']['FizzBuzzMorePlugins'] ); } + /** + * Verify that extension.schema.json is in sync with ExtensionProcessor + * + * @coversNothing + */ public function testGlobalSettingsDocumentedInSchema() { global $IP; $globalSettings = TestingAccessWrapper::newFromClass( diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php index f004e7913b..ea7f715b5f 100644 --- a/tests/phpunit/includes/user/UserTest.php +++ b/tests/phpunit/includes/user/UserTest.php @@ -236,6 +236,8 @@ class UserTest extends MediaWikiTestCase { * Test, if for all rights a right- message exist, * which is used on Special:ListGroupRights as help text * Extensions and core + * + * @coversNothing */ public function testAllRightsWithMessage() { // Getting all user rights, for core: User::$mCoreRights, for extensions: $wgAvailableRights diff --git a/tests/phpunit/languages/LanguageConverterTest.php b/tests/phpunit/languages/LanguageConverterTest.php index fc2ed33b65..82ab7def22 100644 --- a/tests/phpunit/languages/LanguageConverterTest.php +++ b/tests/phpunit/languages/LanguageConverterTest.php @@ -160,6 +160,8 @@ class LanguageConverterTest extends MediaWikiLangTestCase { /** * Test exhausting pcre.backtrack_limit + * + * @covers LanguageConverter::autoConvert */ public function testAutoConvertT124404() { $testString = ''; diff --git a/tests/phpunit/languages/LanguageTest.php b/tests/phpunit/languages/LanguageTest.php index e39f57ea99..0c341303f7 100644 --- a/tests/phpunit/languages/LanguageTest.php +++ b/tests/phpunit/languages/LanguageTest.php @@ -1630,7 +1630,7 @@ class LanguageTest extends LanguageClassesTestCase { } /** - * @dataProvider testFormatNumProvider + * @dataProvider provideFormatNum * @covers Language::formatNum */ public function testFormatNum( @@ -1643,7 +1643,7 @@ class LanguageTest extends LanguageClassesTestCase { $this->assertEquals( $expected, $formattedNum ); } - public function testFormatNumProvider() { + public function provideFormatNum() { return [ [ true, 'en', 100, false, '100' ], [ true, 'en', 101, true, '101' ], @@ -1657,6 +1657,7 @@ class LanguageTest extends LanguageClassesTestCase { } /** + * @covers Language::parseFormattedNumber * @dataProvider parseFormattedNumberProvider */ public function testParseFormattedNumber( $langCode, $number ) { @@ -1795,6 +1796,9 @@ class LanguageTest extends LanguageClassesTestCase { ]; } + /** + * @covers Language::equals + */ public function testEquals() { $en1 = new Language(); $en1->setCode( 'en' ); diff --git a/tests/phpunit/languages/classes/LanguageArTest.php b/tests/phpunit/languages/classes/LanguageArTest.php index 5a66759873..f3f5a3f1f1 100644 --- a/tests/phpunit/languages/classes/LanguageArTest.php +++ b/tests/phpunit/languages/classes/LanguageArTest.php @@ -4,7 +4,9 @@ * @file */ -/** Tests for MediaWiki languages/LanguageAr.php */ +/** + * @covers LanguageAr + */ class LanguageArTest extends LanguageClassesTestCase { /** * @covers Language::formatNum diff --git a/tests/phpunit/languages/classes/LanguageBe_taraskTest.php b/tests/phpunit/languages/classes/LanguageBe_taraskTest.php index 26db1062a1..de684359fa 100644 --- a/tests/phpunit/languages/classes/LanguageBe_taraskTest.php +++ b/tests/phpunit/languages/classes/LanguageBe_taraskTest.php @@ -1,6 +1,9 @@ setMwGlobals( 'wgNoFollowLinks', false ); @@ -201,6 +202,7 @@ class SideBarTest extends MediaWikiLangTestCase { /** * Test $wgExternaLinkTarget in sidebar * @dataProvider dataRespectExternallinktarget + * @covers Skin::addToSidebarPlain */ public function testRespectExternallinktarget( $externalLinkTarget ) { $this->setMwGlobals( 'wgExternalLinkTarget', $externalLinkTarget );