Port PR #843 + fix PHPUnit vulnerability on 5.x.x branch#891

Copilot wants to merge 4 commits intomainjsonrainbow/json-schema:mainfrom

copilot/port-pr-843-to-5-x-xjsonrainbow/json-schema:copilot/port-pr-843-to-5-x-xCopy head branch name to clipboard