Page MenuHomePhabricator
Create Task
Maniphest T234597

Phase out PHPUnit expected exception annotations from tests
Closed, ResolvedPublic
Actions

Description

The following annotations were removed in PHPUnit 7:

  • @expectedException
  • @expectedExceptionCode
  • @expectedExceptionMessage
  • @expectedExceptionMessageRegExp

Instead, TestCase methods like expectException() should be used. In order to upgrade to PHPUnit 8, we need to get rid of those.

Code search results:

Details

SubjectRepoBranchLines +/-
build: Bump mediawiki-codesniffer to 28.0.0 and make it passmediawiki/extensions/DonationInterfacemaster+51 -53
build: Update to mediawiki-codesniffer 28.0.0 and make it passmediawiki/extensions/MediaWikiFarmmaster+131 -204
build: Bump mediawiki-codesniffer to 28.0.0 and make a passmediawiki/extensions/LDAPAuthorizationmaster+11 -9
tests: @expectedException is deprecatedmediawiki/extensions/WikibaseLexememaster+172 -279
build: Update mediawiki-codesniffer to 28.0.0 and make it passmediawiki/extensions/BlueSpiceFoundationmaster+84 -65
tests: @expectedException is deprecatedmediawiki/extensions/Wikibasemaster+75 -144
build: Bump mediawiki-codesniffer to 28.0.0 and make it passmediawiki/extensions/SimpleSAMLphpmaster+19 -15
build: Bump mediawiki-codesniffer to 28.0.0 and make a passmediawiki/extensions/JsonDatamaster+9 -17
build: Bump mediawiki-codesniffer to 28.0.0 and make it passmediawiki/skins/BlueSpiceCalummamaster+11 -10
tests: @expectedException is deprecatedmediawiki/extensions/WikibaseMediaInfomaster+6 -16
build: Bump mediawiki-codesniffer to 28.0.0 and make a passmediawiki/extensions/Wikispeechmaster+17 -31
tests: @expectedException is deprecatedmediawiki/skins/MinervaNeuemaster+11 -11
tests: @expectedException is deprecatedmediawiki/extensions/QuickSurveysmaster+17 -34
tests: @expectedException is deprecatedmediawiki/extensions/EntitySchemamaster+7 -19
build: Bump mediawiki-codesniffer to 28.0.0 and make a passmediawiki/extensions/LDAPProvidermaster+35 -34
tests: @expectedException is deprecatedmediawiki/extensions/PageTriagemaster+10 -17
tests: @expectedException is deprecatedmediawiki/extensions/MobileFrontendmaster+4 -5
tests: @expectedException is deprecatedmediawiki/extensions/Mathmaster+14 -30
tests: @expectedException is deprecatedmediawiki/extensions/MathSearchmaster+7 -15
@expectedException is deprecatedmediawiki/extensions/TemplateStylesmaster+4 -8
Use expectException() instead of annotationsmediawiki/extensions/LoginNotifymaster+1 -3
Cleanup of old PHPUnit usage, part 3mediawiki/coremaster+50 -62
Cleanup of old PHPUnit usage, part 2mediawiki/coremaster+54 -67
Forbid PHPUnit @expectedException* annotationsmediawiki/tools/codesniffermaster+32 -17
Show related patches Customize query in gerrit

Related Objects
Search...

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptOct 4 2019, 6:21 AM
MaxSem renamed this task from Phase out to Phase out PHPUnit expected exception annotations from tests.Oct 4 2019, 6:22 AM
MaxSem added a parent task: T192167: Upgrade PHPUnit from 4/6 to 8.
Umherirrender subscribed.Oct 4 2019, 10:47 AM

Codesniffer can help you on avoiding new annotations.

The annotations are currently whitelist in PhpunitAnnotationsSniff and could be moved from $allowedAnnotations to $forbiddenAnnotations with own message to avoid that new annoations are added

Daimona claimed this task.Oct 4 2019, 12:12 PM
Daimona subscribed.
In T234597#5546437, @Umherirrender wrote:

Codesniffer can help you on avoiding new annotations.

The annotations are currently whitelist in PhpunitAnnotationsSniff and could be moved from $allowedAnnotations to $forbiddenAnnotations with own message to avoid that new annoations are added

Yeah, let's include that in the next PHPCS release.

gerritbot added a comment.Oct 4 2019, 12:14 PM

Change 540848 had a related patch set uploaded (by Daimona Eaytoy; owner: Daimona Eaytoy):
[mediawiki/tools/codesniffer@master] Forbid PHPUnit @expectedException* annotations

https://gerrit.wikimedia.org/r/540848

gerritbot added a project: Patch-For-Review.Oct 4 2019, 12:14 PM
gerritbot added a comment.Oct 5 2019, 12:20 AM

