Fix php stan and php unit issues in 2.0.x branch

Closes #3614090

Merge request reports

Loading