The 34-year-old former Barcelona player has been on downtime since winning the Copa America with Argentina in July, and started his first PSG run-out with simple physical exercises
The 29-year-old Neymar, who joined PSG in 2017 from Spanish club Barcelona for a record transfer fee of 222 million euros ($270 million), has agreed a deal French media reported will earn him an annual salary of 30 million euros.
"I'm very happy to be extending my contract with Paris until 2025," Neymar told.
For all their injuries, their starting line-up was still impressive, and with Thomas Mueller leading from the front and co-ordinating their suffocating press, Bayern took the game to their hosts.
Neymar picked up the injury in the previous round against Caen on Feb. 10 and the French champions initially said he would be out for action for "up to four weeks".
"Neymar is back to collective training while continuing his individual programme," PSG said in a statement.
The Catalans pulled off one of the greatest comebacks in the history of the competition by beating PSG 6-1 in a last-16 second leg in 2017 to progress after losing the first leg 4-0.
The Champions League runners-up have lost two of their opening three group stage matches this term, but Leonardo denied PSG had looked at replacing the German.