Fixed phpdoc block
Added SF-2.1 and dev-master to build matrix