Problem/Motivation

https://www.drupal.org/sa-core-2025-003 was released in February 2025.

This is a public issue to add the tests that were used in the development of the fix in a private issue, as several weeks have now passed to allow sites to update.

Steps to reproduce

Run tests in an MR.

Proposed resolution

MR / test / commit.

Remaining tasks

tbc

Issue fork drupal-3522220

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

mcdruid created an issue. See original summary.

mcdruid opened merge request !12003

mcdruid’s picture

mcdruid commented
Status: Active » Needs review

Tests passing.

One issue is that comments in the test refer to the gadget chain as "Drupal/FI1" but there's currently no such thing in https://github.com/ambionics/phpggc (a new PR may be opened for it soon though).

smustgrave’s picture

smustgrave commented
Status: Needs review » Needs work

Small comments

If you are another contributor eager to jump in, please allow the previous poster(s) at least 48 hours to respond to feedback first, so they have the opportunity to finish what they started!

nicxvan’s picture

nicxvan commented
Related issues: +#3506930: Separate hooks from events

#3506930: Separate hooks from events is removing ProceduralCall entirely.

nicxvan opened merge request !13574

nicxvan changed the visibility of the branch 11.x to hidden.

nicxvan closed merge request !12003

nicxvan’s picture

nicxvan commented
Status: Needs work » Needs review

Not sure why the other MR had composer changes. I confirmed all feedback was addressed.

I reviewed the test and it does seem to cover the situation we addressed.

I basically rebased, but not sure I can RTBC.

I'll keep an eye on tests.

nicxvan’s picture

nicxvan commented
Status: Needs review » Needs work

Needs the deprecations updated.

Version: 11.x-dev » main

Drupal core is now using the main branch as the primary development branch. New developments and disruptive changes should now be targeted to the main branch.

Read more in the announcement.

nicxvan’s picture

nicxvan commented

Needs a couple updates.

nicxvan’s picture

nicxvan commented
Status: Needs work » Needs review
nicxvan’s picture

nicxvan commented

The only changes I made were phpstan and cs changes.

smustgrave’s picture

smustgrave commented

So question is this still needed?

Found the commit https://git.drupalcode.org/project/drupal/-/commit/88c99548f7cc4d9a8ffc5...

ProceduralCall is now empty.

I reverted the change to core/modules/views/src/DisplayPluginCollection.php

And the test still passes.

smustgrave’s picture

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

Spoke to nicxvan and mcdruid in slack and agreed still good to get this in.

  • catch committed 843158e6 on 11.4.x 
    task: #3522220 Add tests for SA-CORE-2025-003

By: mcdruid
By:...

  • catch committed dfdc4fce on 11.x 
    task: #3522220 Add tests for SA-CORE-2025-003

By: mcdruid
By:...

  • catch committed 2b50666e on main 
    task: #3522220 Add tests for SA-CORE-2025-003

By: mcdruid
By:...

catch closed merge request !13574

catch’s picture

catch
he/him
Primary language English
commented
Version: main » 11.4.x-dev
Status: Reviewed & tested by the community » Fixed

Committed/pushed to main, and cherry-picked to 11.x and 11.4.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.

Status: Fixed » Closed (fixed)

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