Integration of extracted & improved GosDoctrineQueryBuilder