Allow null in ClassMetadata::getTypeOfField and use string offset for criteria#199

malarzm merged 2 commits intodoctrine:2.2.xdoctrine/persistence:2.2.xfrom

franmomu:sync_implfranmomu/persistence:sync_implCopy head branch name to clipboard