DoctrineDbalAdapter work in progress
Merge origin/master