Getting "PHP syntax error" on valid patch with files added and removed

On #320363: Rename mock modules, we keeping getting back a "PHP syntax error" on the patch review. I've tested the patch myself. It applies cleanly, removes/adds the proper files with no fuzz. Not sure what is going wrong.

Mikey_p and my guess is that maybe the new files aren't getting loaded properly into the registry, and the old files still remain, so when a hook is invoked, a non-existant file is called.