9bd4434
Now with this upmerge you revert the changes from the 2nd commit, possibly due to wrong conflict resolution.
That causes the unit tests failing.
You should have kept your 6.0-dev code for that file.
Only the "since" tags should change in that file with the upmerge.
This PR is missing the change from this PR: https://github.com/joomla/joomla-cms/pull/46905/changes
In your previous upmerge, you had fixed the unit tests for the EmailRule with help by Allon who once had added these new tests.
See these commits:
Now with this upmerge you revert the changes from the 2nd commit, possibly due to wrong conflict resolution.
That causes the unit tests failing.
You should have kept your 6.0-dev code for that file.
Only the "since" tags should change in that file with the upmerge.