Mercurial forward Neymar has ended speculation over his future by signing a new contract with Ligue 1 champion Paris Saint-Germain that ties him to the club until 2025.