Updating Doctrine field types
Adding phpfunction as mentioned by @WouterJ
Wrapping up lines
[#2920] Removing some types not available in 2.2 - will add them to 2.3