Problem/Motivation

In #3444957: Update current core branches in Drupal 7 Upgrade Status, the Drupal 10 version to check against was bumped from 10.0.x to 10.2.x. In upgrade_status_moved_into_core, the corresponding D10 core version was not updated. Because of this, modules that were previously reported as being moved into Core are no longer reported as such.

Steps to reproduce

Install Drupal 7 core.
Install the entityreference module.
Install upgrade_status module.
Go to `/admin/reports/updates/upgrade` and run the upgrade report against 10.2.x.
Assess that entityreference module is listed as `No compatible release. Yet(?)` instead of indicating it is not part of Drupal Core since 8.x.

Proposed resolution

Update `upgrade_status_moved_into_core` to use 10.2.x instead of 10.0.x for the Drupal 10 review. Something similar was done in #3334584: Update Drupal 7 Upgrade Status for Drupal 9.5's availability.

Remaining tasks

Create MR.
Test.

User interface changes

None.

API changes

None.

Data model changes

None.

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:

Comments

dinarcon created an issue. See original summary.

dinarcon’s picture

Status: Active » Needs review

Added a MR with the suggested change.

Gábor Hojtsy made their first commit to this issue’s fork.

gábor hojtsy’s picture

Status: Needs review » Needs work

Good find! One line fix makes total sense.

MR had merge conflicts :/ I tried to create another branch to make this easier but that does not want to update from the original repo either without local merge resolution. Strange. Can you help with resolving that or should I directly commit to 7.2.x (with proper attribution of course)?

dinarcon changed the visibility of the branch 3450182-projects-moved-into to hidden.

dinarcon changed the visibility of the branch 3450182-projects-moved-into to active.

dinarcon’s picture

Status: Needs work » Needs review

Thanks for the quick reply. Committing directly commit to 7.2.x is fine. I am not sure what happened with the issue fork. When I created my PR it was against the 7.x-2.x branch. I am surprised that it had a merge conflict because my commit changed only one line compared to HEAD. The MR now says that it is against 4.x with a lot more changes. I don't really understand what happened there.

BTW, sorry for changing the visibility of the `3450182-projects-moved-into` branch. I was trying to review things and clicked the wrong link. I changed it back to visible.

  • Gábor Hojtsy committed c9e68e6c on 7.x-2.x
    Issue #3450182 by dinarcon: Projects moved into Core not reported when...
gábor hojtsy’s picture

Status: Needs review » Fixed

Duh probably I created the MR wrong then. Either way, committed that one line directly, that was easiest, instead of trying to fix the MR. Thanks!

Status: Fixed » Closed (fixed)

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