The dispute between Adil Rashid and Yorkshire has been put to rest after the England leg-spinner agreed to a new contract with his county to play in all formats.

Rashid was on a limited-overs-only deal for 2018, which became controversial when he was selected for England’s Test squad for the recently-concluded series against India despite having opted out of playing first-class cricket for Yorkshire.

However, England national selector Ed Smith told the 30-year-old that he would have to be playing first-class in order to be considered for the Test team.

“I think we’ve been clear from the outset that we wanted to keep Adil at the club,” said Yorkshire director of cricket Martyn Moxon, who added that the player’s long-term future with the county would be reassessed after next year’s one-day World Cup, which England are hosting.

“When it became known he had to have a red-ball contract, we were more than happy to put that in place.”

Rashid has played only 15 Tests in his career, as opposed to 73 ODIs. He began his cricketing career with Yorkshire in 2006 and has since taken 500 first-class wickets.