fixed doctrine array_diff for php 5.4+
commit to clear merge?