Revision metadata is not updated when a workspace is merged into its parent

I agree with the solution, since the workspace merger behaves like the publisher and it's not creating new revisions when a workspace is merged into its parent. However, we need test coverage for this, somewhere in \Drupal\Tests\workspaces\Functional\WorkspaceConcurrentEditingTest.

Improved the patch a bit and converted to a MR, still needs tests so leaving at NW for now.

Added test coverage and revamped the issue summary since this can no longer be reproduced via the workspace conflict constraint.

The Needs Review Queue Bot → tested this issue. It fails the Drupal core commit checks. Therefore, this issue status is now "Needs work".

This does not mean that the patch necessarily needs to be re-rolled or the MR rebased. Read the Issue Summary, the issue tags and the latest discussion here to determine what needs to be done.

Consult the Drupal Contributor Guide → to find step-by-step guides for working with issues.

Hiding patches for clarity

Test only feature was already ran

1) Drupal\Tests\workspaces\Kernel\WorkspaceAssociationTest::testWorkspaceAssociation
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
     1 => 4
     2 => 5
     3 => 6
-    4 => 7
-    5 => 9
 )
/builds/issue/drupal-3323317/vendor/phpunit/phpunit/src/Framework/Constraint/Equality/IsEqual.php:94
/builds/issue/drupal-3323317/core/modules/workspaces/tests/src/Kernel/WorkspaceAssociationTest.php:183
/builds/issue/drupal-3323317/core/modules/workspaces/tests/src/Kernel/WorkspaceAssociationTest.php:157
/builds/issue/drupal-3323317/vendor/phpunit/phpunit/src/Framework/TestResult.php:728

So change to the Merger looks good.

My issue, https://www.drupal.org/project/drupal/issues/3438769 🐛 Sub workspace does not clear Closed: duplicate was marked as a duplicate of this. However, this patch is not fixing the issue of the develop workspace not clearing. Is there something not working here, or is my issue not actually a duplicate?

Hm.. that's right, I thought 🐛 Sub workspace does not clear Closed: duplicate was about the value of the workspace metadata field, but it's actually about WorkspaceAssociation::onPostPublish() not deleting the associations of sub-workspaces. I'll reopen it :)

Added a comment to the MR. It's a bit of a pain to address but this change makes a service that's injected unused.

Oops, I didn't realize we don't need that service anymore. Since the Merger class is not a service and it's also tagged @internal, I only removed the argument from its constructor, but I had to do the whole deprecation dance anyway for WorkspaceOperationFactory because that's an actual service :/

Also added a CR for it: https://www.drupal.org/node/3440755 →

Wasn't fully aware of DeprecatedServicePropertyTrait neat!

Deprecation is all green. Know the stable ticket for workspace is RTBC but maybe this can get in at the same time.

I checked the change record and it is correct and easy to understand.

Whoops! Forgot to mark this fixed.

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