Fix requires for PhpEXE

And incidentally fix some msftidy complaints
Land #1988 - Fix requires for PhpEXE