Merge remote-tracking branch 'origin/2.1.x' into 2.2.x#5302

ondrejmirtes merged 2 commits into2.2.xphpstan/phpstan-src:2.2.xfrom

merge-21phpstan/phpstan-src:merge-21Copy head branch name to clipboard