Change 540848 merged by jenkins-bot:
[mediawiki/tools/codesniffer@master] Forbid PHPUnit @expectedException* annotations

https://gerrit.wikimedia.org/r/540848

Maintenance_bot removed a project: Patch-For-Review.Oct 5 2019, 1:10 AM
gerritbot added a comment.Oct 5 2019, 4:55 AM

Change 540988 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/core@master] Cleanup of old PHPUnit usage, part 2

https://gerrit.wikimedia.org/r/540988

gerritbot added a project: Patch-For-Review.Oct 5 2019, 4:55 AM
gerritbot added a comment.Oct 5 2019, 5:21 AM

Change 540989 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/core@master] Cleanup of old PHPUnit usage, part 2

https://gerrit.wikimedia.org/r/540989

gerritbot added a comment.Oct 5 2019, 9:37 AM

Change 540988 merged by jenkins-bot:
[mediawiki/core@master] Cleanup of old PHPUnit usage, part 2

https://gerrit.wikimedia.org/r/540988

ReleaseTaggerBot added a project: MW-1.35-notes (1.35.0-wmf.1; 2019-10-08).Oct 5 2019, 10:00 AM
gerritbot added a comment.Oct 5 2019, 1:57 PM

Change 540989 merged by jenkins-bot:
[mediawiki/core@master] Cleanup of old PHPUnit usage, part 3

https://gerrit.wikimedia.org/r/540989

Maintenance_bot removed a project: Patch-For-Review.Oct 5 2019, 2:10 PM
Jdforrester-WMF subscribed.Oct 7 2019, 6:53 PM
gerritbot added a comment.Oct 7 2019, 8:28 PM

Change 541366 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/LoginNotify@master] Use expectException() instead of annotations

https://gerrit.wikimedia.org/r/541366

gerritbot added a project: Patch-For-Review.Oct 7 2019, 8:28 PM
gerritbot added a comment.Oct 7 2019, 8:39 PM

Change 541366 merged by jenkins-bot:
[mediawiki/extensions/LoginNotify@master] Use expectException() instead of annotations

https://gerrit.wikimedia.org/r/541366

Maintenance_bot removed a project: Patch-For-Review.Oct 7 2019, 9:10 PM
gerritbot added a comment.Oct 12 2019, 2:41 AM

Change 542648 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/TemplateStyles@master] @expectedException is deprecated

https://gerrit.wikimedia.org/r/542648

gerritbot added a project: Patch-For-Review.Oct 12 2019, 2:41 AM
gerritbot added a comment.Oct 12 2019, 9:22 PM

Change 542648 merged by jenkins-bot:
[mediawiki/extensions/TemplateStyles@master] @expectedException is deprecated

https://gerrit.wikimedia.org/r/542648

ReleaseTaggerBot edited projects, added MW-1.35-notes (1.35.0-wmf.2; 2019-10-15); removed MW-1.35-notes (1.35.0-wmf.1; 2019-10-08).Oct 12 2019, 10:00 PM
Maintenance_bot removed a project: Patch-For-Review.Oct 12 2019, 10:10 PM
Krinkle moved this task from Inbox to PHPUnit on the MediaWiki-Core-Tests board.Oct 15 2019, 6:46 PM
gerritbot added a comment.Oct 16 2019, 2:30 AM

Change 543262 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/Math@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/543262

gerritbot added a project: Patch-For-Review.Oct 16 2019, 2:30 AM
gerritbot added a comment.Oct 16 2019, 2:34 AM

Change 543264 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/MathSearch@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/543264

gerritbot added a comment.Oct 16 2019, 2:38 AM

Change 543265 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/MobileFrontend@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/543265

gerritbot added a comment.Oct 16 2019, 2:44 AM

Change 543264 merged by jenkins-bot:
[mediawiki/extensions/MathSearch@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/543264

gerritbot added a comment.Oct 16 2019, 3:11 AM

Change 543262 merged by jenkins-bot:
[mediawiki/extensions/Math@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/543262

gerritbot added a comment.Oct 16 2019, 3:11 AM

Change 543265 merged by jenkins-bot:
[mediawiki/extensions/MobileFrontend@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/543265

MaxSem mentioned this in rEMASca84c5ed82c2: tests: @expectedException is deprecated.Oct 16 2019, 3:25 AM
ReleaseTaggerBot edited projects, added MW-1.35-notes (1.35.0-wmf.3; 2019-10-22); removed MW-1.35-notes (1.35.0-wmf.2; 2019-10-15).Oct 16 2019, 4:00 AM
Maintenance_bot removed a project: Patch-For-Review.Oct 16 2019, 4:10 AM
Daimona removed Daimona as the assignee of this task.Oct 18 2019, 4:43 PM
Daimona mentioned this in T192167: Upgrade PHPUnit from 4/6 to 8.
gerritbot added a comment.Oct 19 2019, 12:04 AM

Change 544276 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/LDAPAuthorization@master] build: Bump mediawiki-codesniffer to 28.0.0 and make a pass

https://gerrit.wikimedia.org/r/544276

gerritbot added a project: Patch-For-Review.Oct 19 2019, 12:04 AM
gerritbot added a comment.Oct 19 2019, 12:11 AM

Change 544277 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/PageTriage@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544277

gerritbot added a comment.Oct 19 2019, 12:29 AM

Change 544280 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/JsonData@master] build: Bump mediawiki-codesniffer to 28.0.0 and make a pass

https://gerrit.wikimedia.org/r/544280

gerritbot added a comment.Oct 19 2019, 12:33 AM

Change 544281 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/LDAPProvider@master] build: Bump mediawiki-codesniffer to 28.0.0 and make a pass

