Pep Guardiola will hope to add to the remarkable 18 trophies he has won at Manchester City after agreeing to extend his contract with the club.