Merge branch '6.4' into 7.3

* 6.4:
  Remove obsolete code for solved Psalm issue in workflow

Author: nicolas-grekas

.github/workflows/psalm.yml

@@ -50,10 +50,6 @@ jobs:
           git checkout composer.json
           git checkout -m ${{ github.base_ref }}
 
-          # @todo intersection types are broken in Psalm
-          # @see https://github.com/vimeo/psalm/issues/7520
-          sed -i 's/Uuid&/Uuid|/' src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php
-          sed -i 's/Interface&/Interface|/' src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php
           ./vendor/bin/psalm.phar --set-baseline=.github/psalm/psalm.baseline.xml --no-progress
           git checkout -m FETCH_HEAD