Test cleanup for PHPUnit 12 - unit tests data providers

Closes #3550292

Merge request reports

Loading