DoctrinePageRepositoryAdapter Refactoring