Page MenuHomePhabricator

Upgrade psr/http-message to 2.0 or later
Closed, ResolvedPublic

Description

As of 2025-12-31

reedy@ubuntu64-web-esxi:/var/www/wiki/mediawiki/vendor$ php8.3 `which composer` depends psr/http-message
__root__              dev-master  requires psr/http-message (1.1)
guzzlehttp/psr7       2.8.0       requires psr/http-message (^1.1 || ^2.0)
league/oauth2-server  9999999-dev requires psr/http-message (^1.0.1)
league/uri            6.8.0       requires psr/http-message (^1.0.1)
league/uri-components 2.4.2       requires psr/http-message (^1.0)
psr/http-client       1.0.3       requires psr/http-message (^1.0 || ^2.0)
psr/http-factory      1.1.0       requires psr/http-message (^1.0 || ^2.0)

Event Timeline

Reedy renamed this task from Upgrade to psr/http-message 2.0 to Upgrade psr/http-message to 2.0 or later.Jun 16 2025, 4:29 PM

As of today:

Problem 1
  - Root composer.json requires league/oauth2-server dev-v9.0.0-alpha#61d770dc284898ea2905d66e12f8f7e5f6664092 as 9.0.0 -> satisfiable by league/oauth2-server[dev-v9.0.0-alpha].
  - league/oauth2-server dev-v9.0.0-alpha requires psr/http-message ^1.0.1 -> found psr/http-message[1.0.1, 1.1] but it conflicts with your root composer.json require (2.0).
Problem 2
  - Root composer.json requires league/uri 6.8.0 -> satisfiable by league/uri[6.8.0].
  - league/uri 6.8.0 requires psr/http-message ^1.0.1 -> found psr/http-message[1.0.1, 1.1] but it conflicts with your root composer.json require (2.0).
Problem 3
  - Root composer.json requires league/uri-components 2.4.2 -> satisfiable by league/uri-components[2.4.2].
  - league/uri-components 2.4.2 requires psr/http-message ^1.0 -> found psr/http-message[1.0, 1.0.1, 1.1] but it conflicts with your root composer.json require (2.0).

Change #1222276 had a related patch set uploaded (by Reedy; author: Reedy):

[mediawiki/extensions/WebAuthn@master] composer.json: Allow psr/http-message ^2.0

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

Change #1222277 had a related patch set uploaded (by Reedy; author: Reedy):

[mediawiki/extensions/Wikibase@master] composer.json: Allow psr/http-message ^2.0.0

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

Change #1222278 had a related patch set uploaded (by Reedy; author: Reedy):

[mediawiki/core@master] Upgrade psr/http-message and lcobucci/jwt

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

Change #1222278 abandoned by Reedy:

[mediawiki/core@master] Upgrade psr/http-message and lcobucci/jwt

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

Change #1222279 had a related patch set uploaded (by Reedy; author: Reedy):

[mediawiki/core@master] Upgrade psr/http-message and lcobucci/jwt

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

Change #1222278 restored by Reedy:

[mediawiki/core@master] Upgrade psr/http-message and lcobucci/jwt

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

Change #1222278 abandoned by Reedy:

[mediawiki/core@master] Upgrade psr/http-message and lcobucci/jwt

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

This might end up being dependancy hell with the gate and stuff...

Vendor, MW Core, OAuth, WebAuthn (though not gated), Wikibase...

I suspect it's going to need a force merge of one or two (probably Wikibase in this case), and then let CI push the rest through.

May want to get one train out of the way next week in the new year though first...

Ok, patches are up, probably need some commit summary improvements, and some RELEASE-NOTES where appropriate.

Vendor fails because of changes needed in core... Core will pass with it depending on a Wikibase patch. Another Wikibase patch depending on core (and the first Wikibase patch) prove that tests pass, it's just a dependancy cycle. OAuth passing depending on Core and down.

Vendor will need force merging, so will the Wikibase patch, but then the core patch should merge fine, and so will any other related ones...

Change #1222276 merged by jenkins-bot:

[mediawiki/extensions/WebAuthn@master] composer.json: Allow psr/http-message ^2.0

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

Change #1222277 merged by Gergő Tisza:

[mediawiki/extensions/Wikibase@master] composer.json: Upgrade to psr/http-message ^2.0.0

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

Change #1222279 merged by jenkins-bot:

[mediawiki/core@master] Upgrade psr/http-message and lcobucci/jwt

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

Change #1239168 had a related patch set uploaded (by Reedy; author: Reedy):

[mediawiki/extensions/OATHAuth@master] composer.json: Stop allowing psr/http-message ^1.0

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

Reedy claimed this task.

Change #1239168 merged by jenkins-bot:

[mediawiki/extensions/OATHAuth@master] composer.json: Stop allowing psr/http-message ^1.0

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

Change #1239179 had a related patch set uploaded (by Reedy; author: Reedy):

[mediawiki/extensions/Wikibase@REL1_45] composer.json: Upgrade to psr/http-message ^2.0.0

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

Change #1239180 had a related patch set uploaded (by Reedy; author: Reedy):

[mediawiki/extensions/Wikibase@REL1_44] composer.json: Upgrade to psr/http-message ^2.0.0

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

Change #1239181 had a related patch set uploaded (by Reedy; author: Reedy):

[mediawiki/extensions/Wikibase@REL1_43] composer.json: Upgrade to psr/http-message ^2.0.0

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

Change #1239182 had a related patch set uploaded (by Reedy; author: Reedy):

[mediawiki/core@REL1_45] Upgrade psr/http-message and lcobucci/jwt

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

Change #1239185 had a related patch set uploaded (by Reedy; author: Reedy):

[mediawiki/core@REL1_44] Upgrade psr/http-message

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

Change #1239187 had a related patch set uploaded (by Reedy; author: Reedy):

[mediawiki/core@REL1_43] Upgrade psr/http-message

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

Change #1239234 had a related patch set uploaded (by Gergő Tisza; author: Gergő Tisza):

[mediawiki/core@master] Add release notes for PSR-7 change

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

Change #1239234 merged by jenkins-bot:

[mediawiki/core@master] RELEASE-NOTES-1.46: Add note for PSR-7 change

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