Fix Unit tests to be compatible with php8 [part 1] #34045
+168
−134
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.