[5.x]: Matrix field blocks related to an entrified global are soft deleted (regression)

[tomdavies]

What happened?

Description

tldr; #18650 was marked fixed in fce1ddf (shipped in 5.9.19) but I am seeing the same issue in 5.9.21

Note

In case it's relevant: this is an old site that was created on C3, and has been updated => C4, then => C5

Steps to reproduce

1. Create a global siteSettings with a matrix field
2. Populate the matrix field with at least one block
3. run craft entrify/global-set siteSettings --section siteSettings
4. Navigate to siteSettings single in the Craft CP
5. Matrix field from [2] appears empty
6. Switch field to index view + change status to Trashed, matrix blocks shown

Expected behavior

Blocks that belong to a matrix field on a global are not soft deleted during entrification of that global

Actual behavior

Matrix field blocks are soft deleted during entrification

Craft CMS version

5.9.21

PHP version

8.4.18

Operating system and version

ddev / linux

Database type and version

MySQL 8.0

Image driver and version

No response

Installed plugins and versions

[linear]

CMS-1987

[brandonkelly]

I’m not able to reproduce that.

Would you be able to provide a database backup from before the entrify command was run, and your Composer files? support@craftcms.com

[tomdavies]

DB + reduced test case emailed. While creating that I realised that the content only ends up soft deleted when the entryify command is run in a second environment, i.e. the initial entryify works when run locally, with the content moved as expected, but when we deploy the project config changes and run the command in that second env, that's when we end up with the soft deleted matrix blocks. Anyway full details in the email.

[brandonkelly]

Thanks! I was able to reproduce when running the command after applying project config changes from the initial environment.

Fixed now for the next release.