https://gerrit.wikimedia.org/r/544281

gerritbot added a comment.Oct 19 2019, 9:00 AM

Change 544277 merged by jenkins-bot:
[mediawiki/extensions/PageTriage@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544277

gerritbot added a comment.Oct 19 2019, 9:12 AM

Change 544281 merged by jenkins-bot:
[mediawiki/extensions/LDAPProvider@master] build: Bump mediawiki-codesniffer to 28.0.0 and make a pass

https://gerrit.wikimedia.org/r/544281

MaxSem mentioned this in rELDQ6ce932dd2a91: build: Bump mediawiki-codesniffer to 28.0.0 and make a pass.Oct 19 2019, 9:16 AM
gerritbot added a comment.Oct 20 2019, 2:17 AM

Change 544339 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/EntitySchema@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544339

gerritbot added a comment.Oct 20 2019, 2:27 AM

Change 544340 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/skins/MinervaNeue@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544340

gerritbot added a comment.Oct 20 2019, 2:34 AM

Change 544341 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/QuickSurveys@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544341

gerritbot added a comment.Oct 20 2019, 6:07 AM

Change 544346 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/WikibaseMediaInfo@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544346

gerritbot added a comment.Oct 20 2019, 6:14 AM

Change 544347 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/Wikispeech@master] build: Bump mediawiki-codesniffer to 28.0.0 and make a pass

https://gerrit.wikimedia.org/r/544347

gerritbot added a comment.Oct 20 2019, 6:20 AM

Change 544348 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/skins/BlueSpiceCalumma@master] build: Bump mediawiki-codesniffer to 28.0.0 and make it pass

https://gerrit.wikimedia.org/r/544348

gerritbot added a comment.Oct 20 2019, 7:11 AM

Change 544350 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/Wikibase@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544350

gerritbot added a comment.Oct 20 2019, 9:26 AM

