German goalkeeper Kevin Trapp completed his return to Eintracht Frankfurt on Wednesday after signing a five-year deal with the club he left to join Paris Saint-Germain in 2015.