Pep Guardiola has signed a new contract to remain Manchester City manager until 2025.