Change 544339 merged by jenkins-bot:
[mediawiki/extensions/EntitySchema@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544339

gerritbot added a comment.Oct 20 2019, 9:34 AM

Change 544340 merged by jenkins-bot:
[mediawiki/skins/MinervaNeue@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544340

gerritbot added a comment.Oct 20 2019, 9:34 AM

Change 544341 merged by jenkins-bot:
[mediawiki/extensions/QuickSurveys@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544341

MaxSem mentioned this in rEQS4870bbcafc24: tests: @expectedException is deprecated.Oct 20 2019, 9:44 AM
gerritbot added a comment.Oct 20 2019, 9:51 AM

Change 544346 merged by jenkins-bot:
[mediawiki/extensions/WikibaseMediaInfo@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544346

gerritbot added a comment.Oct 20 2019, 9:51 AM

Change 544347 merged by jenkins-bot:
[mediawiki/extensions/Wikispeech@master] build: Bump mediawiki-codesniffer to 28.0.0 and make a pass

https://gerrit.wikimedia.org/r/544347

gerritbot added a comment.Oct 20 2019, 10:08 AM

Change 544348 merged by jenkins-bot:
[mediawiki/skins/BlueSpiceCalumma@master] build: Bump mediawiki-codesniffer to 28.0.0 and make it pass

https://gerrit.wikimedia.org/r/544348

Daimona mentioned this in rMSBCcf8db7d0aa7d: build: Bump mediawiki-codesniffer to 28.0.0 and make it pass.Oct 20 2019, 10:13 AM
gerritbot added a comment.Oct 20 2019, 10:41 AM

Change 544280 merged by jenkins-bot:
[mediawiki/extensions/JsonData@master] build: Bump mediawiki-codesniffer to 28.0.0 and make a pass

https://gerrit.wikimedia.org/r/544280

MaxSem mentioned this in rEWISebbad49ed2d4: build: Bump mediawiki-codesniffer to 28.0.0 and make a pass.Oct 20 2019, 12:13 PM
gerritbot added a comment.Oct 20 2019, 4:52 PM

Change 544407 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/BlueSpiceFoundation@master] build: Update mediawiki-codesniffer to 28.0.0 and make it pass

https://gerrit.wikimedia.org/r/544407

gerritbot added a comment.Oct 20 2019, 5:50 PM

Change 544409 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/SimpleSAMLphp@master] build: Bump mediawiki-codesniffer to 28.0.0 and make it pass

https://gerrit.wikimedia.org/r/544409

gerritbot added a comment.Oct 20 2019, 6:07 PM

Change 544409 merged by jenkins-bot:
[mediawiki/extensions/SimpleSAMLphp@master] build: Bump mediawiki-codesniffer to 28.0.0 and make it pass

https://gerrit.wikimedia.org/r/544409

gerritbot added a comment.Oct 20 2019, 6:38 PM

Change 544350 merged by jenkins-bot:
[mediawiki/extensions/Wikibase@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544350

gerritbot added a comment.Oct 20 2019, 8:08 PM

Change 544419 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/WikibaseLexeme@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544419

gerritbot added a comment.Oct 20 2019, 8:55 PM

Change 544423 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/MediaWikiFarm@master] build: Update to mediawiki-codesniffer 28.0.0 and make it pass

https://gerrit.wikimedia.org/r/544423

MaxSem added a subtask: T235990: MediaWikiFarm tests are broken.Oct 20 2019, 9:29 PM
gerritbot added a comment.Oct 20 2019, 11:07 PM

Change 544436 had a related patch set uploaded (by MaxSem; owner: MaxSem):
[mediawiki/extensions/DonationInterface@master] build: Bump mediawiki-codesniffer to 28.0.0 and mke it pass

https://gerrit.wikimedia.org/r/544436

gerritbot added a comment.Oct 21 2019, 4:38 AM

Change 544407 merged by jenkins-bot:
[mediawiki/extensions/BlueSpiceFoundation@master] build: Update mediawiki-codesniffer to 28.0.0 and make it pass

https://gerrit.wikimedia.org/r/544407

gerritbot added a comment.Oct 21 2019, 10:05 AM

Change 544419 merged by jenkins-bot:
[mediawiki/extensions/WikibaseLexeme@master] tests: @expectedException is deprecated

https://gerrit.wikimedia.org/r/544419

gerritbot added a comment.Oct 21 2019, 2:05 PM

Change 544276 merged by Daimona Eaytoy:
[mediawiki/extensions/LDAPAuthorization@master] build: Bump mediawiki-codesniffer to 28.0.0 and make a pass

https://gerrit.wikimedia.org/r/544276

Jdforrester-WMF updated the task description. (Show Details)Oct 22 2019, 10:40 AM
gerritbot added a comment.Nov 20 2019, 6:29 PM

Change 544423 abandoned by MaxSem:
build: Update to mediawiki-codesniffer 28.0.0 and make it pass

https://gerrit.wikimedia.org/r/544423

Jdforrester-WMF removed a subtask: T235990: MediaWikiFarm tests are broken.Jan 23 2020, 3:41 PM
Jdforrester-WMF closed this task as Resolved.Jan 23 2020, 3:43 PM
Jdforrester-WMF assigned this task to Daimona.

This is done for Wikimedia-hosted extensions (except DonationInterface which needs to maintain MW 1.31 compatibility for another six months), and all extensions except MediaWikiFarm (where it's left to the maintainer). Declaring this Resolved.

Stashbot mentioned this in T206485: Set root: true in eslintrc.json.Feb 26 2020, 2:26 PM
Stashbot mentioned this in T179229: Decide whether we want the package-lock.json to commit or ignore.

Mentioned in SAL (#wikimedia-cloud) [2020-02-26T14:26:33Z] <kalle_> Deploy latest from Git master: 20d9123, d8447da (T206485), f1f1143, 07e603c, cbfb487 (T179229), 0a7a488, bcd8507, 3225fe2, ebbad49 (T234597), b831a16, 879bc31, 52931bc, 24aa5aa, 93c9f0b, 90df124 (T243384), 1dbe811, 8a3cc99 (T244345), 624274d (T167300, T243376)

Stashbot mentioned this in T243384: Remove `require` from PHP tests.Feb 26 2020, 2:26 PM
Stashbot mentioned this in T244345: Remove the Util class for PHP tests.
Stashbot mentioned this in T167300: Sensible default values in extension.json (WikispeechServerUrl).
Stashbot mentioned this in T243376: Determine if an upgrade to manifest version 2 in extension.json is useful.
gerritbot added a comment.May 12 2022, 12:07 AM

Change 544436 abandoned by Ejegg:

[mediawiki/extensions/DonationInterface@master] build: Bump mediawiki-codesniffer to 28.0.0 and make it pass

Reason:

Thanks for this work! Repo has since been updated to v38

https://gerrit.wikimedia.org/r/544436

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL