Merge pull request #1871 from Guite/1.4

upgrade to Symfony 2.5
improve check for whether user var exists as class member, fixed #1970