Upgrade doctrine for hhvm compatibility