Croatian defender Josko Gvardiol has signed a contract extension with Manchester City running until the summer of 2031, ending speculation about interest from European rivals.