fix tests of master, added 2.5 testing

also only test the current state release (ie 2.5) against all PHP versions