improved PHP parser