completed refactor for doctrine Adapter