php: more upstream pacthes (only tests)