Fix #74872 - Disambiguate the source of a trait alias when possible#2616

pmmaga wants to merge 2 commits intophp:PHP-7.2php/php-src:PHP-7.2from

pmmaga:bug-74872pmmaga/php-src:bug-74872Copy head branch name to clipboard