Update league/oauth2-server fork, and update in MW Vendor
Closed, ResolvedPublic
Actions

Description

As a fix for T270588: OAuth 2.0 error on PHP 7.4, I'm bumping league/oauth2-server (8.1.0 => 8.2.4) in MW-1.35-release

This brings in PHP 8.0 support, also fixing PHP 7.4 log noise...

But this will mean our fork (which AFAIK is based on 8.1.0?) will be behind REL1_35, which is a bit meh

I don't think this is a blocker for T245757: Upgrade MediaWiki clusters to Debian Buster (debian 10), as we're "only" going to PHP 7.3 (eventually, AIUI), but it'd be nice to keep these thing in sync, and not get caught out by it again later

Details

Related Changes in Gerrit:

	Subject	Repo	Branch	Lines +/-
	Update oauth2-server and lcobucci/jwt	mediawiki/vendor	master	+1 K -5 K

Customize query in gerrit

Related Objects
Search...

		Status	Subtype	Assigned	Task
		Resolved		• Clarakosi	T270595 Update league/oauth2-server fork, and update in MW Vendor
		Resolved		Reedy	T270588 OAuth 2.0 error on PHP 7.4

Event Timeline

Reedy created this task.Dec 20 2020, 4:19 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptDec 20 2020, 4:19 PM

Reedy renamed this task from Update league/oauth2-server fork to Update league/oauth2-server fork, and update in MW Vendor.Dec 20 2020, 4:19 PM

Reedy added a subtask: T270588: OAuth 2.0 error on PHP 7.4.

Reedy added a project: MediaWiki-Vendor.

Reedy closed subtask T270588: OAuth 2.0 error on PHP 7.4 as Resolved.Dec 20 2020, 6:56 PM

Reedy mentioned this in T270588: OAuth 2.0 error on PHP 7.4.

Reedy mentioned this in T261462: Migrate OAuth extension back from wikimedia/oauth2-server fork to upstream.Dec 20 2020, 6:59 PM

I don't think this is a blocker for T245757: Upgrade MediaWiki clusters to Debian Buster (debian 10), as we're "only" going to PHP 7.3 (AIUI), but it'd be nice to keep these thing in sync, and not get caught out by it again later

Initially we're staying on our special blend of 7.2.

• Clarakosi edited projects, added Platform Team Workboards (Clinic Duty Team); removed Platform Engineering.Dec 22 2020, 9:07 PM

• Clarakosi added a subscriber: • Pchelolo.

• Clarakosi triaged this task as Medium priority.Dec 22 2020, 9:15 PM

• Clarakosi moved this task from Inbox to Ready (WIP:5) on the Platform Team Workboards (Clinic Duty Team) board.

Reedy updated the task description. (Show Details)Jan 10 2021, 9:53 PM

Reedy added a project: PHP 8.0 support.Feb 10 2021, 10:17 PM

I've pushed updated master and the recent tags to https://github.com/wikimedia/oauth2-server

$ git push origin HEAD:master
Total 0 (delta 0), reused 0 (delta 0)
To github.com:wikimedia/oauth2-server.git
   340d1ab7..15abf4ab  HEAD -> master
$ git push --tags
Total 0 (delta 0), reused 0 (delta 0)
To github.com:wikimedia/oauth2-server.git
 * [new tag]           8.2.0 -> 8.2.0
 * [new tag]           8.2.1 -> 8.2.1
 * [new tag]           8.2.2 -> 8.2.2
 * [new tag]           8.2.3 -> 8.2.3
 * [new tag]           8.2.4 -> 8.2.4

@Clarakosi I see you did https://github.com/wikimedia/oauth2-server/commits/update_v9.0.0-alpha... Is that actually ready to go? :)

@Clarakosi I see you did https://github.com/wikimedia/oauth2-server/commits/update_v9.0.0-alpha... Is that actually ready to go? :)

Almost? :) It still needs review.

Moving it to the review column. PR: https://github.com/wikimedia/oauth2-server/pull/2

Thanks!

Reedy moved this task from Backlog to Wikimedia production on the PHP 8.0 support board.Feb 15 2021, 9:09 PM

What's the status here? Is review still needed? Of what, by whom?

In T270595#6826908, @Clarakosi wrote:

@Clarakosi I see you did https://github.com/wikimedia/oauth2-server/commits/update_v9.0.0-alpha... Is that actually ready to go? :)

Almost? :) It still needs review.

Moving it to the review column. PR: https://github.com/wikimedia/oauth2-server/pull/2

I guess by platform, as your team made the fork in the first place...

I've reviewed and approved the changes.

In T270595#6882974, @Pchelolo wrote:

I've reviewed and approved the changes.

Just needs someone to merge them then :)

And then update in MediaWiki-Vendor

Change 668578 had a related patch set uploaded (by Clarakosi; owner: Clarakosi):
[mediawiki/vendor@master] Update oauth2-server and lcobucci/jwt to v3.4.0

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

gerritbot added a project: Patch-For-Review.Mar 5 2021, 2:21 AM

Change 668578 merged by jenkins-bot:
[mediawiki/vendor@master] Update oauth2-server and lcobucci/jwt

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