I broke all of the whitespace changes into their own commit, which now precedes all others in the PR. The majority of our PHP test suite uses spaces, and I'm heartily behind that.