fix tests of master, added 2.5 testing
Merge pull request #803 from FriendsOfSymfony/fix_master_tests

fix tests of master, added 2.5 testing