Problem/Motivation

In #3612544: Update to Guzzle 8 we added support for Guzzle 8 to Drupal 12. We should see if we can backport the changes to allow both Guzzle 7 and 8 in Drupal 11, as there is a possibility that Guzzle 7 will be end of life before Drupal 11 is end of life.

Steps to reproduce

Proposed resolution

Backport the changes, run tests on both branches, see if supporting both is viable.
MR 16839: Bump to Guzzle 8 to show core tests pass
MR 17094: Stay on Guzzle 7, but with the compatibility changes for 8

17094 is the MR to use for committing.

Remaining tasks

User interface changes

Introduced terminology

API changes

Data model changes

Release notes snippet

Issue fork drupal-3612965

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

About issue forks

Comments

longwave created an issue. See original summary.

longwave-bot made their first commit to this issue’s fork.

longwave opened merge request !16839

godotislate’s picture

godotislate
he/him
commented
Status: Active » Needs work

There are test failures.

longwave’s picture

longwave
he/him
Primary language English
Location UK
commented
Parent issue: #3612544: Update to Guzzle 8 » #3466094: [12.x] [meta] Add compatibility for the latest minor and major dependency versions in Drupal 11
godotislate’s picture

godotislate
he/him
commented
Version: main » 11.x-dev
godotislate’s picture

godotislate
he/him
commented

I fixed the merge conflict and resolved the tests that were failing. The remaining failing test comes from upstream: #3182064-58: Allow min & max exposed numeric/date filters to be configured.

The change does bump the composer.lock version to Guzzle 8 though, which I'm not sure we want? Once we've tested that Guzzle 8 works, so the composer.lock version be reverted to Guzzle 7 to make sure that passes tests as well?

longwave’s picture

longwave
he/him
Primary language English
Location UK
commented

Yep we want to keep composer.lock on Guzzle 7, but allow users to upgrade if they want.

godotislate opened merge request !17094

godotislate’s picture

godotislate
he/him
commented
Status: Needs work » Needs review

OK, so on the original MR 16839, I already updated composer.lock to Guzzle 8, so leaving it like that and marking as draft. This is to show that 11.x core test still pass with Guzzle 8.

Created a new MR 17094 that reverts the composer.lock version to Guzzle 7 (but individual sites will be able to update to 8).

Failing test is the upstream failure mentioned previously.

godotislate’s picture

godotislate
he/him
commented

Rebased for merge conflict and also the upstream failure is fixed.

godotislate’s picture

godotislate
he/him
commented
Priority: Normal » Major

Bumping to major since this includes Guzzle security updates.

godotislate’s picture

godotislate
he/him
commented
Issue summary: View changes
daffie’s picture

daffie commented
Status: Needs review » Needs work

The changes look good to me.
Just a single remark. After that it is RTBC for me.

godotislate’s picture

godotislate
he/him
commented
Status: Needs work » Needs review

Added the assert to show that the Guzzle 8 code runs.

daffie’s picture

daffie commented
Status: Needs review » Reviewed & tested by the community

All code changes look good to me.
For me it is RTBC.

  • catch committed 8ad5adfb on 11.x 
    task: #3612965 Allow Guzzle 8 in Drupal 11

By: longwave
By: godotislate...
catch’s picture

catch
he/him
Primary language English
commented
Status: Reviewed & tested by the community » Fixed

Committed/pushed to 11.x, thanks!

Now that this issue is closed, review the contribution record.

As a contributor, attribute any organization that helped you, or if you volunteered your own time.

Maintainers, credit people who helped resolve this issue.

godotislate’s picture

godotislate
he/him
commented

I think the wrong MR was committed. I think we wanted to commit the MR that stayed on Guzzle 7 but allowed 8. The other MR that updated to 8 was committed.

catch’s picture

catch
he/him
Primary language English
commented

Yes... got my tabs mixed up. Reverted the wrong MR, and committed the right one this time.

  • catch committed 3ef14e7a on 11.x 
    task: #3612965 Allow Guzzle 8 in Drupal 11

By: longwave
By: godotislate...

  • catch committed 9df766be on 11.x 
    Revert "task: #3612965 Allow Guzzle 8 in Drupal 11"

This reverts commit...

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.