Doctrine 1

Patch to correct CLI tests